cloudinary 1.0.81 → 1.0.82

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 22f7163efe3beefab6b2653a0c3e440f45907eee
-  data.tar.gz: 4a446807c4be6d7769384adebc9a2b08fe910d1c
-SHA512: 
-  metadata.gz: 70ea68172f8e246e74049e87ce49e49af856dc7428fdc68b635a3fa6f886c32c656fe625fa31051665da3c2037e7bac85f17e710d973bdbcb586e9969235b433
-  data.tar.gz: 3663bde9f91c9d51b6760e1383f200d731425c63aad59520b508f6cd333f4793875bd79a361e5f1be126a65291c57833539054302fc6991cc56be6275a391109
+---
+SHA1:
+  metadata.gz: 3a6cbd0bda5b871cca87e23ee5b64e551c68c17f
+  data.tar.gz: ebd64c74b999914e26ece99aa312b1e40a91dcec
+SHA512:
+  metadata.gz: 1166188baf03ded5949a7f55c13d778e2a78aeeb731999a21978ce4bef2dc420a10b58e7e4eae2ad45b776f37535d6c20f493f147004c5e504f24d5116578c05
+  data.tar.gz: dafa9aede45cb6b996fb718adb7d438e3212b070722ec6930d3db53a2dabf528c8582fc9521946bb6ad74f5dde5b1dd32d28de519f938a4a5c0a01530b4ed042

data/CHANGELOG

@@ -1,3 +1,10 @@
+= Version 1.0.82 - 2015-02-05
+  * Solve problem with CarrierWave integration to newer versions on the mongoid and carrierwave-mongoid gems.
+  * Enable root path for shared CDN: 
+    * Modified restriction in utils so that it doesn't fail for root path with shared CDN.
+    * Added Object::present? predicate. Check if Object::present doesn't exist before defining it.
+  * Checking for `defined?(Rails)` is not enough if we want to invoke `Rails.version` etc. It was changed to `defined? Rails::version`.
+
 = Version 1.0.81 - 2015-01-08
   * CarrierWave - support default_format if format is unknown, support arbitrary format for resource_type raw.
 

data/lib/cloudinary.rb

@@ -77,7 +77,7 @@ module Cloudinary
   end
   
   def self.app_root
-    if (defined?(Rails) && Rails.root)
+    if defined? Rails::root
       # Rails 2.2 return String for Rails.root
       Rails.root.is_a?(Pathname) ? Rails.root : Pathname.new(Rails.root)
     else
@@ -89,7 +89,7 @@ module Cloudinary
   
   def self.config_env
     return ENV["CLOUDINARY_ENV"] if ENV["CLOUDINARY_ENV"]
-    return Rails.env if defined?(Rails)
+    return Rails.env if defined? Rails::env
     nil
   end
   

data/lib/cloudinary/carrier_wave/storage.rb

@@ -83,7 +83,9 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     elsif defined?(Mongoid::Document) && uploader.model.is_a?(Mongoid::Document)
       # Mongoid support
       if Mongoid::VERSION.split(".").first.to_i >= 4
-        uploader.model.set(:"#{column}" => name)
+        column = column.to_sym
+        uploader.model.write_attribute(column, name)
+        uploader.model.set(column => name)
       else
         uploader.model.set(column, name)
       end

data/lib/cloudinary/helper.rb

@@ -235,7 +235,7 @@ module CloudinaryHelper
       if !method_defined?(:image_tag)
         include ActionView::Helpers::AssetTagHelper
       end
-      if defined?(Rails) && !Rails.version.start_with?("2") && Cloudinary.config.enhance_image_tag
+      if defined?(Rails::version) && !Rails.version.start_with?('2') && Cloudinary.config.enhance_image_tag
         alias_method_chain :image_tag, :cloudinary
         alias_method_chain :image_path, :cloudinary
       else
@@ -299,7 +299,7 @@ if defined? ActionView::Helpers::AssetUrlHelper
   end
 end
 
-if defined?(Rails) && Rails.version.start_with?("2")
+if defined?(Rails::version) && Rails.version.start_with?('2')
   ActionView::Base.send :include, ActionView::Helpers::AssetTagHelper
   ActionView::Base.send :include, CloudinaryHelper
 end

data/lib/cloudinary/missing.rb

@@ -3,6 +3,16 @@ if !nil.respond_to?(:blank?)
     def blank?
       respond_to?(:empty?) ? empty? : !self
     end
+
+    if not defined? Object::present?
+      # An object is present if it's not blank.
+      #
+      # @return [true, false]
+      def present?
+        !blank?
+      end
+    end
+
   end
   
   class NilClass #:nodoc:

data/lib/cloudinary/utils.rb

@@ -130,11 +130,9 @@ class Cloudinary::Utils
     sign_version = config_option_consume(options, :sign_version) # Deprecated behavior
     url_suffix = options.delete(:url_suffix)
     use_root_path = config_option_consume(options, :use_root_path)
-    if !private_cdn
-      raise(CloudinaryException, "URL Suffix only supported in private CDN") unless url_suffix.blank?
-      raise(CloudinaryException, "Root path only supported in private CDN") if use_root_path
-    end
-   
+
+    raise(CloudinaryException, "URL Suffix only supported in private CDN") if url_suffix.present? and not private_cdn
+
     original_source = source
     return original_source if source.blank?
     if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.81"
+  VERSION = "1.0.82"
 end

data/spec/cloudinary_helper_spec.rb

@@ -1,3 +1,4 @@
+require 'rspec'
 require 'spec_helper'
 require 'cloudinary'
 require 'action_view'
@@ -7,7 +8,7 @@ helper_class = Class.new do
   include CloudinaryHelper
 end
 
-describe CloudinaryHelper do
+RSpec.describe CloudinaryHelper do
   let(:helper) { helper_class.new }
 
 
@@ -16,9 +17,14 @@ describe CloudinaryHelper do
     subject(:input) { helper.cl_image_upload_tag(:image_id, options) }
 
     before do
-      Cloudinary::Utils.stub(:cloudinary_api_url)
-      Cloudinary::Utils.stub(:sign_request)
-      helper.stub(:build_callback_url)
+      if defined? allow
+        allow(Cloudinary::Utils).to receive_messages :cloudinary_api_url => '', :sign_request => Hash.new
+        allow(helper).to receive(:build_callback_url).and_return('')
+      else
+        Cloudinary::Utils.should_receive(:cloudinary_api_url).and_return('')
+        Cloudinary::Utils.should_receive(:sign_request).and_return(Hash.new)
+        helper.should_receive(:build_callback_url).and_return('')
+      end
     end
 
     it "allow multiple upload" do
@@ -29,19 +35,25 @@ describe CloudinaryHelper do
   end
 
   context "#cl_image_tag" do
-    subject(:input) { helper.cl_image_tag("sample.jpg", options) }
+    subject(:input) { helper.cl_image_tag('sample.jpg', options) }
 
     context "responsive_width" do
       let(:options) { {responsive_width: true, cloud_name: "test"} }
       it "should use data-src for responsive_width" do
-        expect(input).to eq("<img class=\"cld-responsive\" data-src=\"http://res.cloudinary.com/test/image/upload/c_limit,w_auto/sample.jpg\"></img>")
+        img_tag = html_tag_matcher 'img'
+        expect(input).to match img_tag
+        expect(input).to include('class="cld-responsive"')
+        expect(input).to include( 'data-src="http://res.cloudinary.com/test/image/upload/c_limit,w_auto/sample.jpg"')
       end
     end
 
     context "dpr_auto" do
       let(:options) { {dpr: :auto, cloud_name: "test"} }
       it "should use data-src for dpr auto" do
-        expect(input).to eq("<img class=\"cld-hidpi\" data-src=\"http://res.cloudinary.com/test/image/upload/dpr_auto/sample.jpg\"></img>")
+        img_tag = html_tag_matcher 'img'
+        expect(input).to match(img_tag)
+        expect(input).to include('data-src="http://res.cloudinary.com/test/image/upload/dpr_auto/sample.jpg"')
+        expect(input).to include('class="cld-hidpi"')
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,3 +4,10 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run_excluding :delete_all => true
 end
+
+# Create a regexp with the given tag name.
+# @param [String or Symbol] tag tag name (e.g. `img`)
+# @return [Regexp] the regular expression to match the tag
+def html_tag_matcher( tag)
+  /<#{tag}([\s]+[-[:word:]]+[\s]*\=\s*\"[^\"]*\")*\s*>.*<\s*\/#{tag}\s*>/
+end

data/spec/uploader_spec.rb

@@ -18,7 +18,7 @@ describe Cloudinary::Uploader do
   end
 
   it "should successfully upload file by url" do
-    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/logo.png")
+    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/old_logo.png")
     expect(result["width"]).to eq(241)
     expect(result["height"]).to eq(51)
     expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>result["public_id"], :version=>result["version"]}, Cloudinary.config.api_secret)

data/spec/utils_spec.rb

@@ -1,378 +1,384 @@
-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
-      config.secure = false
-      config.cname = nil
-      config.cdn_subdomain = false
-      config.api_key = "1234"
-      config.api_secret = "b"
-    end
-  end
-  
-  def test_cloudinary_url(public_id, options, expected_url, expected_options)
-    url = Cloudinary::Utils.cloudinary_url(public_id, options)
-    expect(url).to eq(expected_url)
-    expect(options).to eq(expected_options)
-    url
-  end
-
-  it "should use cloud_name from config" do    
-    test_cloudinary_url("test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should allow overriding cloud_name in options" do
-    test_cloudinary_url("test", {:cloud_name=>"test321"}, "http://res.cloudinary.com/test321/image/upload/test", {})
-  end
-  
-  it "should use default secure distribution if secure=true" do    
-    test_cloudinary_url("test", {:secure=>true}, "https://res.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should allow overriding secure distribution if secure=true" do    
-    test_cloudinary_url("test", {:secure=>true, :secure_distribution=>"something.else.com"}, "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"
-    test_cloudinary_url("test", {:secure=>true}, "https://config.secure.distribution.com/test123/image/upload/test", {})
-  end
-
-  it "should default to akamai if secure is given with private_cdn and no secure_distribution" do
-    test_cloudinary_url("test", {:secure=>true, :private_cdn=>true}, "https://test123-res.cloudinary.com/image/upload/test", {})
-  end
-
-  it "should not add cloud_name if secure private_cdn and secure non akamai secure_distribution" do
-    test_cloudinary_url("test", {:secure=>true, :private_cdn=>true, :secure_distribution=>"something.cloudfront.net"}, "https://something.cloudfront.net/image/upload/test", {})
-  end
-
-  it "should allow overriding private_cdn if private_cdn=true" do
-    test_cloudinary_url("test", {:private_cdn => true}, "http://test123-res.cloudinary.com/image/upload/test", {})
-  end
-
-  it "should allow overriding private_cdn if private_cdn=false" do
-    Cloudinary.config.private_cdn = true
-    test_cloudinary_url("test", {:private_cdn => false}, "http://res.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should allow overriding cname if cname=example.com" do
-    test_cloudinary_url("test", {:cname => "example.com"}, "http://example.com/test123/image/upload/test", {})
-  end
-
-  it "should allow overriding cname if cname=false" do
-    Cloudinary.config.cname = "example.com"
-    test_cloudinary_url("test", {:cname => nil}, "http://res.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should use format from options" do    
-    test_cloudinary_url("test", {:format=>:jpg}, "http://res.cloudinary.com/test123/image/upload/test.jpg", {})
-  end
-
-  it "should disallow url_suffix in shared distribution" do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello"})}.to raise_error(CloudinaryException)
-  end
-
-  it "should disallow url_suffix in non upload types" do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :type=>:facebook})}.to raise_error(CloudinaryException)
-  end
-
-  it "should disallow url_suffix with / or ." do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello/world", :private_cdn=>true})}.to raise_error(CloudinaryException)
-    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello.world", :private_cdn=>true})}.to raise_error(CloudinaryException)
-  end
-
-  it "should support url_suffix for private_cdn" do    
-    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true}, "http://test123-res.cloudinary.com/images/test/hello", {})
-    test_cloudinary_url("test", {:url_suffix=>"hello", :angle=>0, :private_cdn=>true}, "http://test123-res.cloudinary.com/images/a_0/test/hello", {})
-  end
-
-  it "should put format after url_suffix" do
-    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg"}, "http://test123-res.cloudinary.com/images/test/hello.jpg", {})
-  end
-
-  it "should not sign the url_suffix" do
-    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format=>"jpg", :sign_url=>true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
-    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :sign_url=>true}, "http://test123-res.cloudinary.com/images/#{expected_signture}/test/hello.jpg", {})
-
-    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format=>"jpg", :angle=>0, :sign_url=>true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
-    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :angle=>0, :sign_url=>true}, "http://test123-res.cloudinary.com/images/#{expected_signture}/a_0/test/hello.jpg", {})
-  end
-
-  it "should support url_suffix for raw uploads" do    
-    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :resource_type=>:raw}, "http://test123-res.cloudinary.com/files/test/hello", {})
-  end
-
-  it "should disllow use_root_path in shared distribution" do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true})}.to raise_error(CloudinaryException)
-  end
-
-  it "should support use_root_path for private_cdn" do
-    test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true}, "http://test123-res.cloudinary.com/test", {})
-    test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :angle=>0}, "http://test123-res.cloudinary.com/a_0/test", {})
-  end
-
-  it "should support use_root_path together with url_suffix for private_cdn" do
-    test_cloudinary_url("test", {:use_root_path=>true, :url_suffix=>"hello", :private_cdn=>true}, "http://test123-res.cloudinary.com/test/hello", {})
-  end
-
-  it "should disllow use_root_path if not image/upload" do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :type=>:facebook})}.to raise_error(CloudinaryException)
-    expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :resource_type=>:raw})}.to raise_error(CloudinaryException)
-  end
-
-  it "should use width and height from options only if crop is given" do
-    test_cloudinary_url("test", {:width=>100, :height=>100}, "http://res.cloudinary.com/test123/image/upload/test", {:width=>100, :height=>100})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/test", {:width=>100, :height=>100})
-  end
-
-  it "should not pass width and height to html in case of fit, lfill or limit crop" do
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:limit}, "http://res.cloudinary.com/test123/image/upload/c_limit,h_100,w_100/test", {})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:lfill}, "http://res.cloudinary.com/test123/image/upload/c_lfill,h_100,w_100/test", {})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:fit}, "http://res.cloudinary.com/test123/image/upload/c_fit,h_100,w_100/test", {})
-  end
-
-  it "should not pass width and height to html in case angle was used" do
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:scale, :angle=>:auto}, "http://res.cloudinary.com/test123/image/upload/a_auto,c_scale,h_100,w_100/test", {})
-  end
-    
-  it "should use x, y, radius, prefix, gravity and quality from options" do    
-    test_cloudinary_url("test", {:x=>1, :y=>2, :radius=>3, :gravity=>:center, :quality=>0.4, :prefix=>"a"}, "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    
-    test_cloudinary_url("test", {:transformation=>"blip"}, "http://res.cloudinary.com/test123/image/upload/t_blip/test", {})
-  end
-
-  it "should support array of named tranformations" do    
-    test_cloudinary_url("test", {:transformation=>["blip", "blop"]}, "http://res.cloudinary.com/test123/image/upload/t_blip.blop/test", {})
-  end
-
-  it "should support base tranformation" do    
-    test_cloudinary_url("test", {:transformation=>{:x=>100, :y=>100, :crop=>:fill}, :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/c_crop,w_100/test", {:width=>100})
-  end
-
-  it "should support array of base tranformations" do    
-    test_cloudinary_url("test", {:transformation=>[{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}], :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test", {:width=>100})
-  end
-
-  it "should support array of tranformations" do    
-    result = Cloudinary::Utils.generate_transformation_string([{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}])
-    expect(result).to eq("c_fill,w_200,x_100,y_100/r_10")
-  end
-
-  it "should not include empty tranformations" do    
-    test_cloudinary_url("test", {:transformation=>[{}, {:x=>100, :y=>100, :crop=>:fill}, {}]}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/test", {})
-  end
-
-  it "should support size" do    
-    test_cloudinary_url("test", {:size=>"10x10", :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_10,w_10/test", {:width=>"10", :height=>"10"})
-  end
-
-  it "should use type from options" do
-    test_cloudinary_url("test", {:type=>:facebook}, "http://res.cloudinary.com/test123/image/facebook/test", {})
-  end
-
-  it "should use resource_type from options" do
-    test_cloudinary_url("test", {:resource_type=>:raw}, "http://res.cloudinary.com/test123/raw/upload/test", {})
-  end
-
-  it "should ignore http links only if type is not given or is asset" do
-    test_cloudinary_url("http://test", {:type=>nil}, "http://test", {})
-    test_cloudinary_url("http://test", {:type=>:asset}, "http://test", {})
-    test_cloudinary_url("http://test", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://test" , {})
-  end
-
-  it "should use allow absolute links to /images" do
-    test_cloudinary_url("/images/test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
-  end 
-
-  it "should use ignore absolute links not to /images" do
-    test_cloudinary_url("/js/test", {}, "/js/test", {})
-  end 
-
-  it "should escape fetch urls" do
-    test_cloudinary_url("http://blah.com/hello?a=b", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db", {})
-  end 
-
-  it "should should escape http urls" do
-    test_cloudinary_url("http://www.youtube.com/watch?v=d9NF2edxy-M", {:type=>:youtube}, "http://res.cloudinary.com/test123/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M", {})
-  end 
-
-  it "should support background" do
-    test_cloudinary_url("test", {:background=>"red"}, "http://res.cloudinary.com/test123/image/upload/b_red/test", {})
-    test_cloudinary_url("test", {:background=>"#112233"}, "http://res.cloudinary.com/test123/image/upload/b_rgb:112233/test", {})
-  end
-  
-  it "should support default_image" do
-    test_cloudinary_url("test", {:default_image=>"default"}, "http://res.cloudinary.com/test123/image/upload/d_default/test", {})
-  end
-
-  it "should support angle" do
-    test_cloudinary_url("test", {:angle=>"55"}, "http://res.cloudinary.com/test123/image/upload/a_55/test", {})
-    test_cloudinary_url("test", {:angle=>["auto", "55"]}, "http://res.cloudinary.com/test123/image/upload/a_auto.55/test", {})
-  end
-  
-  it "should support format for fetch urls" do
-    test_cloudinary_url("http://cloudinary.com/images/logo.png", {:format=>"jpg", :type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/f_jpg/http://cloudinary.com/images/logo.png", {})
-  end
-  
-  it "should support effect" do
-    test_cloudinary_url("test", {:effect=>"sepia"}, "http://res.cloudinary.com/test123/image/upload/e_sepia/test", {})
-  end
-
-  it "should support effect with hash param" do
-    test_cloudinary_url("test", {:effect=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
-  end
-
-  it "should support effect with array param" do
-    test_cloudinary_url("test", {:effect=>["sepia", 10]}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {}) 
-  end
-
-  {:overlay=>:l, :underlay=>:u}.each do |param, letter|
-    it "should support #{param}" do
-      test_cloudinary_url("test", {param=>"text:hello"}, "http://res.cloudinary.com/test123/image/upload/#{letter}_text:hello/test", {})
-    end
-    
-    it "should not pass width/height to html for #{param}" do
-      test_cloudinary_url("test", {param=>"text:hello", :height=>100, :width=>100}, "http://res.cloudinary.com/test123/image/upload/h_100,#{letter}_text:hello,w_100/test", {})
-    end
-  end
-
-  it "should use ssl_detected if secure is not given as parameter and not set to true in configuration" do    
-    test_cloudinary_url("test", {:ssl_detected=>true}, "https://res.cloudinary.com/test123/image/upload/test", {})
-  end 
-
-  it "should use secure if given over ssl_detected and configuration" do    
-    Cloudinary.config.secure = true
-    test_cloudinary_url("test", {:ssl_detected=>true, :secure=>false}, "http://res.cloudinary.com/test123/image/upload/test", {})
-  end 
-
-  it "should use secure: true from configuration over ssl_detected" do    
-    Cloudinary.config.secure = true
-    test_cloudinary_url("test", {:ssl_detected=>false}, "https://res.cloudinary.com/test123/image/upload/test", {})
-  end 
-
-  it "should support extenal cname" do
-    test_cloudinary_url("test", {:cname=>"hello.com"}, "http://hello.com/test123/image/upload/test", {})
-  end
-
-  it "should support extenal cname with cdn_subdomain on" do
-    test_cloudinary_url("test", {:cname=>"hello.com", :cdn_subdomain=>true}, "http://a2.hello.com/test123/image/upload/test", {})
-  end
-  
-  it "should support cdn_subdomain with secure on if using shared_domain" do
-    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true}, "https://res-2.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should support secure_cdn_subdomain false override with secure" do
-    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>false}, "https://res.cloudinary.com/test123/image/upload/test", {})
-  end
-
-  it "should support secure_cdn_subdomain true override with secure" do
-    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>true, :private_cdn=>true}, "https://test123-res-2.cloudinary.com/image/upload/test", {})
-  end
-
-  it "should support string param" do
-    test_cloudinary_url("test", {"effect"=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
-  end
-  
-  it "should support border" do
-    test_cloudinary_url("test", {"border"=>{:width=>5}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_black/test", {})
-    test_cloudinary_url("test", {"border"=>{:width=>5, :color=>"#ffaabbdd"}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_rgb:ffaabbdd/test", {})
-    test_cloudinary_url("test", {"border"=>"1px_solid_blue"}, "http://res.cloudinary.com/test123/image/upload/bo_1px_solid_blue/test", {})
-    test_cloudinary_url("test", {"border"=>"2"}, "http://res.cloudinary.com/test123/image/upload/test", {:border=>"2"})
-  end
-  
-  it "should support flags" do
-    test_cloudinary_url("test", {"flags"=>"abc"}, "http://res.cloudinary.com/test123/image/upload/fl_abc/test", {})
-    test_cloudinary_url("test", {"flags"=>["abc", "def"]}, "http://res.cloudinary.com/test123/image/upload/fl_abc.def/test", {})
-  end
-
-  it "build_upload_params should not destroy options" do
-    options = {:width=>100, :crop=>:scale}
-    expect(Cloudinary::Uploader.build_upload_params(options)[:transformation]).to eq("c_scale,w_100")
-    expect(options.length).to eq(2)
-  end
-
-  it "build_upload_params canonize booleans" do
-    options = {:backup=>true, :use_filename=>false, :colors=>"true", :exif=>"false", :colors=>:true, 
-               :image_metadata=>:false, :invalidate=>1, :eager_async=>"1"}
-    params = Cloudinary::Uploader.build_upload_params(options)
-    expect(Cloudinary::Api.only(params, *options.keys)).to eq(
-      :backup=>1, :use_filename=>0, :colors=>1, :exif=>0, :colors=>1, 
-               :image_metadata=>0, :invalidate=>1, :eager_async=>1
-    )
-    expect(Cloudinary::Uploader.build_upload_params(:backup=>nil)[:backup]).to be_nil
-    expect(Cloudinary::Uploader.build_upload_params({})[:backup]).to be_nil
-  end
-  
-  it "should add version if public_id contains /" do
-    test_cloudinary_url("folder/test", {}, "http://res.cloudinary.com/test123/image/upload/v1/folder/test", {})
-    test_cloudinary_url("folder/test", {:version=>123}, "http://res.cloudinary.com/test123/image/upload/v123/folder/test", {})
-  end
-
-  it "should not add version if public_id contains version already" do
-    test_cloudinary_url("v1234/test", {}, "http://res.cloudinary.com/test123/image/upload/v1234/test", {})
-  end
-
-  it "should allow to shorted image/upload urls" do
-    test_cloudinary_url("test", {:shorten=>true}, "http://res.cloudinary.com/test123/iu/test", {})
-  end
-  
-  it "should allow to use folders in PreloadedFile" do
-    signature = Cloudinary::Utils.api_sign_request({:public_id=>"folder/file", :version=>"1234"}, Cloudinary.config.api_secret)
-    preloaded = Cloudinary::PreloadedFile.new("image/upload/v1234/folder/file.jpg#" + signature)
-    expect(preloaded).to be_valid
-  end
-  
-  it "should escape public_ids" do
-    [
-      ["a b", "a%20b"],
-      ["a+b", "a%2Bb"],
-      ["a%20b", "a%20b"],
-      ["a-b", "a-b"],
-      ["a??b", "a%3F%3Fb"],
-      ["parentheses(interject)", "parentheses%28interject%29"]
-    ].each do
-      |source, target|
-      expect(Cloudinary::Utils.cloudinary_url(source)).to eq("http://res.cloudinary.com/test123/image/upload/#{target}")
-    end      
-  end
-  
-  it "should correctly sign URLs", :signed => true do
-    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s----SjmNDA--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :type => :authenticated, :sign_url => true}, "http://res.cloudinary.com/test123/image/authenticated/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/fetch/s--hH_YcbiS--/v1234/http://google.com/path/to/image.png", {})
-  end
-
-  it "should correctly sign URLs in deprecated sign_version mode", :signed => true do
-    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--ZlgFLQcO--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/fetch/s--_GAUclyB--/v1234/http://google.com/path/to/image.png", {})
-  end
-  
-  it "should correctly sign_request" do
-    params = Cloudinary::Utils.sign_request({:public_id=>"folder/file", :version=>"1234"})
-    expect(params).to eq(:public_id=>"folder/file", :version=>"1234", :signature=>"7a3349cbb373e4812118d625047ede50b90e7b67", :api_key=>"1234")
-  end
-
-  it "should support responsive width" do
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_limit,w_auto/test", {responsive: true})
-    Cloudinary.config.responsive_width_transformation = {:width => :auto, :crop => :pad}
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_pad,w_auto/test", {responsive: true})
-  end
-
-  it "should correctly encode double arrays" do
-    expect(Cloudinary::Utils.encode_double_array([1,2,3,4])).to eq("1,2,3,4")
-    expect(Cloudinary::Utils.encode_double_array([[1,2,3,4],[5,6,7,8]])).to eq("1,2,3,4|5,6,7,8")
-  end
-end
+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
+      config.secure = false
+      config.cname = nil
+      config.cdn_subdomain = false
+      config.api_key = "1234"
+      config.api_secret = "b"
+    end
+  end
+  
+  def test_cloudinary_url(public_id, options, expected_url, expected_options)
+    url = Cloudinary::Utils.cloudinary_url(public_id, options)
+    expect(url).to eq(expected_url)
+    expect(options).to eq(expected_options)
+    url
+  end
+
+  it "should use cloud_name from config" do    
+    test_cloudinary_url("test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should allow overriding cloud_name in options" do
+    test_cloudinary_url("test", {:cloud_name=>"test321"}, "http://res.cloudinary.com/test321/image/upload/test", {})
+  end
+  
+  it "should use default secure distribution if secure=true" do    
+    test_cloudinary_url("test", {:secure=>true}, "https://res.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should allow overriding secure distribution if secure=true" do    
+    test_cloudinary_url("test", {:secure=>true, :secure_distribution=>"something.else.com"}, "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"
+    test_cloudinary_url("test", {:secure=>true}, "https://config.secure.distribution.com/test123/image/upload/test", {})
+  end
+
+  it "should default to akamai if secure is given with private_cdn and no secure_distribution" do
+    test_cloudinary_url("test", {:secure=>true, :private_cdn=>true}, "https://test123-res.cloudinary.com/image/upload/test", {})
+  end
+
+  it "should not add cloud_name if secure private_cdn and secure non akamai secure_distribution" do
+    test_cloudinary_url("test", {:secure=>true, :private_cdn=>true, :secure_distribution=>"something.cloudfront.net"}, "https://something.cloudfront.net/image/upload/test", {})
+  end
+
+  it "should allow overriding private_cdn if private_cdn=true" do
+    test_cloudinary_url("test", {:private_cdn => true}, "http://test123-res.cloudinary.com/image/upload/test", {})
+  end
+
+  it "should allow overriding private_cdn if private_cdn=false" do
+    Cloudinary.config.private_cdn = true
+    test_cloudinary_url("test", {:private_cdn => false}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should allow overriding cname if cname=example.com" do
+    test_cloudinary_url("test", {:cname => "example.com"}, "http://example.com/test123/image/upload/test", {})
+  end
+
+  it "should allow overriding cname if cname=false" do
+    Cloudinary.config.cname = "example.com"
+    test_cloudinary_url("test", {:cname => nil}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should use format from options" do    
+    test_cloudinary_url("test", {:format=>:jpg}, "http://res.cloudinary.com/test123/image/upload/test.jpg", {})
+  end
+
+  it "should disallow url_suffix in shared distribution" do
+    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello"})}.to raise_error(CloudinaryException)
+  end
+
+  it "should disallow url_suffix in non upload types" do
+    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :type=>:facebook})}.to raise_error(CloudinaryException)
+  end
+
+  it "should disallow url_suffix with / or ." do
+    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello/world", :private_cdn=>true})}.to raise_error(CloudinaryException)
+    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello.world", :private_cdn=>true})}.to raise_error(CloudinaryException)
+  end
+
+  it "should support url_suffix for private_cdn" do    
+    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true}, "http://test123-res.cloudinary.com/images/test/hello", {})
+    test_cloudinary_url("test", {:url_suffix=>"hello", :angle=>0, :private_cdn=>true}, "http://test123-res.cloudinary.com/images/a_0/test/hello", {})
+  end
+
+  it "should put format after url_suffix" do
+    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg"}, "http://test123-res.cloudinary.com/images/test/hello.jpg", {})
+  end
+
+  it "should not sign the url_suffix" do
+    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format=>"jpg", :sign_url=>true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
+    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :sign_url=>true}, "http://test123-res.cloudinary.com/images/#{expected_signture}/test/hello.jpg", {})
+
+    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format=>"jpg", :angle=>0, :sign_url=>true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
+    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :angle=>0, :sign_url=>true}, "http://test123-res.cloudinary.com/images/#{expected_signture}/a_0/test/hello.jpg", {})
+  end
+
+  it "should support url_suffix for raw uploads" do    
+    test_cloudinary_url("test", {:url_suffix=>"hello", :private_cdn=>true, :resource_type=>:raw}, "http://test123-res.cloudinary.com/files/test/hello", {})
+  end
+
+  describe 'root_path support' do
+
+    it "should allow use_root_path in shared distribution" do
+      # expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true})}.to raise_error(CloudinaryException)
+      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>false}, "http://res.cloudinary.com/test123/test", {})
+      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>false, :angle=>0}, "http://res.cloudinary.com/test123/a_0/test", {})
+    end
+
+    it "should support use_root_path for private_cdn" do
+      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true}, "http://test123-res.cloudinary.com/test", {})
+      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :angle=>0}, "http://test123-res.cloudinary.com/a_0/test", {})
+    end
+
+    it "should support use_root_path together with url_suffix for private_cdn" do
+      test_cloudinary_url("test", {:use_root_path=>true, :url_suffix=>"hello", :private_cdn=>true}, "http://test123-res.cloudinary.com/test/hello", {})
+    end
+
+    it "should disallow use_root_path if not image/upload" do
+      expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :type=>:facebook})}.to raise_error(CloudinaryException)
+      expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true, :private_cdn=>true, :resource_type=>:raw})}.to raise_error(CloudinaryException)
+    end
+
+  end
+
+  it "should use width and height from options only if crop is given" do
+    test_cloudinary_url("test", {:width=>100, :height=>100}, "http://res.cloudinary.com/test123/image/upload/test", {:width=>100, :height=>100})
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/test", {:width=>100, :height=>100})
+  end
+
+  it "should not pass width and height to html in case of fit, lfill or limit crop" do
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:limit}, "http://res.cloudinary.com/test123/image/upload/c_limit,h_100,w_100/test", {})
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:lfill}, "http://res.cloudinary.com/test123/image/upload/c_lfill,h_100,w_100/test", {})
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:fit}, "http://res.cloudinary.com/test123/image/upload/c_fit,h_100,w_100/test", {})
+  end
+
+  it "should not pass width and height to html in case angle was used" do
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:scale, :angle=>:auto}, "http://res.cloudinary.com/test123/image/upload/a_auto,c_scale,h_100,w_100/test", {})
+  end
+    
+  it "should use x, y, radius, prefix, gravity and quality from options" do    
+    test_cloudinary_url("test", {:x=>1, :y=>2, :radius=>3, :gravity=>:center, :quality=>0.4, :prefix=>"a"}, "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    
+    test_cloudinary_url("test", {:transformation=>"blip"}, "http://res.cloudinary.com/test123/image/upload/t_blip/test", {})
+  end
+
+  it "should support array of named tranformations" do    
+    test_cloudinary_url("test", {:transformation=>["blip", "blop"]}, "http://res.cloudinary.com/test123/image/upload/t_blip.blop/test", {})
+  end
+
+  it "should support base tranformation" do    
+    test_cloudinary_url("test", {:transformation=>{:x=>100, :y=>100, :crop=>:fill}, :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/c_crop,w_100/test", {:width=>100})
+  end
+
+  it "should support array of base tranformations" do    
+    test_cloudinary_url("test", {:transformation=>[{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}], :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test", {:width=>100})
+  end
+
+  it "should support array of tranformations" do    
+    result = Cloudinary::Utils.generate_transformation_string([{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}])
+    expect(result).to eq("c_fill,w_200,x_100,y_100/r_10")
+  end
+
+  it "should not include empty tranformations" do    
+    test_cloudinary_url("test", {:transformation=>[{}, {:x=>100, :y=>100, :crop=>:fill}, {}]}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/test", {})
+  end
+
+  it "should support size" do    
+    test_cloudinary_url("test", {:size=>"10x10", :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_10,w_10/test", {:width=>"10", :height=>"10"})
+  end
+
+  it "should use type from options" do
+    test_cloudinary_url("test", {:type=>:facebook}, "http://res.cloudinary.com/test123/image/facebook/test", {})
+  end
+
+  it "should use resource_type from options" do
+    test_cloudinary_url("test", {:resource_type=>:raw}, "http://res.cloudinary.com/test123/raw/upload/test", {})
+  end
+
+  it "should ignore http links only if type is not given or is asset" do
+    test_cloudinary_url("http://test", {:type=>nil}, "http://test", {})
+    test_cloudinary_url("http://test", {:type=>:asset}, "http://test", {})
+    test_cloudinary_url("http://test", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://test" , {})
+  end
+
+  it "should use allow absolute links to /images" do
+    test_cloudinary_url("/images/test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  end 
+
+  it "should use ignore absolute links not to /images" do
+    test_cloudinary_url("/js/test", {}, "/js/test", {})
+  end 
+
+  it "should escape fetch urls" do
+    test_cloudinary_url("http://blah.com/hello?a=b", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db", {})
+  end 
+
+  it "should should escape http urls" do
+    test_cloudinary_url("http://www.youtube.com/watch?v=d9NF2edxy-M", {:type=>:youtube}, "http://res.cloudinary.com/test123/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M", {})
+  end 
+
+  it "should support background" do
+    test_cloudinary_url("test", {:background=>"red"}, "http://res.cloudinary.com/test123/image/upload/b_red/test", {})
+    test_cloudinary_url("test", {:background=>"#112233"}, "http://res.cloudinary.com/test123/image/upload/b_rgb:112233/test", {})
+  end
+  
+  it "should support default_image" do
+    test_cloudinary_url("test", {:default_image=>"default"}, "http://res.cloudinary.com/test123/image/upload/d_default/test", {})
+  end
+
+  it "should support angle" do
+    test_cloudinary_url("test", {:angle=>"55"}, "http://res.cloudinary.com/test123/image/upload/a_55/test", {})
+    test_cloudinary_url("test", {:angle=>["auto", "55"]}, "http://res.cloudinary.com/test123/image/upload/a_auto.55/test", {})
+  end
+  
+  it "should support format for fetch urls" do
+    test_cloudinary_url("http://cloudinary.com/images/logo.png", {:format=>"jpg", :type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/f_jpg/http://cloudinary.com/images/logo.png", {})
+  end
+  
+  it "should support effect" do
+    test_cloudinary_url("test", {:effect=>"sepia"}, "http://res.cloudinary.com/test123/image/upload/e_sepia/test", {})
+  end
+
+  it "should support effect with hash param" do
+    test_cloudinary_url("test", {:effect=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
+  end
+
+  it "should support effect with array param" do
+    test_cloudinary_url("test", {:effect=>["sepia", 10]}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {}) 
+  end
+
+  {:overlay=>:l, :underlay=>:u}.each do |param, letter|
+    it "should support #{param}" do
+      test_cloudinary_url("test", {param=>"text:hello"}, "http://res.cloudinary.com/test123/image/upload/#{letter}_text:hello/test", {})
+    end
+    
+    it "should not pass width/height to html for #{param}" do
+      test_cloudinary_url("test", {param=>"text:hello", :height=>100, :width=>100}, "http://res.cloudinary.com/test123/image/upload/h_100,#{letter}_text:hello,w_100/test", {})
+    end
+  end
+
+  it "should use ssl_detected if secure is not given as parameter and not set to true in configuration" do    
+    test_cloudinary_url("test", {:ssl_detected=>true}, "https://res.cloudinary.com/test123/image/upload/test", {})
+  end 
+
+  it "should use secure if given over ssl_detected and configuration" do    
+    Cloudinary.config.secure = true
+    test_cloudinary_url("test", {:ssl_detected=>true, :secure=>false}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  end 
+
+  it "should use secure: true from configuration over ssl_detected" do    
+    Cloudinary.config.secure = true
+    test_cloudinary_url("test", {:ssl_detected=>false}, "https://res.cloudinary.com/test123/image/upload/test", {})
+  end 
+
+  it "should support extenal cname" do
+    test_cloudinary_url("test", {:cname=>"hello.com"}, "http://hello.com/test123/image/upload/test", {})
+  end
+
+  it "should support extenal cname with cdn_subdomain on" do
+    test_cloudinary_url("test", {:cname=>"hello.com", :cdn_subdomain=>true}, "http://a2.hello.com/test123/image/upload/test", {})
+  end
+  
+  it "should support cdn_subdomain with secure on if using shared_domain" do
+    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true}, "https://res-2.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should support secure_cdn_subdomain false override with secure" do
+    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>false}, "https://res.cloudinary.com/test123/image/upload/test", {})
+  end
+
+  it "should support secure_cdn_subdomain true override with secure" do
+    test_cloudinary_url("test", {:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>true, :private_cdn=>true}, "https://test123-res-2.cloudinary.com/image/upload/test", {})
+  end
+
+  it "should support string param" do
+    test_cloudinary_url("test", {"effect"=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
+  end
+  
+  it "should support border" do
+    test_cloudinary_url("test", {"border"=>{:width=>5}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_black/test", {})
+    test_cloudinary_url("test", {"border"=>{:width=>5, :color=>"#ffaabbdd"}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_rgb:ffaabbdd/test", {})
+    test_cloudinary_url("test", {"border"=>"1px_solid_blue"}, "http://res.cloudinary.com/test123/image/upload/bo_1px_solid_blue/test", {})
+    test_cloudinary_url("test", {"border"=>"2"}, "http://res.cloudinary.com/test123/image/upload/test", {:border=>"2"})
+  end
+  
+  it "should support flags" do
+    test_cloudinary_url("test", {"flags"=>"abc"}, "http://res.cloudinary.com/test123/image/upload/fl_abc/test", {})
+    test_cloudinary_url("test", {"flags"=>["abc", "def"]}, "http://res.cloudinary.com/test123/image/upload/fl_abc.def/test", {})
+  end
+
+  it "build_upload_params should not destroy options" do
+    options = {:width=>100, :crop=>:scale}
+    expect(Cloudinary::Uploader.build_upload_params(options)[:transformation]).to eq("c_scale,w_100")
+    expect(options.length).to eq(2)
+  end
+
+  it "build_upload_params canonize booleans" do
+    options = {:backup=>true, :use_filename=>false, :colors=>"true", :exif=>"false", :colors=>:true, 
+               :image_metadata=>:false, :invalidate=>1, :eager_async=>"1"}
+    params = Cloudinary::Uploader.build_upload_params(options)
+    expect(Cloudinary::Api.only(params, *options.keys)).to eq(
+      :backup=>1, :use_filename=>0, :colors=>1, :exif=>0, :colors=>1, 
+               :image_metadata=>0, :invalidate=>1, :eager_async=>1
+    )
+    expect(Cloudinary::Uploader.build_upload_params(:backup=>nil)[:backup]).to be_nil
+    expect(Cloudinary::Uploader.build_upload_params({})[:backup]).to be_nil
+  end
+  
+  it "should add version if public_id contains /" do
+    test_cloudinary_url("folder/test", {}, "http://res.cloudinary.com/test123/image/upload/v1/folder/test", {})
+    test_cloudinary_url("folder/test", {:version=>123}, "http://res.cloudinary.com/test123/image/upload/v123/folder/test", {})
+  end
+
+  it "should not add version if public_id contains version already" do
+    test_cloudinary_url("v1234/test", {}, "http://res.cloudinary.com/test123/image/upload/v1234/test", {})
+  end
+
+  it "should allow to shorted image/upload urls" do
+    test_cloudinary_url("test", {:shorten=>true}, "http://res.cloudinary.com/test123/iu/test", {})
+  end
+  
+  it "should allow to use folders in PreloadedFile" do
+    signature = Cloudinary::Utils.api_sign_request({:public_id=>"folder/file", :version=>"1234"}, Cloudinary.config.api_secret)
+    preloaded = Cloudinary::PreloadedFile.new("image/upload/v1234/folder/file.jpg#" + signature)
+    expect(preloaded).to be_valid
+  end
+  
+  it "should escape public_ids" do
+    [
+      ["a b", "a%20b"],
+      ["a+b", "a%2Bb"],
+      ["a%20b", "a%20b"],
+      ["a-b", "a-b"],
+      ["a??b", "a%3F%3Fb"],
+      ["parentheses(interject)", "parentheses%28interject%29"]
+    ].each do
+      |source, target|
+      expect(Cloudinary::Utils.cloudinary_url(source)).to eq("http://res.cloudinary.com/test123/image/upload/#{target}")
+    end      
+  end
+  
+  it "should correctly sign URLs", :signed => true do
+    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/v1234/image.jpg", {})
+    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s----SjmNDA--/v1234/image.jpg", {})
+    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
+    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :type => :authenticated, :sign_url => true}, "http://res.cloudinary.com/test123/image/authenticated/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
+    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/fetch/s--hH_YcbiS--/v1234/http://google.com/path/to/image.png", {})
+  end
+
+  it "should correctly sign URLs in deprecated sign_version mode", :signed => true do
+    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg", {})
+    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--ZlgFLQcO--/v1234/image.jpg", {})
+    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
+    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/fetch/s--_GAUclyB--/v1234/http://google.com/path/to/image.png", {})
+  end
+  
+  it "should correctly sign_request" do
+    params = Cloudinary::Utils.sign_request({:public_id=>"folder/file", :version=>"1234"})
+    expect(params).to eq(:public_id=>"folder/file", :version=>"1234", :signature=>"7a3349cbb373e4812118d625047ede50b90e7b67", :api_key=>"1234")
+  end
+
+  it "should support responsive width" do
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_limit,w_auto/test", {responsive: true})
+    Cloudinary.config.responsive_width_transformation = {:width => :auto, :crop => :pad}
+    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_pad,w_auto/test", {responsive: true})
+  end
+
+  it "should correctly encode double arrays" do
+    expect(Cloudinary::Utils.encode_double_array([1,2,3,4])).to eq("1,2,3,4")
+    expect(Cloudinary::Utils.encode_double_array([[1,2,3,4],[5,6,7,8]])).to eq("1,2,3,4|5,6,7,8")
+  end
+end

metadata

@@ -1,67 +1,84 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cloudinary
-version: !ruby/object:Gem::Version 
-  version: 1.0.81
+version: !ruby/object:Gem::Version
+  version: 1.0.82
 platform: ruby
-authors: 
+authors:
 - Nadav Soferman
 - Itai Lahan
 - Tal Lev-Ami
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-02-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id002 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aws_cf_signer
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws_cf_signer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library for easily using the Cloudinary service
-email: 
+email:
 - nadav.soferman@cloudinary.com
 - itai.lahan@cloudinary.com
 - tal.levami@cloudinary.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
+files:
+- ".gitignore"
+- ".rspec"
 - CHANGELOG
 - Gemfile
 - README.md
@@ -111,29 +128,30 @@ files:
 - vendor/assets/javascripts/cloudinary/load-image.min.js
 - vendor/assets/javascripts/cloudinary/processing.js
 homepage: http://cloudinary.com
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id002
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cloudinary
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
-test_files: 
+test_files:
 - spec/api_spec.rb
 - spec/cloudinary_helper_spec.rb
 - spec/docx.docx