cloudinary 1.1.1 → 1.1.2

data/spec/archive_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+require 'cloudinary'
+require 'rest_client'
+require 'zip'
+
+ARCHIVE_TAG = "archive_test_tag_#{rand}"
+
+RSpec.shared_context 'archive' do
+  before :all do
+    Cloudinary::Uploader.upload(
+      "http://res.cloudinary.com/demo/image/upload/sample.jpg",
+      :public_id      => 'tag_samplebw',
+      :tags           => [TEST_TAG, ARCHIVE_TAG],
+      :transformation => {
+        :effect => :blackwhite
+      }
+    )
+    Cloudinary::Uploader.upload(
+      "http://res.cloudinary.com/demo/image/upload/sample.jpg",
+      :public_id      => 'tag_sample',
+      :tags           => [TEST_TAG, ARCHIVE_TAG],
+      :transformation => {
+        :effect => :blackwhite
+      }
+    )
+  end
+  include_context "cleanup"
+end
+
+describe Cloudinary::Utils do
+  include_context 'archive'
+
+  describe '.generate_zip_download_url' do
+    let(:options) { {} }
+    let!(:archive_result) {
+      Cloudinary::Utils.download_zip_url(
+        {
+          :target_public_id => 'gem_archive_test',
+          :public_ids       => %w(tag_sample tag_samplebw),
+          :tags             => ARCHIVE_TAG
+        }.merge(options))
+    }
+
+    describe 'public_ids' do
+      it 'should generate a valid url' do
+        expect(archive_result).not_to be_empty
+      end
+      it 'should include two files' do
+        Zip::File.open_buffer(RestClient.get(archive_result)) do |zip_file|
+          list = zip_file.glob('*').map(&:name)
+          expect(list.length).to be(2)
+          expect(list).to include('tag_sample.jpg', 'tag_samplebw.jpg')
+        end
+      end
+    end
+  end
+end
+
+describe Cloudinary::Uploader do
+  include_context 'archive'
+
+  let(:options) { {} }
+
+  describe '.create_archive' do
+    let!(:archive_result) {
+      Cloudinary::Uploader.create_archive(
+        {
+          :target_public_id => 'gem_archive_test',
+          :public_ids       => %w(tag_sample tag_samplebw),
+          :tags             => ARCHIVE_TAG
+        }.merge(options))
+    }
+    let(:options) { { :mode => :create } }
+    it 'should return a Hash' do
+      expect(archive_result).to be_a(Hash)
+    end
+    expected_keys = %w(
+              resource_type
+              type
+              public_id
+              version
+              url
+              secure_url
+              created_at
+              tags
+              signature
+              bytes
+              etag
+              resource_count
+              file_count
+            )
+    it "should include keys: #{expected_keys.join(', ')}" do
+      expect(archive_result.keys).to match_array(expected_keys)
+    end
+  end
+  describe '.create_zip' do
+    it 'should call create_archive with "zip" format' do
+      expect(Cloudinary::Uploader).to receive(:create_archive).with({ :tags => TEST_TAG }, "zip")
+      Cloudinary::Uploader.create_zip({ :tags => TEST_TAG })
+    end
+  end
+end

data/spec/cloudinary_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'cloudinary'
+
+describe Cloudinary do
+  before :all do
+    @user_platform = Cloudinary.user_platform
+  end
+  after :all do
+    Cloudinary.user_platform = @user_platform
+  end
+
+  it 'should add a user platform to USER_AGENT' do
+    Cloudinary.user_platform = "Spec/1.0 (Test)"
+    expect(Cloudinary.USER_AGENT).to match( %r"Spec\/1.0 \(Test\) CloudinaryRuby/[\d.]+")
+
+  end
+end

data/spec/spec_helper.rb

@@ -15,6 +15,12 @@ RSpec.configure do |config|
   config.filter_run_excluding :delete_all => true
 end
 
+RSpec.shared_context "cleanup" do
+  after :all do
+    Cloudinary::Api.delete_resources_by_tag(TEST_TAG) unless Cloudinary.config.keep_test_products
+  end
+
+end
 # Create a regexp with the given +tag+ name.
 def html_tag_matcher( tag)
   /<#{tag}([\s]+([-[:word:]]+)[\s]*\=\s*\"([^\"]*)\")*\s*>.*<\s*\/#{tag}\s*>/
@@ -140,3 +146,20 @@ RSpec::Matchers.define :be_served_by_cloudinary do
   end
 end
 
+def deep_fetch(hash, path)
+  Array(path).reduce(hash) { |h, key| h && h.fetch(key, nil) }
+end
+
+# Matches deep values in the actual Hash, disregarding other keys and values.
+# @example
+#   expect( {:foo => { :bar => 'foobar'}}).to have_deep_hash_values_of( [:foo, :bar] => 'foobar')
+#   expect( foo_instance).to receive(:bar_method).with(deep_hash_values_of([:foo, :bar] => 'foobar'))
+RSpec::Matchers.define :deep_hash_value do |expected|
+  match do |actual|
+    expected.all? do |path, value|
+      values_match? deep_fetch(actual, path), value
+    end
+  end
+end
+
+RSpec::Matchers.alias_matcher :have_deep_hash_values_of, :deep_hash_value

data/spec/uploader_spec.rb

@@ -7,9 +7,10 @@ end
 
 describe Cloudinary::Uploader do
   break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
+  include_context "cleanup"
 
   it "should successfully upload file" do
-    result = Cloudinary::Uploader.upload("spec/logo.png")    
+    result = Cloudinary::Uploader.upload("spec/logo.png", :tags => TEST_TAG)
     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)
@@ -17,121 +18,148 @@ describe Cloudinary::Uploader do
   end
   
   it "should successfully upload a file from pathname", :pathname => true do
-    result = Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"))
+    result = Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"), :tags => TEST_TAG)
     expect(result["width"]).to eq(241)
   end
 
   it "should successfully upload file by url" do
-    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/old_logo.png")
+    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/old_logo.png", :tags => TEST_TAG)
     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)
     expect(result["signature"]).to eq(expected_signature)
   end
-  
-  it "should successfully rename a file" do
-    result = Cloudinary::Uploader.upload("spec/logo.png")
-    Cloudinary::Uploader.rename(result["public_id"], result["public_id"]+"2")
-    expect(Cloudinary::Api.resource(result["public_id"]+"2")).not_to be_nil
 
-    result2 = Cloudinary::Uploader.upload("spec/favicon.ico")
-    expect{Cloudinary::Uploader.rename(result2["public_id"], result["public_id"]+"2")}.to raise_error
-    Cloudinary::Uploader.rename(result2["public_id"], result["public_id"]+"2", :overwrite=>true)
+  describe '.rename' do
+    before(:all) do
+      @result        = Cloudinary::Uploader.upload("spec/logo.png", :tags => TEST_TAG)
+      @resource_1_id = @result["public_id"]
+      result         = Cloudinary::Uploader.upload("spec/favicon.ico", :tags => TEST_TAG)
+      @resource_2_id = result["public_id"]
+    end
+
+    it 'should rename a resource' do
+      Cloudinary::Uploader.rename(@resource_1_id, @resource_1_id+"2")
+      expect(Cloudinary::Api.resource(@resource_1_id+"2")).not_to be_nil
+      @resource_1_id = @resource_1_id+"2" # will not update if expect fails
+    end
+    it 'should not allow renaming to an existing ID' do
+      id             = @resource_2_id
+      @resource_2_id = @resource_1_id+"2" # if rename doesn't fail, this is the new ID
+      expect { Cloudinary::Uploader.rename(id, @resource_1_id+"2") }.to raise_error
+      @resource_2_id = id
+    end
+    context ':overwrite => true' do
+      it 'should rename to an existing ID' do
+        new_id = Cloudinary::Uploader.upload("spec/logo.png", :tags => TEST_TAG)["public_id"]
+        Cloudinary::Uploader.rename(@resource_2_id, new_id, :overwrite => true)
+        expect(Cloudinary::Api.resource(new_id)["format"]).to eq("ico")
+        @resource_2_id = new_id # will not update if expect fails
+      end
+    end
+    context ':invalidate => true' do
+      it 'should notidy the server to invalidate the resource in the CDN' do
+        # Can't test the result, so we just verify the parameter is send to the server
+        expect(RestClient::Request).to receive(:execute).with(deep_hash_value([:payload, :invalidate] => 1))
+        Cloudinary::Uploader.rename(@resource_2_id, @resource_2_id+"2", :invalidate => true) # will not affect the server
+      end
 
-    expect(Cloudinary::Api.resource(result["public_id"]+"2")["format"]).to eq("ico")
+    end
   end
 
+
   it "should support explicit" do
-    result = Cloudinary::Uploader.explicit("cloudinary", :type=>"twitter_name", :eager=>[{:crop=>"scale", :width=>"2.0"}])
+    result = Cloudinary::Uploader.explicit("cloudinary", :type=>"twitter_name", :eager=>[{:crop=>"scale", :width=>"2.0"}], :tags => TEST_TAG)
     url = Cloudinary::Utils.cloudinary_url("cloudinary", :type=>"twitter_name", :crop=>"scale", :width=>"2.0", :format=>"png", :version=>result["version"])
     expect(result["eager"][0]["url"]).to eq(url)
   end
   
   it "should support eager" do
-    Cloudinary::Uploader.upload("spec/logo.png", :eager=>[{:crop=>"scale", :width=>"2.0"}])
+    Cloudinary::Uploader.upload("spec/logo.png", :eager=>[{:crop=>"scale", :width=>"2.0"}], :tags => TEST_TAG)
   end
 
   it "should support headers" do
-    Cloudinary::Uploader.upload("spec/logo.png", :headers=>["Link: 1"])
-    Cloudinary::Uploader.upload("spec/logo.png", :headers=>{"Link" => "1"})
+    Cloudinary::Uploader.upload("spec/logo.png", :headers=>["Link: 1"], :tags => TEST_TAG)
+    Cloudinary::Uploader.upload("spec/logo.png", :headers=>{"Link" => "1"}, :tags => TEST_TAG)
   end
 
   it "should successfully generate text image" do
-    result = Cloudinary::Uploader.text("hello world")
+    result = Cloudinary::Uploader.text("hello world", :tags => TEST_TAG)
     expect(result["width"]).to be > 1
     expect(result["height"]).to be > 1
   end
 
   it "should correctly handle tags" do
-    result = Cloudinary::Uploader.upload("spec/logo.png")
-    Cloudinary::Uploader.add_tag("tag1", result["public_id"])
-    Cloudinary::Uploader.add_tag("tag2", result["public_id"])
-    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to eq(["tag1", "tag2"])
-    Cloudinary::Uploader.remove_tag("tag1", result["public_id"])
-    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to eq(["tag2"])
-    Cloudinary::Uploader.replace_tag("tag3", result["public_id"])
-    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to eq(["tag3"])
+    new_tag = "tag#{rand(10000)}"
+    result = Cloudinary::Uploader.upload("spec/logo.png", :tags => TEST_TAG)
+    Cloudinary::Uploader.add_tag("#{new_tag}_1", result["public_id"])
+    Cloudinary::Uploader.add_tag("#{new_tag}_2", result["public_id"])
+    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to match_array(["#{new_tag}_1", "#{new_tag}_2", TEST_TAG])
+    Cloudinary::Uploader.remove_tag("#{new_tag}_1", result["public_id"])
+    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to match_array(["#{new_tag}_2", TEST_TAG])
+    Cloudinary::Uploader.replace_tag("#{new_tag}_3", result["public_id"])
+    expect(Cloudinary::Api.resource(result["public_id"])["tags"]).to match_array(["#{new_tag}_3"])
   end
   
   it "should correctly handle unique_filename" do
-    result = Cloudinary::Uploader.upload("spec/logo.png", :use_filename => true)
+    result = Cloudinary::Uploader.upload("spec/logo.png", :use_filename => true, :tags => TEST_TAG)
     expect(result["public_id"]).to match(/logo_[a-zA-Z0-9]{6}/)
-    result = Cloudinary::Uploader.upload("spec/logo.png", :use_filename => true, :unique_filename => false)
+    result = Cloudinary::Uploader.upload("spec/logo.png", :use_filename => true, :unique_filename => false, :tags => TEST_TAG)
     expect(result["public_id"]).to eq("logo")
   end
   
   it "should allow whitelisted formats if allowed_formats", :allowed=>true do
-    result = Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["png"])
+    result = Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["png"], :tags => TEST_TAG)
     expect(result["format"]).to eq("png")
   end
   
   it "should prevent non whitelisted formats from being uploaded if allowed_formats is specified", :allowed=>true do
-    expect{Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["jpg"])}.to raise_error
+    expect{Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["jpg"], :tags => TEST_TAG)}.to raise_error
   end
   
   it "should allow non whitelisted formats if type is specified and convert to that type", :allowed=>true do
-    result = Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["jpg"], :format => "jpg")
+    result = Cloudinary::Uploader.upload("spec/logo.png", :allowed_formats => ["jpg"], :format => "jpg", :tags => TEST_TAG)
     expect(result["format"]).to eq("jpg")
   end
   
   it "should allow sending face coordinates" do
     coordinates = [[120, 30, 109, 150], [121, 31, 110, 151]]
-    result = Cloudinary::Uploader.upload("spec/logo.png", {:face_coordinates => coordinates, :faces => true})
+    result = Cloudinary::Uploader.upload("spec/logo.png", {:face_coordinates => coordinates, :faces => true, :tags => TEST_TAG})
     expect(result["faces"]).to eq(coordinates)
 
     different_coordinates = [[122, 32, 111, 152]]
-    Cloudinary::Uploader.explicit(result["public_id"], {:face_coordinates => different_coordinates, :faces => true, :type => "upload"})
+    Cloudinary::Uploader.explicit(result["public_id"], {:face_coordinates => different_coordinates, :faces => true, :type => "upload", :tags => TEST_TAG})
     info = Cloudinary::Api.resource(result["public_id"], {:faces => true})
     expect(info["faces"]).to eq(different_coordinates)
   end
   
   it "should allow sending context" do
     context = {"caption" => "some caption", "alt" => "alternative"}
-    result = Cloudinary::Uploader.upload("spec/logo.png", {:context => context})
+    result = Cloudinary::Uploader.upload("spec/logo.png", {:context => context, :tags => TEST_TAG})
     info = Cloudinary::Api.resource(result["public_id"], {:context => true})
     expect(info["context"]).to eq({"custom" => context})
   end
   
   it "should support requesting manual moderation" do
-    result = Cloudinary::Uploader.upload("spec/logo.png", {:moderation => :manual})
+    result = Cloudinary::Uploader.upload("spec/logo.png", {:moderation => :manual, :tags => TEST_TAG})
     expect(result["moderation"][0]["status"]).to eq("pending")
     expect(result["moderation"][0]["kind"]).to eq("manual")
   end
     
   it "should support requesting raw conversion" do
-    expect{Cloudinary::Uploader.upload("spec/docx.docx", {:resource_type => :raw, :raw_convert => :illegal})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
+    expect{Cloudinary::Uploader.upload("spec/docx.docx", {:resource_type => :raw, :raw_convert => :illegal, :tags => TEST_TAG})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting categorization" do
-    expect{Cloudinary::Uploader.upload("spec/logo.png", {:categorization => :illegal})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
+    expect{Cloudinary::Uploader.upload("spec/logo.png", {:categorization => :illegal, :tags => TEST_TAG})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting detection" do
-    expect{Cloudinary::Uploader.upload("spec/logo.png", {:detection => :illegal})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
+    expect{Cloudinary::Uploader.upload("spec/logo.png", {:detection => :illegal, :tags => TEST_TAG})}.to raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting auto_tagging" do
-    expect{Cloudinary::Uploader.upload("spec/logo.png", {:auto_tagging => 0.5})}.to raise_error(CloudinaryException, /Must use/)
+    expect{Cloudinary::Uploader.upload("spec/logo.png", {:auto_tagging => 0.5, :tags => TEST_TAG})}.to raise_error(CloudinaryException, /Must use/)
   end
 
   it "should support upload_large", :large => true do
@@ -140,10 +168,10 @@ describe Cloudinary::Uploader do
     io.puts(header)
     5880000.times{ io.write("\xFF") }
     io.rewind
-    result = Cloudinary::Uploader.upload_large(io, :chunk_size => 5243000)
+    result = Cloudinary::Uploader.upload_large(io, :chunk_size => 5243000, :tags => TEST_TAG)
     expect(result["resource_type"]).to eq('raw')
     io.rewind
-    result = Cloudinary::Uploader.upload_large(io, :resource_type => 'image', :chunk_size => 5243000)
+    result = Cloudinary::Uploader.upload_large(io, :resource_type => 'image', :chunk_size => 5243000, :tags => TEST_TAG)
     expect(result["resource_type"]).to eq('image')
     expect(result["width"]).to eq(1400)
     expect(result["height"]).to eq(1400)
@@ -156,17 +184,16 @@ describe Cloudinary::Uploader do
     end
     
     it "should support unsigned uploading using presets", :upload_preset => true do
-      preset = Cloudinary::Api.create_upload_preset(:folder => "test_folder_upload", :unsigned => true)
+      preset = Cloudinary::Api.create_upload_preset(:folder => "test_folder_upload", :unsigned => true, :tags => TEST_TAG)
 
       Cloudinary.config.api_key = nil
       Cloudinary.config.api_secret = nil
 
-      result = Cloudinary::Uploader.unsigned_upload("spec/logo.png", preset["name"])
+      result = Cloudinary::Uploader.unsigned_upload("spec/logo.png", preset["name"], :tags => TEST_TAG)
       expect(result["public_id"]).to match(/^test_folder_upload\/[a-z0-9]+$/)
 
       Cloudinary.class_variable_set(:@@config, nil)
 
-      Cloudinary::Api.delete_upload_preset(preset["name"])
     end
   end
 
@@ -180,7 +207,26 @@ describe Cloudinary::Uploader do
     end
 
     it "should fail if timeout is reached" do
-      expect{Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"))}.to raise_error
+      expect{Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"), :tags => TEST_TAG)}.to raise_error
+    end
+  end
+
+  context ":responsive_breakpoints" do
+    context ":create_derived" do
+      result = Cloudinary::Uploader.upload("spec/logo.png", :responsive_breakpoints => {:create_derived => false }, :tags => TEST_TAG)
+      it 'should return a responsive_breakpoints in the response' do
+        expect(result).to include('responsive_breakpoints')
+      end
+    end
+  end
+  describe 'explicit' do
+
+    context ":invalidate" do
+      it 'should pass the invalidate value to the server' do
+        expect(RestClient::Request).to receive(:execute).with(deep_hash_value( [:payload, :invalidate] => 1))
+        Cloudinary::Uploader.explicit("cloudinary", :type=>"twitter_name", :eager=>[{:crop=>"scale", :width=>"2.0"}], :invalidate => true, :tags => TEST_TAG)
+      end
     end
   end
 end
+

data/spec/utils_spec.rb

@@ -7,22 +7,17 @@ describe Cloudinary::Utils do
     Cloudinary.config do |config|
       # config.cloud_name = "demo"
       config.secure_distribution = nil
-      config.private_cdn = false
-      config.secure = false
-      config.cname = nil
-      config.cdn_subdomain = false
+      config.private_cdn         = false
+      config.secure              = false
+      config.cname               = nil
+      config.cdn_subdomain       = false
     end
   end
-  let(:cloud_name) {Cloudinary.config.cloud_name}
+
+  let(:cloud_name) { Cloudinary.config.cloud_name }
   let(:root_path) { "http://res.cloudinary.com/#{cloud_name}" }
   let(:upload_path) { "#{root_path}/image/upload" }
 
-  it "should use cloud_name from config" do
-    expect(["test", {}])
-      .to produce_url( "#{upload_path}/test")
-        .and empty_options
-  end
-
   it "should allow overriding cloud_name in options" do
     expect(["test", { :cloud_name => "test321" }])
       .to produce_url("http://res.cloudinary.com/test321/image/upload/test")
@@ -30,221 +25,221 @@ describe Cloudinary::Utils do
   end
 
   it "should use default secure distribution if secure=true" do
-    expect(["test",{:secure=>true}])
+    expect(["test", { :secure => true }])
       .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should allow overriding secure distribution if secure=true" do
-    expect(["test",{:secure=>true, :secure_distribution=>"something.else.com"}])
+    expect(["test", { :secure => true, :secure_distribution => "something.else.com" }])
       .to produce_url("https://something.else.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should take secure distribution from config if secure=true" do
     Cloudinary.config.secure_distribution = "config.secure.distribution.com"
-    expect(["test",{:secure=>true}])
+    expect(["test", { :secure => true }])
       .to produce_url("https://config.secure.distribution.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should default to akamai if secure is given with private_cdn and no secure_distribution" do
-    expect(["test",{:secure=>true, :private_cdn=>true}])
+    expect(["test", { :secure => true, :private_cdn => true }])
       .to produce_url("https://#{cloud_name}-res.cloudinary.com/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should not add cloud_name if secure private_cdn and secure non akamai secure_distribution" do
-    expect(["test",{:secure=>true, :private_cdn=>true, :secure_distribution=>"something.cloudfront.net"}])
+    expect(["test", { :secure => true, :private_cdn => true, :secure_distribution => "something.cloudfront.net" }])
       .to produce_url("https://something.cloudfront.net/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should allow overriding private_cdn if private_cdn=true" do
-    expect(["test",{:private_cdn => true}])
+    expect(["test", { :private_cdn => true }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should allow overriding private_cdn if private_cdn=false" do
     Cloudinary.config.private_cdn = true
-    expect(["test",{ :private_cdn => false }])
+    expect(["test", { :private_cdn => false }])
       .to produce_url("#{upload_path}/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should allow overriding cname if cname=example.com" do
-    expect(["test",{:cname => "example.com"}])
+    expect(["test", { :cname => "example.com" }])
       .to produce_url("http://example.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should allow overriding cname if cname=false" do
     Cloudinary.config.cname = "example.com"
-    expect(["test",{ :cname => false }])
+    expect(["test", { :cname => false }])
       .to produce_url("#{upload_path}/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should use format from options" do
-    expect(["test",{ :format => :jpg }])
+    expect(["test", { :format => :jpg }])
       .to produce_url("#{upload_path}/test.jpg")
-      .and empty_options
+            .and empty_options
   end
 
   it "should disallow url_suffix in shared distribution" do
-    expect{Cloudinary::Utils.cloudinary_url("test", {:url_suffix=>"hello"})}.to raise_error(CloudinaryException)
+    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)
+    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)
+    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
-    expect(["test",{:url_suffix=>"hello", :private_cdn=>true}])
+    expect(["test", { :url_suffix => "hello", :private_cdn => true }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/test/hello")
-      .and empty_options
-    expect(["test",{:url_suffix=>"hello", :angle=>0, :private_cdn=>true}])
+            .and empty_options
+    expect(["test", { :url_suffix => "hello", :angle => 0, :private_cdn => true }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/a_0/test/hello")
-      .and empty_options
+            .and empty_options
   end
 
   it "should put format after url_suffix" do
-    expect(["test",{:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg"}])
+    expect(["test", { :url_suffix => "hello", :private_cdn => true, :format => "jpg" }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/test/hello.jpg")
-      .and empty_options
+            .and empty_options
   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
-    expect(["test",{:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :sign_url=>true}])
+    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format => "jpg", :sign_url => true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
+    expect(["test", { :url_suffix => "hello", :private_cdn => true, :format => "jpg", :sign_url => true }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/#{expected_signture}/test/hello.jpg")
-      .and empty_options
+            .and empty_options
 
-    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format=>"jpg", :angle=>0, :sign_url=>true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
-    expect(["test",{:url_suffix=>"hello", :private_cdn=>true, :format=>"jpg", :angle=>0, :sign_url=>true}])
+    expected_signture = Cloudinary::Utils.cloudinary_url("test", :format => "jpg", :angle => 0, :sign_url => true).match(/s--[0-9A-Za-z_-]{8}--/).to_s
+    expect(["test", { :url_suffix => "hello", :private_cdn => true, :format => "jpg", :angle => 0, :sign_url => true }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/#{expected_signture}/a_0/test/hello.jpg")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support url_suffix for raw uploads" do
-    expect(["test",{:url_suffix=>"hello", :private_cdn=>true, :resource_type=>:raw}])
+    expect(["test", { :url_suffix => "hello", :private_cdn => true, :resource_type => :raw }])
       .to produce_url("http://#{cloud_name}-res.cloudinary.com/files/test/hello")
-      .and empty_options
+            .and empty_options
   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)
-      expect(["test",{ :use_root_path => true, :private_cdn => false }])
+      expect(["test", { :use_root_path => true, :private_cdn => false }])
         .to produce_url("#{root_path}/test")
-        .and empty_options
-      expect(["test",{ :use_root_path => true, :private_cdn => false, :angle => 0 }])
+              .and empty_options
+      expect(["test", { :use_root_path => true, :private_cdn => false, :angle => 0 }])
         .to produce_url("#{root_path}/a_0/test")
-        .and empty_options
+              .and empty_options
     end
 
     it "should support use_root_path for private_cdn" do
-      expect(["test",{:use_root_path=>true, :private_cdn=>true}])
+      expect(["test", { :use_root_path => true, :private_cdn => true }])
         .to produce_url("http://#{cloud_name}-res.cloudinary.com/test")
-        .and empty_options
-      expect(["test",{:use_root_path=>true, :private_cdn=>true, :angle=>0}])
+              .and empty_options
+      expect(["test", { :use_root_path => true, :private_cdn => true, :angle => 0 }])
         .to produce_url("http://#{cloud_name}-res.cloudinary.com/a_0/test")
-        .and empty_options
+              .and empty_options
     end
 
     it "should support use_root_path together with url_suffix for private_cdn" do
-      expect(["test",{:use_root_path=>true, :url_suffix=>"hello", :private_cdn=>true}])
+      expect(["test", { :use_root_path => true, :url_suffix => "hello", :private_cdn => true }])
         .to produce_url("http://#{cloud_name}-res.cloudinary.com/test/hello")
-        .and empty_options
+              .and empty_options
     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)
+      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
   describe ":width, :height" do
     it "should use width and height from options only if crop is given" do
-      expect(["test",{ :width => 100, :height => 100 }])
+      expect(["test", { :width => 100, :height => 100 }])
         .to produce_url("#{upload_path}/test")
-          .and mutate_options_to({ :width => 100, :height => 100 })
-      expect(["test",{ :width => 100, :height => 100, :crop => :crop }])
+              .and mutate_options_to({ :width => 100, :height => 100 })
+      expect(["test", { :width => 100, :height => 100, :crop => :crop }])
         .to produce_url("#{upload_path}/c_crop,h_100,w_100/test")
-          .and mutate_options_to({ :width => 100, :height => 100 })
+              .and mutate_options_to({ :width => 100, :height => 100 })
     end
 
     it "should not pass width and height to html in case of fit, lfill or limit crop" do
-      expect(["test",{ :width => 100, :height => 100, :crop => :limit }])
+      expect(["test", { :width => 100, :height => 100, :crop => :limit }])
         .to produce_url("#{upload_path}/c_limit,h_100,w_100/test")
-        .and empty_options
-      expect(["test",{ :width => 100, :height => 100, :crop => :lfill }])
+              .and empty_options
+      expect(["test", { :width => 100, :height => 100, :crop => :lfill }])
         .to produce_url("#{upload_path}/c_lfill,h_100,w_100/test")
-        .and empty_options
-      expect(["test",{ :width => 100, :height => 100, :crop => :fit }])
+              .and empty_options
+      expect(["test", { :width => 100, :height => 100, :crop => :fit }])
         .to produce_url("#{upload_path}/c_fit,h_100,w_100/test")
-        .and empty_options
+              .and empty_options
     end
 
     it "should not pass width and height to html in case angle was used" do
-      expect(["test",{ :width => 100, :height => 100, :crop => :scale, :angle => :auto }])
+      expect(["test", { :width => 100, :height => 100, :crop => :scale, :angle => :auto }])
         .to produce_url("#{upload_path}/a_auto,c_scale,h_100,w_100/test")
-        .and empty_options
+              .and empty_options
     end
     it "should support size" do
-      expect(["test",{ :size => "10x10", :crop => :crop }])
+      expect(["test", { :size => "10x10", :crop => :crop }])
         .to produce_url("#{upload_path}/c_crop,h_10,w_10/test")
-          .and mutate_options_to({ :width => "10", :height => "10" })
+              .and mutate_options_to({ :width => "10", :height => "10" })
     end
   end
 
   it "should use x, y, radius, prefix, gravity and quality from options" do
-    expect(["test",{ :x => 1, :y => 2, :radius => 3, :gravity => :center, :quality => 0.4, :prefix => "a" }])
+    expect(["test", { :x => 1, :y => 2, :radius => 3, :gravity => :center, :quality => 0.4, :prefix => "a" }])
       .to produce_url("#{upload_path}/g_center,p_a,q_0.4,r_3,x_1,y_2/test")
-      .and empty_options
+            .and empty_options
   end
 
   describe ":transformation" do
     it "should support named tranformation" do
-      expect(["test",{ :transformation => "blip" }])
+      expect(["test", { :transformation => "blip" }])
         .to produce_url("#{upload_path}/t_blip/test")
-        .and empty_options
+              .and empty_options
     end
 
     it "should support array of named tranformations" do
-      expect(["test",{ :transformation => ["blip", "blop"] }])
+      expect(["test", { :transformation => ["blip", "blop"] }])
         .to produce_url("#{upload_path}/t_blip.blop/test")
-        .and empty_options
+              .and empty_options
     end
 
     it "should support base tranformation" do
-      expect(["test",{ :transformation => { :x => 100, :y => 100, :crop => :fill }, :crop => :crop, :width => 100 }])
+      expect(["test", { :transformation => { :x => 100, :y => 100, :crop => :fill }, :crop => :crop, :width => 100 }])
         .to produce_url("#{upload_path}/c_fill,x_100,y_100/c_crop,w_100/test")
-          .and mutate_options_to({ :width => 100 })
+              .and mutate_options_to({ :width => 100 })
     end
 
     it "should support array of base tranformations" do
-      expect(["test",{ :transformation => [{ :x => 100, :y => 100, :width => 200, :crop => :fill }, { :radius => 10 }], :crop => :crop, :width => 100 }])
+      expect(["test", { :transformation => [{ :x => 100, :y => 100, :width => 200, :crop => :fill }, { :radius => 10 }], :crop => :crop, :width => 100 }])
         .to produce_url("#{upload_path}/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test")
-          .and mutate_options_to({ :width => 100 })
+              .and mutate_options_to({ :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}])
+      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
-      expect(["test", { :transformation => [{}, { :x => 100, :y => 100, :crop => :fill },{}] }])
+      expect(["test", { :transformation => [{}, { :x => 100, :y => 100, :crop => :fill }, {}] }])
         .to produce_url("#{upload_path}/c_fill,x_100,y_100/test")
-        .and empty_options
+              .and empty_options
     end
   end
 
@@ -354,11 +349,11 @@ describe Cloudinary::Utils do
                                   :type => 'authenticated',
                                   :tags => TEST_TAG
     end
-    let(:options) {{ :version => authenticated_image['version'], :sign_url => true, :type => :authenticated }.merge(specific_options)}
+    let(:options) { { :version => authenticated_image['version'], :sign_url => true, :type => :authenticated }.merge(specific_options) }
     let(:authenticated_path) { "#{root_path}/image/authenticated" }
 
     it "should not serve resource with the wrong signature" do
-      expect(authenticated_image["url"].sub(/(?:s--)([\w-]+)(?:--)/) {|s| s.succ})
+      expect(authenticated_image["url"].sub(/(?:s--)([\w-]+)(?:--)/) { |s| s.succ })
         .not_to be_served_by_cloudinary
     end
 
@@ -395,14 +390,14 @@ describe Cloudinary::Utils do
   { 'overlay' => :l, :underlay => :u }.each do |param, letter|
     describe param do
       let(:root_path) { "http://res.cloudinary.com/#{cloud_name}" }
-      # [name, options, result]
       let(:layers_options) { [
-        ["string", "text:hello", "text:hello"],
-        ["public_id", { "public_id" => "logo" }, "logo"],
-        ["public_id with folder", { "public_id" => "folder/logo" }, "folder:logo"],
-        ["private", { "public_id" => "logo", "type" => "private" }, "private:logo"],
-        ["format", { "public_id" => "logo", "format" => "png" }, "logo.png"],
-        ["video", { "resource_type" => "video", "public_id" => "cat" }, "video:cat"],
+      # [name,                    options,                                              result]
+        ["string",                "text:hello",                                         "text:hello"],
+        ["public_id",             { "public_id" => "logo" },                            "logo"],
+        ["public_id with folder", { "public_id" => "folder/logo" },                     "folder:logo"],
+        ["private",               { "public_id" => "logo", "type" => "private" },       "private:logo"],
+        ["format",                { "public_id" => "logo", "format" => "png" },         "logo.png"],
+        ["video",                 { "resource_type" => "video", "public_id" => "cat" }, "video:cat"],
       ] }
       it "should support #{param}" do
         layers_options.each do |name, options, result|
@@ -418,11 +413,11 @@ describe Cloudinary::Utils do
     end
   end
 
-
   describe "text" do
 
-    text_layer = "Hello World, /Nice to meet you?"
+    text_layer   = "Hello World, /Nice to meet you?"
     text_encoded = "Hello%20World%252C%20%252FNice%20to%20meet%20you%3F"
+
     before :all do
       Cloudinary::Uploader.text(text_layer, {
         :public_id   => "test_text",
@@ -431,7 +426,7 @@ describe Cloudinary::Utils do
         :font_size   => "18",
         :tags        => TEST_TAG
       })
-      srt = Tempfile.new('test_subtitles.srt')
+      srt = Tempfile.new(['test_subtitles', '.srt'])
       srt.write <<-END
       1
       00:00:10,500 --> 00:00:13,000
@@ -443,20 +438,18 @@ describe Cloudinary::Utils do
       srt.unlink
     end
 
-    # after :all do
-    #   Cloudinary::Api.delete_resources_by_tag TEST_TAG
-    # end
+    include_context "cleanup"
 
     { 'overlay' => 'l', 'underlay' => 'u' }.each do |param, short|
       describe param do
         let(:root_path) { "http://res.cloudinary.com/#{cloud_name}" }
         # [name, options, result]
-        layers_options=   [
+        layers_options= [
           ["string", "text:test_text:hello", "text:test_text:hello"],
-          ["explicit layer parameter",  "text:test_text:#{text_encoded}", "text:test_text:#{text_encoded}" ],
-          ["text parameter", { :public_id => "test_text", :text => text_layer }, "text:test_text:#{text_encoded}" ],
+          ["explicit layer parameter", "text:test_text:#{text_encoded}", "text:test_text:#{text_encoded}"],
+          ["text parameter", { :public_id => "test_text", :text => text_layer }, "text:test_text:#{text_encoded}"],
           ["text with font family and size parameters", { :text => text_layer, :font_family => "Arial", :font_size => "18" }, "text:Arial_18:#{text_encoded}"],
-          ["text with text style parameter", { :text => text_layer, :font_family => "Arial", :font_size => "18", :font_weight => "bold", :font_style => "italic", :letter_spacing => 4 }, "text:Arial_18_bold_italic_letter_spacing_4:#{text_encoded}"],
+          ["text with text style parameter", { :text => text_layer, :font_family => "Arial", :font_size => "18", :font_weight => "bold", :font_style => "italic", :letter_spacing => 4, :line_spacing => 2 }, "text:Arial_18_bold_italic_letter_spacing_4_line_spacing_2:#{text_encoded}"],
           ["subtitles", { :resource_type => "subtitles", :public_id => "subtitles.srt" }, "subtitles:subtitles.srt"],
           ["subtitles with font family and size", { :resource_type => "subtitles", :public_id => "subtitles.srt", :font_family => "Arial", :font_size => "40" }, "subtitles:Arial_40:subtitles.srt"]
         ]
@@ -466,7 +459,7 @@ describe Cloudinary::Utils do
             expect("#{upload_path}/#{short}_#{result}/sample").to be_served_by_cloudinary
           end
           unless options.is_a? String
-            op = Hash.new
+            op        = Hash.new
             op[param] = options
             it_behaves_like "a signed url", op, "#{short}_#{result}"
           end
@@ -483,131 +476,141 @@ describe Cloudinary::Utils do
   end
 
 
-
   it "should use ssl_detected if secure is not given as parameter and not set to true in configuration" do
-    expect(["test",{:ssl_detected=>true}])
+    expect(["test", { :ssl_detected => true }])
       .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should use secure if given over ssl_detected and configuration" do
     Cloudinary.config.secure = true
-    expect(["test",{ :ssl_detected => true, :secure => false }])
+    expect(["test", { :ssl_detected => true, :secure => false }])
       .to produce_url("#{upload_path}/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should use secure: true from configuration over ssl_detected" do
     Cloudinary.config.secure = true
-    expect(["test",{:ssl_detected=>false}])
+    expect(["test", { :ssl_detected => false }])
       .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support extenal cname" do
-    expect(["test",{:cname=>"hello.com"}])
+    expect(["test", { :cname => "hello.com" }])
       .to produce_url("http://hello.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support extenal cname with cdn_subdomain on" do
-    expect(["test",{:cname=>"hello.com", :cdn_subdomain=>true}])
+    expect(["test", { :cname => "hello.com", :cdn_subdomain => true }])
       .to produce_url("http://a2.hello.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support cdn_subdomain with secure on if using shared_domain" do
-    expect(["test",{:secure=>true, :cdn_subdomain=>true}])
+    expect(["test", { :secure => true, :cdn_subdomain => true }])
       .to produce_url("https://res-2.cloudinary.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support secure_cdn_subdomain false override with secure" do
-    expect(["test",{:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>false}])
+    expect(["test", { :secure => true, :cdn_subdomain => true, :secure_cdn_subdomain => false }])
       .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support secure_cdn_subdomain true override with secure" do
-    expect(["test",{:secure=>true, :cdn_subdomain=>true, :secure_cdn_subdomain=>true, :private_cdn=>true}])
+    expect(["test", { :secure => true, :cdn_subdomain => true, :secure_cdn_subdomain => true, :private_cdn => true }])
       .to produce_url("https://#{cloud_name}-res-2.cloudinary.com/image/upload/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support string param" do
-    expect(["test",{ "effect" => { "sepia" => 10 } }])
+    expect(["test", { "effect" => { "sepia" => 10 } }])
       .to produce_url("#{upload_path}/e_sepia:10/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should support border" do
-    expect(["test",{ "border" => { :width => 5 } }])
+    expect(["test", { "border" => { :width => 5 } }])
       .to produce_url("#{upload_path}/bo_5px_solid_black/test")
-      .and empty_options
-    expect(["test",{ "border" => { :width => 5, :color => "#ffaabbdd" } }])
+            .and empty_options
+    expect(["test", { "border" => { :width => 5, :color => "#ffaabbdd" } }])
       .to produce_url("#{upload_path}/bo_5px_solid_rgb:ffaabbdd/test")
-      .and empty_options
-    expect(["test",{ "border" => "1px_solid_blue" }])
+            .and empty_options
+    expect(["test", { "border" => "1px_solid_blue" }])
       .to produce_url("#{upload_path}/bo_1px_solid_blue/test")
-      .and empty_options
+            .and empty_options
     expect(["test", { "border" => "2" }]).to produce_url("#{upload_path}/test").and mutate_options_to({ :border => "2" })
   end
 
   it "should support flags" do
-    expect(["test",{ "flags" => "abc" }])
+    expect(["test", { "flags" => "abc" }])
       .to produce_url("#{upload_path}/fl_abc/test")
-      .and empty_options
-    expect(["test",{ "flags" => ["abc", "def"] }])
+            .and empty_options
+    expect(["test", { "flags" => ["abc", "def"] }])
       .to produce_url("#{upload_path}/fl_abc.def/test")
-      .and empty_options
+            .and empty_options
+  end
+
+  it "should support aspect ratio" do
+    expect(["test", { "aspect_ratio" => "1.0" }])
+      .to produce_url("#{upload_path}/ar_1.0/test")
+            .and empty_options
+    expect(["test", { "aspect_ratio" => "3:2" }])
+      .to produce_url("#{upload_path}/ar_3:2/test")
+            .and empty_options
   end
 
   it "build_upload_params should not destroy options" do
-    options = {:width=>100, :crop=>:scale}
+    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,
-               :image_metadata=>:false, :invalidate=>1}
-    params = Cloudinary::Uploader.build_upload_params(options)
-    expect(Cloudinary::Api.only(params, *options.keys)).to eq(
-      :backup=>1, :use_filename=>0, :colors=>1,
-               :image_metadata=>0, :invalidate=>1
-    )
-    options = {:colors=>"true", :exif=>"false", :eager_async=>"1"}
-    params = Cloudinary::Uploader.build_upload_params(options)
-    expect(Cloudinary::Api.only(params, *options.keys)).to eq(
-      :exif=>0, :colors=>1,  :eager_async=>1
-    )
-    expect(Cloudinary::Uploader.build_upload_params(:backup=>nil)[:backup]).to be_nil
+    options = { :backup         => true, :use_filename => false, :colors => :true,
+                :image_metadata => :false, :invalidate => 1 }
+    params  = Cloudinary::Uploader.build_upload_params(options)
+    expect(Cloudinary::Api.only(params, *options.keys))
+      .to eq(:backup         => 1,
+             :use_filename   => 0,
+             :colors         => 1,
+             :image_metadata => 0,
+             :invalidate     => 1
+          )
+    options = { :colors => "true", :exif => "false", :eager_async => "1" }
+    params  = Cloudinary::Uploader.build_upload_params(options)
+    expect(Cloudinary::Api.only(params, *options.keys))
+      .to eq(:exif => 0, :colors => 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
     expect(["folder/test", {}])
-      .to produce_url( "#{upload_path}/v1/folder/test")
-        .and empty_options
-    expect(["folder/test",{ :version => 123 }])
+      .to produce_url("#{upload_path}/v1/folder/test")
+            .and empty_options
+    expect(["folder/test", { :version => 123 }])
       .to produce_url("#{upload_path}/v123/folder/test")
-      .and empty_options
+            .and empty_options
   end
 
   it "should not add version if public_id contains version already" do
     expect(["v1234/test", {}])
-      .to produce_url( "#{upload_path}/v1234/test")
-        .and empty_options
+      .to produce_url("#{upload_path}/v1234/test")
+            .and empty_options
   end
 
   it "should allow to shorted image/upload urls" do
-    expect(["test",{ :shorten => true }])
+    expect(["test", { :shorten => true }])
       .to produce_url("#{root_path}/iu/test")
-      .and empty_options
+            .and empty_options
   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)
+    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
@@ -621,7 +624,7 @@ describe Cloudinary::Utils do
       ["a??b", "a%3F%3Fb"],
       ["parentheses(interject)", "parentheses%28interject%29"]
     ].each do
-      |source, target|
+    |source, target|
       expect(Cloudinary::Utils.cloudinary_url(source)).to eq("#{upload_path}/#{target}")
     end
   end
@@ -636,29 +639,33 @@ describe Cloudinary::Utils do
   end
 
   it "should correctly sign_request" do
-    params = Cloudinary::Utils.sign_request({
-      :cloud_name => "demo",
-      :api_key => "1234",
-      :api_secret => "b",
-      :public_id=>"folder/file",
-      :version=>"1234"})
-    expect(params).to include(
-      :signature=>"bc812f98b6c86c7a4e7779324f554d7c010d3510"
+    params = Cloudinary::Utils.sign_request(
+      {
+        :public_id => "folder/file",
+        :version   => "1234" },
+      {
+        :cloud_name => "demo",
+        :api_key    => "1234",
+        :api_secret => "b"
+      }
     )
+    expect(params).to include(:signature => "7a3349cbb373e4812118d625047ede50b90e7b67")
   end
 
   it "should support responsive width" do
-    expect(["test",{ :width => 100, :height => 100, :crop => :crop, :responsive_width => true }])
+    expect(["test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }])
       .to produce_url("#{upload_path}/c_crop,h_100,w_100/c_limit,w_auto/test")
-        .and mutate_options_to({ :responsive => true })
-    Cloudinary.config.responsive_width_transformation = {:width => :auto, :crop => :pad}
+            .and mutate_options_to({ :responsive => true })
+    Cloudinary.config.responsive_width_transformation = { :width => :auto, :crop => :pad }
     expect(["test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }])
-    .to produce_url( "#{upload_path}/c_crop,h_100,w_100/c_pad,w_auto/test")
-    .and mutate_options_to( { :responsive => true })
+      .to produce_url("#{upload_path}/c_crop,h_100,w_100/c_pad,w_auto/test")
+            .and mutate_options_to({ :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")
+    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