cloudinary 1.1.0 → 1.1.1

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 require 'rspec'
 require 'rexml/parsers/ultralightparser'
 require 'rspec/version'
+require 'rest_client'
+
+TEST_IMAGE_URL = "http://cloudinary.com/images/old_logo.png"
+TEST_TAG = 'cloudinary_gem_test'
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -73,11 +77,66 @@ class TestTag
   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
+RSpec::Matchers.define :produce_url do |expected_url|
+  match do |params|
+    public_id, options = params
+    actual_options = options.clone
+    @url = Cloudinary::Utils.cloudinary_url(public_id, actual_options)
+    values_match? expected_url, @url
+  end
+  failure_message do |actual|
+    "expected #{actual} to\nproduce: #{expected_url}\nbut got: #{@url}"
+  end
+end
+
+RSpec::Matchers.define :mutate_options_to do |expected_options|
+  match do |params|
+    public_id, options = params
+    options = options.clone
+    Cloudinary::Utils.cloudinary_url(public_id, options)
+    @actual = options
+    values_match? expected_options, @actual
+  end
+end
+
+RSpec::Matchers.define :empty_options do
+  match do |params|
+    public_id, options = params
+    options = options.clone
+    Cloudinary::Utils.cloudinary_url(public_id, options)
+    options.empty?
+  end
+end
+
+# Verify that the given URL can be served by Cloudinary by fetching the resource from the server
+RSpec::Matchers.define :be_served_by_cloudinary do
+  match do |url|
+    if url.is_a? Array
+      url = Cloudinary::Utils.cloudinary_url( url[0], url[1])
+    end
+    code = 0
+    @url = url
+    RestClient.get @url do |response, request, result|
+      @result = result
+      code = response.code
+    end
+    values_match? 200, code
+  end
+
+  failure_message do |actual|
+    if @result
+      "Couldn't serve #{actual}. #{@result["status"]}: #{@result["x-cld-error"]}"
+    else
+      "Couldn't serve #{actual}."
+    end
+  end
+  failure_message_when_negated do |actual|
+    if @result
+      "Expected #{@url} not to be served by cloudinary. #{@result["status"]}: #{@result["x-cld-error"]}"
+    else
+      "Expected #{@url} not to be served by cloudinary."
+    end
+
+  end
 end
 
-TEST_IMAGE_URL = "http://cloudinary.com/images/old_logo.png"

data/spec/utils_methods_spec.rb

@@ -7,12 +7,12 @@ include Cloudinary
 describe Utils do
 
   it 'should parse integer range values' do
-    expect(Utils.norm_range_value("200")).to eq( "200")
+    expect(Utils.instance_eval {norm_range_value("200")}).to eq( "200")
   end
   it "should parse float range values" do
-    expect(Utils.norm_range_value("200.0")).to eq("200.0"), "parse a float"
+    expect(Utils.instance_eval {norm_range_value("200.0")}).to eq("200.0"), "parse a float"
   end
   it "should parse a percent range value" do
-    expect(Utils.norm_range_value("20p")).to eq("20p")
+    expect(Utils.instance_eval {norm_range_value("20p")}).to eq("20p")
   end
 end

data/spec/utils_spec.rb

@@ -2,70 +2,94 @@ require 'spec_helper'
 require 'cloudinary'
 
 describe Cloudinary::Utils do
-  before(:each) do
+
+  before :each do
     Cloudinary.config do |config|
-      config.cloud_name = "test123"
+      # config.cloud_name = "demo"
       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
-  let(:root_path) { "http://res.cloudinary.com/test123" }
+  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
-    test_cloudinary_url("test", {}, "#{upload_path}/test", {})
+    expect(["test", {}])
+      .to produce_url( "#{upload_path}/test")
+        .and empty_options
   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", {})
+    expect(["test", { :cloud_name => "test321" }])
+      .to produce_url("http://res.cloudinary.com/test321/image/upload/test")
+            .and empty_options
   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", {})
+
+  it "should use default secure distribution if secure=true" do
+    expect(["test",{:secure=>true}])
+      .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+  it "should allow overriding secure distribution if secure=true" do
+    expect(["test",{:secure=>true, :secure_distribution=>"something.else.com"}])
+      .to produce_url("https://something.else.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+    expect(["test",{:secure=>true}])
+      .to produce_url("https://config.secure.distribution.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+    expect(["test",{:secure=>true, :private_cdn=>true}])
+      .to produce_url("https://#{cloud_name}-res.cloudinary.com/image/upload/test")
+      .and empty_options
   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", {})
+    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
   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", {})
+    expect(["test",{:private_cdn => true}])
+      .to produce_url("http://#{cloud_name}-res.cloudinary.com/image/upload/test")
+      .and empty_options
   end
 
   it "should allow overriding private_cdn if private_cdn=false" do
     Cloudinary.config.private_cdn = true
-    test_cloudinary_url("test", { :private_cdn => false }, "#{upload_path}/test", {})
+    expect(["test",{ :private_cdn => false }])
+      .to produce_url("#{upload_path}/test")
+      .and empty_options
   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", {})
+    expect(["test",{:cname => "example.com"}])
+      .to produce_url("http://example.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   end
 
   it "should allow overriding cname if cname=false" do
     Cloudinary.config.cname = "example.com"
-    test_cloudinary_url("test", { :cname => false }, "#{upload_path}/test", {})
+    expect(["test",{ :cname => false }])
+      .to produce_url("#{upload_path}/test")
+      .and empty_options
   end
 
   it "should use format from options" do
-    test_cloudinary_url("test", { :format => :jpg }, "#{upload_path}/test.jpg", {})
+    expect(["test",{ :format => :jpg }])
+      .to produce_url("#{upload_path}/test.jpg")
+      .and empty_options
   end
 
   it "should disallow url_suffix in shared distribution" do
@@ -81,42 +105,64 @@ describe Cloudinary::Utils do
     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", {})
+  it "should support url_suffix for private_cdn" do
+    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}])
+      .to produce_url("http://#{cloud_name}-res.cloudinary.com/images/a_0/test/hello")
+      .and empty_options
   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", {})
+    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
   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", {})
+    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
 
     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", {})
+    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
   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", {})
+  it "should support url_suffix for raw uploads" do
+    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
   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 }, "#{root_path}/test", {})
-      test_cloudinary_url("test", { :use_root_path => true, :private_cdn => false, :angle => 0 }, "#{root_path}/a_0/test", {})
+      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 }])
+        .to produce_url("#{root_path}/a_0/test")
+        .and empty_options
     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", {})
+      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}])
+        .to produce_url("http://#{cloud_name}-res.cloudinary.com/a_0/test")
+        .and empty_options
     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", {})
+      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
     end
 
     it "should disallow use_root_path if not image/upload" do
@@ -125,174 +171,395 @@ describe Cloudinary::Utils do
     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 }])
+        .to produce_url("#{upload_path}/test")
+          .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 })
+    end
 
-  it "should use width and height from options only if crop is given" do
-    test_cloudinary_url("test", { :width => 100, :height => 100 }, "#{upload_path}/test", { :width => 100, :height => 100 })
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop }, "#{upload_path}/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
+      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 }])
+        .to produce_url("#{upload_path}/c_lfill,h_100,w_100/test")
+        .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
+    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 }, "#{upload_path}/c_limit,h_100,w_100/test", {})
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :lfill }, "#{upload_path}/c_lfill,h_100,w_100/test", {})
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :fit }, "#{upload_path}/c_fit,h_100,w_100/test", {})
+    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 }])
+        .to produce_url("#{upload_path}/a_auto,c_scale,h_100,w_100/test")
+        .and empty_options
+    end
+    it "should support size" do
+      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" })
+    end
   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 }, "#{upload_path}/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" }, "#{upload_path}/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" }, "#{upload_path}/t_blip/test", {})
+    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
   end
 
-  it "should support array of named tranformations" do
-    test_cloudinary_url("test", { :transformation => ["blip", "blop"] }, "#{upload_path}/t_blip.blop/test", {})
-  end
+  describe ":transformation" do
+    it "should support named tranformation" do
+      expect(["test",{ :transformation => "blip" }])
+        .to produce_url("#{upload_path}/t_blip/test")
+        .and empty_options
+    end
 
-  it "should support base tranformation" do
-    test_cloudinary_url("test", { :transformation => { :x => 100, :y => 100, :crop => :fill }, :crop => :crop, :width => 100 }, "#{upload_path}/c_fill,x_100,y_100/c_crop,w_100/test", { :width => 100 })
-  end
+    it "should support array of named tranformations" do
+      expect(["test",{ :transformation => ["blip", "blop"] }])
+        .to produce_url("#{upload_path}/t_blip.blop/test")
+        .and empty_options
+    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 }, "#{upload_path}/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test", { :width => 100 })
-  end
+    it "should support base tranformation" do
+      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 })
+    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 support array of base tranformations" do
+      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 })
+    end
 
-  it "should not include empty tranformations" do
-    test_cloudinary_url("test", { :transformation => [{}, { :x => 100, :y => 100, :crop => :fill }, {}] }, "#{upload_path}/c_fill,x_100,y_100/test", {})
-  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 support size" do
-    test_cloudinary_url("test", { :size => "10x10", :crop => :crop }, "#{upload_path}/c_crop,h_10,w_10/test", { :width => "10", :height => "10" })
+    it "should not include empty tranformations" do
+      expect(["test", { :transformation => [{}, { :x => 100, :y => 100, :crop => :fill },{}] }])
+        .to produce_url("#{upload_path}/c_fill,x_100,y_100/test")
+        .and empty_options
+    end
   end
 
+
   it "should use type from options" do
-    test_cloudinary_url("test", { :type => :facebook }, "#{root_path}/image/facebook/test", {})
+    expect(["test", { :type => :facebook }])
+      .to produce_url("#{root_path}/image/facebook/test")
+            .and empty_options
   end
 
   it "should use resource_type from options" do
-    test_cloudinary_url("test", { :resource_type => :raw }, "#{root_path}/raw/upload/test", {})
+    expect(["test", { :resource_type => :raw }])
+      .to produce_url("#{root_path}/raw/upload/test")
+            .and empty_options
   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 }, "#{root_path}/image/fetch/http://test", {})
+    expect(["http://test", { :type => nil }])
+      .to produce_url("http://test")
+            .and empty_options
+    expect(["http://test", { :type => :asset }])
+      .to produce_url("http://test")
+            .and empty_options
+    expect(["http://test", { :type => :fetch }])
+      .to produce_url("#{root_path}/image/fetch/http://test")
+            .and empty_options
   end
 
   it "should use allow absolute links to /images" do
-    test_cloudinary_url("/images/test", {}, "#{upload_path}/test", {})
-  end 
+    expect(["/images/test", {}])
+      .to produce_url("#{upload_path}/test")
+            .and empty_options
+  end
 
   it "should use ignore absolute links not to /images" do
-    test_cloudinary_url("/js/test", {}, "/js/test", {})
-  end 
+    expect(["/js/test", {}])
+      .to produce_url("/js/test")
+            .and empty_options
+  end
 
   it "should escape fetch urls" do
-    test_cloudinary_url("http://blah.com/hello?a=b", { :type => :fetch }, "#{root_path}/image/fetch/http://blah.com/hello%3Fa%3Db", {})
-  end 
+    expect(["http://blah.com/hello?a=b", { :type => :fetch }])
+      .to produce_url("#{root_path}/image/fetch/http://blah.com/hello%3Fa%3Db")
+            .and empty_options
+  end
 
   it "should should escape http urls" do
-    test_cloudinary_url("http://www.youtube.com/watch?v=d9NF2edxy-M", { :type => :youtube }, "#{root_path}/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M", {})
-  end 
+    expect(["http://www.youtube.com/watch?v=d9NF2edxy-M", { :type => :youtube }])
+      .to produce_url("#{root_path}/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M")
+            .and empty_options
+  end
 
   it "should support background" do
-    test_cloudinary_url("test", { :background => "red" }, "#{upload_path}/b_red/test", {})
-    test_cloudinary_url("test", { :background => "#112233" }, "#{upload_path}/b_rgb:112233/test", {})
+    expect(["test", { :background => "red" }])
+      .to produce_url("#{upload_path}/b_red/test")
+            .and empty_options
+    expect(["test", { :background => "#112233" }])
+      .to produce_url("#{upload_path}/b_rgb:112233/test")
+            .and empty_options
   end
-  
+
   it "should support default_image" do
-    test_cloudinary_url("test", { :default_image => "default" }, "#{upload_path}/d_default/test", {})
+    expect(["test", { :default_image => "default" }])
+      .to produce_url("#{upload_path}/d_default/test")
+            .and empty_options
   end
 
   it "should support angle" do
-    test_cloudinary_url("test", { :angle => "55" }, "#{upload_path}/a_55/test", {})
-    test_cloudinary_url("test", { :angle => ["auto", "55"] }, "#{upload_path}/a_auto.55/test", {})
+    expect(["test", { :angle => "55" }])
+      .to produce_url("#{upload_path}/a_55/test")
+            .and empty_options
+    expect(["test", { :angle => ["auto", "55"] }])
+      .to produce_url("#{upload_path}/a_auto.55/test")
+            .and empty_options
   end
-  
+
   it "should support format for fetch urls" do
-    test_cloudinary_url("http://cloudinary.com/images/logo.png", { :format => "jpg", :type => :fetch }, "#{root_path}/image/fetch/f_jpg/http://cloudinary.com/images/logo.png", {})
+    expect(["http://cloudinary.com/images/logo.png", { :format => "jpg", :type => :fetch }])
+      .to produce_url("#{root_path}/image/fetch/f_jpg/http://cloudinary.com/images/logo.png")
+            .and empty_options
   end
-  
+
   it "should support effect" do
-    test_cloudinary_url("test", { :effect => "sepia" }, "#{upload_path}/e_sepia/test", {})
+    expect(["test", { :effect => "sepia" }])
+      .to produce_url("#{upload_path}/e_sepia/test")
+            .and empty_options
   end
 
   it "should support effect with hash param" do
-    test_cloudinary_url("test", { :effect => { "sepia" => 10 } }, "#{upload_path}/e_sepia:10/test", {})
+    expect(["test", { :effect => { "sepia" => 10 } }])
+      .to produce_url("#{upload_path}/e_sepia:10/test")
+            .and empty_options
   end
 
   it "should support effect with array param" do
-    test_cloudinary_url("test", { :effect => ["sepia", 10] }, "#{upload_path}/e_sepia:10/test", {})
+    expect(["test", { :effect => ["sepia", 10] }])
+      .to produce_url("#{upload_path}/e_sepia:10/test")
+            .and empty_options
   end
 
-  {:overlay=>:l, :underlay=>:u}.each do |param, letter|
-    it "should support #{param}" do
-      test_cloudinary_url("test", { param => "text:hello" }, "#{upload_path}/#{letter}_text:hello/test", {})
+  shared_examples "a signed url" do |specific_options = {}, specific_transformation = ""|
+    let(:expected_transformation) do
+      (specific_transformation.blank? || specific_transformation.match(/\/$/)) ? specific_transformation : "#{specific_transformation}/"
     end
-    
-    it "should not pass width/height to html for #{param}" do
-      test_cloudinary_url("test", { param => "text:hello", :height => 100, :width => 100 }, "#{upload_path}/h_100,#{letter}_text:hello,w_100/test", {})
+    let! (:authenticated_image) do
+      Cloudinary::Uploader.upload "http://res.cloudinary.com/demo/image/upload/sample.jpg",
+                                  :type => 'authenticated',
+                                  :tags => TEST_TAG
+    end
+    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})
+        .not_to be_served_by_cloudinary
+    end
+
+    it "should correctly sign URL with version" do
+      expect(["#{authenticated_image['public_id']}.jpg", options])
+        .to produce_url(%r"#{authenticated_path}/s--[\w-]+--/#{expected_transformation}v#{authenticated_image['version']}/#{authenticated_image['public_id']}.jpg")
+              .and empty_options
+                     .and be_served_by_cloudinary
+    end
+    it "should correctly sign URL with transformation and version" do
+      options[:transformation] = { :crop => "crop", :width => 10, :height => 20 }
+      expect(["#{authenticated_image['public_id']}.jpg", options])
+        .to produce_url(%r"#{authenticated_path}/s--[\w-]+--/c_crop,h_20,w_10/#{expected_transformation}v#{authenticated_image['version']}/#{authenticated_image['public_id']}.jpg")
+              .and empty_options
+                     .and be_served_by_cloudinary
+    end
+    it "should correctly sign URL with transformation" do
+      options[:transformation] = { :crop => "crop", :width => 10, :height => 20 }
+      expect(["#{authenticated_image['public_id']}.jpg", options])
+        .to produce_url(%r"#{authenticated_path}/s--[\w-]+--/c_crop,h_20,w_10/#{expected_transformation}v#{authenticated_image['version']}/#{authenticated_image['public_id']}.jpg")
+              .and empty_options
+                     .and be_served_by_cloudinary
+    end
+    it "should correctly sign fetch URL" do
+      options[:type] = :fetch
+      expect(["http://res.cloudinary.com/demo/sample.png", options])
+        .to produce_url(%r"^#{root_path}/image/fetch/s--[\w-]+--/#{expected_transformation}v#{authenticated_image['version']}/http://res.cloudinary.com/demo/sample.png$")
+              .and empty_options
+                     .and be_served_by_cloudinary
+    end
+  end
+
+
+  { '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"],
+      ] }
+      it "should support #{param}" do
+        layers_options.each do |name, options, result|
+          expect(["test", { param => options }]).to produce_url("#{upload_path}/#{letter}_#{result}/test").and empty_options
+        end
+      end
+
+      it "should not pass width/height to html for #{param}" do
+        expect(["test", { param => "text:hello", :height => 100, :width => 100 }])
+          .to produce_url("#{upload_path}/h_100,#{letter}_text:hello,w_100/test")
+                .and empty_options
+      end
+    end
+  end
+
+
+  describe "text" do
+
+    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",
+        :overwrite   => true,
+        :font_family => "Arial",
+        :font_size   => "18",
+        :tags        => TEST_TAG
+      })
+      srt = Tempfile.new('test_subtitles.srt')
+      srt.write <<-END
+      1
+      00:00:10,500 --> 00:00:13,000
+      Hello World, Nice to meet you?
+
+      END
+      srt.rewind
+      Cloudinary::Uploader.upload srt, :public_id => 'subtitles.srt', :resource_type => 'raw', :overwrite => true, :tags => TEST_TAG
+      srt.unlink
+    end
+
+    # after :all do
+    #   Cloudinary::Api.delete_resources_by_tag TEST_TAG
+    # end
+
+    { '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=   [
+          ["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}" ],
+          ["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}"],
+          ["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"]
+        ]
+        layers_options.each do |name, options, result|
+          it "should support #{name}" do
+            expect(["sample", { param => options }]).to produce_url("#{upload_path}/#{short}_#{result}/sample").and empty_options
+            expect("#{upload_path}/#{short}_#{result}/sample").to be_served_by_cloudinary
+          end
+          unless options.is_a? String
+            op = Hash.new
+            op[param] = options
+            it_behaves_like "a signed url", op, "#{short}_#{result}"
+          end
+        end
+
+        it "should not pass width/height to html for #{param}" do
+          expect(["test", { param => "text:test_text", :height => 100, :width => 100 }])
+            .to produce_url("#{upload_path}/h_100,#{short}_text:test_text,w_100/test")
+                  .and empty_options
+
+        end
+      end
     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    
+  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}])
+      .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
+      .and empty_options
+  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 }, "#{upload_path}/test", {})
-  end 
+    expect(["test",{ :ssl_detected => true, :secure => false }])
+      .to produce_url("#{upload_path}/test")
+      .and empty_options
+  end
 
-  it "should use secure: true from configuration over ssl_detected" do    
+  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 
+    expect(["test",{:ssl_detected=>false}])
+      .to produce_url("https://res.cloudinary.com/#{cloud_name}/image/upload/test")
+      .and empty_options
+  end
 
   it "should support extenal cname" do
-    test_cloudinary_url("test", {:cname=>"hello.com"}, "http://hello.com/test123/image/upload/test", {})
+    expect(["test",{:cname=>"hello.com"}])
+      .to produce_url("http://hello.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+    expect(["test",{:cname=>"hello.com", :cdn_subdomain=>true}])
+      .to produce_url("http://a2.hello.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+    expect(["test",{:secure=>true, :cdn_subdomain=>true}])
+      .to produce_url("https://res-2.cloudinary.com/#{cloud_name}/image/upload/test")
+      .and empty_options
   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", {})
+    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
   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", {})
+    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
   end
 
   it "should support string param" do
-    test_cloudinary_url("test", { "effect" => { "sepia" => 10 } }, "#{upload_path}/e_sepia:10/test", {})
+    expect(["test",{ "effect" => { "sepia" => 10 } }])
+      .to produce_url("#{upload_path}/e_sepia:10/test")
+      .and empty_options
   end
-  
+
   it "should support border" do
-    test_cloudinary_url("test", { "border" => { :width => 5 } }, "#{upload_path}/bo_5px_solid_black/test", {})
-    test_cloudinary_url("test", { "border" => { :width => 5, :color => "#ffaabbdd" } }, "#{upload_path}/bo_5px_solid_rgb:ffaabbdd/test", {})
-    test_cloudinary_url("test", { "border" => "1px_solid_blue" }, "#{upload_path}/bo_1px_solid_blue/test", {})
-    test_cloudinary_url("test", { "border" => "2" }, "#{upload_path}/test", { :border => "2" })
+    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" } }])
+      .to produce_url("#{upload_path}/bo_5px_solid_rgb:ffaabbdd/test")
+      .and empty_options
+    expect(["test",{ "border" => "1px_solid_blue" }])
+      .to produce_url("#{upload_path}/bo_1px_solid_blue/test")
+      .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
-    test_cloudinary_url("test", { "flags" => "abc" }, "#{upload_path}/fl_abc/test", {})
-    test_cloudinary_url("test", { "flags" => ["abc", "def"] }, "#{upload_path}/fl_abc.def/test", {})
+    expect(["test",{ "flags" => "abc" }])
+      .to produce_url("#{upload_path}/fl_abc/test")
+      .and empty_options
+    expect(["test",{ "flags" => ["abc", "def"] }])
+      .to produce_url("#{upload_path}/fl_abc.def/test")
+      .and empty_options
   end
 
   it "build_upload_params should not destroy options" do
@@ -302,36 +569,49 @@ describe Cloudinary::Utils do
   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"}
+    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, :exif=>0, :colors=>1, 
-               :image_metadata=>0, :invalidate=>1, :eager_async=>1
+      :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
-    test_cloudinary_url("folder/test", {}, "#{upload_path}/v1/folder/test", {})
-    test_cloudinary_url("folder/test", { :version => 123 }, "#{upload_path}/v123/folder/test", {})
+    expect(["folder/test", {}])
+      .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
   end
 
   it "should not add version if public_id contains version already" do
-    test_cloudinary_url("v1234/test", {}, "#{upload_path}/v1234/test", {})
+    expect(["v1234/test", {}])
+      .to produce_url( "#{upload_path}/v1234/test")
+        .and empty_options
   end
 
   it "should allow to shorted image/upload urls" do
-    test_cloudinary_url("test", { :shorten => true }, "#{root_path}/iu/test", {})
+    expect(["test",{ :shorten => true }])
+      .to produce_url("#{root_path}/iu/test")
+      .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)
     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"],
@@ -343,33 +623,38 @@ describe Cloudinary::Utils do
     ].each do
       |source, target|
       expect(Cloudinary::Utils.cloudinary_url(source)).to eq("#{upload_path}/#{target}")
-    end      
+    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 }, "#{upload_path}/s--Ai4Znfl3--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", { :version => 1234, :sign_url => true }, "#{upload_path}/s----SjmNDA--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", { :transformation => { :crop => "crop", :width => 10, :height => 20 }, :sign_url => true }, "#{upload_path}/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 }, "#{root_path}/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 }, "#{root_path}/image/fetch/s--hH_YcbiS--/v1234/http://google.com/path/to/image.png", {})
+
+
+  describe ":sign_url" do
+    it_behaves_like "a signed url"
   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 }, "#{upload_path}/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", { :version => 1234, :sign_url => true, :sign_version => true }, "#{upload_path}/s--ZlgFLQcO--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", { :transformation => { :crop => "crop", :width => 10, :height => 20 }, :sign_url => true, :sign_version => true }, "#{upload_path}/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 }, "#{root_path}/image/fetch/s--_GAUclyB--/v1234/http://google.com/path/to/image.png", {})
+  describe ":sign_version (deprecated)" do
+    it_behaves_like "a signed url", :sign_version => true
   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")
+    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"
+    )
   end
 
   it "should support responsive width" do
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_limit,w_auto/test", { :responsive => 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}
-    test_cloudinary_url("test", { :width => 100, :height => 100, :crop => :crop, :responsive_width => true }, "#{upload_path}/c_crop,h_100,w_100/c_pad,w_auto/test", { :responsive => true })
+    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 })
   end
 
   it "should correctly encode double arrays" do