Initial tests. Size option fix. Better rails dependency support

Author: TalLevAmi

.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

cloudinary.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rest-client"
+  s.add_development_dependency "rspec"
 end

lib/cloudinary.rb

@@ -5,7 +5,7 @@
 require "cloudinary/uploader"
 require "cloudinary/downloader"
 require "cloudinary/blob" 
-require "cloudinary/static" 
+require "cloudinary/static" if defined?(::ActiveSupport)
 require 'active_support' 
 require "cloudinary/missing"
 require "cloudinary/carrier_wave" if defined?(::CarrierWave)

lib/cloudinary/static.rb

@@ -9,7 +9,7 @@ class Cloudinary::Static
   def self.discover
     ignore_files = Cloudinary.config.ignore_files || IGNORE_FILES 
     relative_dirs = Cloudinary.config.statis_image_dirs || STATIC_IMAGE_DIRS
-    dirs = relative_dirs.map{|dir| Rails.root.join(dir)}.select(&:exist?)
+    dirs = relative_dirs.map{|dir| self.root.join(dir)}.select(&:exist?)
     dirs.each do
       |dir|
       dir.find do
@@ -23,7 +23,7 @@ def self.discover
         elsif SUPPORTED_IMAGES.none?{|pattern| pattern.is_a?(String) ? pattern == file : file.match(pattern)}
           next          
         else
-          relative_path = path.relative_path_from(Rails.root)
+          relative_path = path.relative_path_from(self.root)
           public_path = path.relative_path_from(dir.dirname)
           yield(relative_path, public_path)
         end
@@ -33,12 +33,16 @@ def self.discover
 
   UTC = ActiveSupport::TimeZone["UTC"]
 
+  def self.root
+    defined?(Rails) ? Rails.root : Pathname.new(".")
+  end
+  
   def self.metadata_file_path
-    Rails.root.join(METADATA_FILE)
+    self.root.join(METADATA_FILE)
   end
 
   def self.metadata_trash_file_path
-    Rails.root.join(METADATA_TRASH_FILE)
+    self.root.join(METADATA_TRASH_FILE)
   end
 
   def self.metadata(metadata_file = metadata_file_path, hash=true) 
@@ -73,7 +77,7 @@ def self.sync(options={})
       |path, public_path|
       next if found_paths.include?(path)
       found_paths << path
-      data = Rails.root.join(path).read(:mode=>"rb")
+      data = self.root.join(path).read(:mode=>"rb")
       ext = path.extname
       format = ext[1..-1]
       md5 = Digest::MD5.hexdigest(data)

lib/cloudinary/utils.rb

@@ -7,10 +7,10 @@ class Cloudinary::Utils
 
   # Warning: options are being destructively updated!
   def self.generate_transformation_string(options={})
+    size = options.delete(:size)
+    options[:width], options[:height] = size.split("x") if size    
     width = options[:width]
     height = options[:height]
-    size = options.delete(:size)
-    width, height = size.split("x") if size    
     options.delete(:width) if width && width.to_f < 1 
     options.delete(:height) if height && height.to_f < 1    
 
@@ -71,7 +71,7 @@ def self.cloudinary_url(source, options = {})
           return source
         end
       end 
-      @metadata ||= Cloudinary::Static.metadata
+      @metadata ||= defined?(Cloudinary::Static) ? Cloudinary::Static.metadata : {}
       if @metadata["images/#{source}"]
         return source if !Cloudinary.config.static_image_support
         type = :asset

spec/spec_helper.rb

@@ -0,0 +1,11 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper.rb"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+end

spec/utils_spec.rb

@@ -0,0 +1,169 @@
+require 'spec_helper'
+require 'cloudinary'
+
+describe Cloudinary::Utils do
+  before(:each) do
+    Cloudinary.config do
+      |config|
+      config.cloud_name = "test123"
+      config.secure_distribution = nil
+      config.private_cdn = false
+    end
+  end
+  
+  it "should use cloud_name from config" do    
+    result = Cloudinary::Utils.cloudinary_url("test")
+    result.should == "http://res.cloudinary.com/test123/image/upload/test" 
+  end
+
+  it "should allow overriding cloud_name in options" do
+    options = {:cloud_name=>"test321"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test321/image/upload/test" 
+  end
+  
+  it "should use default secure distribution if secure=true" do    
+    options = {:secure=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+  end
+
+  it "should allow overriding secure distribution if secure=true" do    
+    options = {:secure=>true, :secure_distribution=>"something.else.com"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://something.else.com/test123/image/upload/test" 
+  end
+
+  it "should take secure distribution from config if secure=true" do
+    Cloudinary.config.secure_distribution = "config.secure.distribution.com"    
+    options = {:secure=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://config.secure.distribution.com/test123/image/upload/test" 
+  end
+
+  it "should raise exception if secure is given with private_cdn and no secure_distribution" do
+    Cloudinary.config.private_cdn = true    
+    lambda {Cloudinary::Utils.cloudinary_url("test", :secure=>true)}.should raise_error
+  end
+
+  it "should use format from options" do    
+    options = {:format=>:jpg}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/test.jpg" 
+  end
+
+  it "should use width and height from options only if crop is given" do
+    options = {:width=>100, :height=>100}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    result.should == "http://res.cloudinary.com/test123/image/upload/test" 
+    options.should == {:width=>100, :height=>100}
+    options = {:width=>100, :height=>100, :crop=>:crop}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {:width=>100, :height=>100}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/test" 
+  end
+  
+  it "should use x, y, radius, prefix, gravity and quality from options" do    
+    options = {:x=>1, :y=>2, :radius=>3, :gravity=>:center, :quality=>0.4, :prefix=>"a"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/g_center,p_a,q_0.4,r_3,x_1,y_2/test" 
+  end
+  
+  it "should support named tranformation" do    
+    options = {:transformation=>"blip"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/t_blip/test" 
+  end
+
+  it "should support array of named tranformations" do    
+    options = {:transformation=>["blip", "blop"]}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/t_blip.blop/test" 
+  end
+
+  it "should support base tranformation" do    
+    options = {:transformation=>{:x=>100, :y=>100, :crop=>:fill}, :crop=>:crop, :width=>100}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {:width=>100}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/c_crop,w_100/test" 
+  end
+
+  it "should support array of base tranformations" do    
+    options = {:transformation=>[{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}], :crop=>:crop, :width=>100}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {:width=>100}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test" 
+  end
+
+  it "should not include empty tranformations" do    
+    options = {:transformation=>[{}, {:x=>100, :y=>100, :crop=>:fill}, {}]}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/test" 
+  end
+
+  it "should support size" do    
+    options = {:size=>"10x10", :crop=>:crop}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {:width=>"10", :height=>"10"}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_crop,h_10,w_10/test" 
+  end
+
+  it "should use type from options" do
+    options = {:type=>:facebook}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/facebook/test" 
+  end
+
+  it "should use resource_type from options" do
+    options = {:resource_type=>:raw}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/raw/upload/test" 
+  end
+
+  it "should ignore http links only if type is not given or is asset" do
+    options = {:type=>nil}
+    result = Cloudinary::Utils.cloudinary_url("http://test", options)
+    options.should == {}
+    result.should == "http://test" 
+    options = {:type=>:asset}
+    result = Cloudinary::Utils.cloudinary_url("http://test", options)
+    options.should == {}
+    result.should == "http://test" 
+    options = {:type=>:fetch}
+    result = Cloudinary::Utils.cloudinary_url("http://test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/fetch/http://test" 
+  end
+
+  it "should use allow absolute links to /images" do
+    options = {}
+    result = Cloudinary::Utils.cloudinary_url("/images/test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/test" 
+  end 
+
+  it "should use ignore absolute links not to /images" do
+    options = {}
+    result = Cloudinary::Utils.cloudinary_url("/js/test", options)
+    options.should == {}
+    result.should == "/js/test" 
+  end 
+
+  it "should escape fetch urls" do
+    options = {:type=>:fetch}
+    result = Cloudinary::Utils.cloudinary_url("http://blah.com/hello?a=b", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db" 
+  end 
+end