cloudinary 1.0.82 → 1.0.83

data/lib/cloudinary/version.rb

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

data/lib/cloudinary/video_helper.rb

@@ -0,0 +1,126 @@
+if !Hash.respond_to?(:deep_symbolize_keys)
+  require 'cloudinary/active_support/core_ext/hash/keys'
+end
+module CloudinaryHelper
+  include ActionView::Context
+  DEFAULT_POSTER_OPTIONS = { :format => 'jpg', :resource_type => 'video' }
+  DEFAULT_SOURCE_TYPES   = %w(webm mp4 ogv)
+  DEFAULT_VIDEO_OPTIONS  = { :resource_type => 'video' }
+
+  # Creates an HTML video tag for the provided +source+
+  #
+  # ==== Options
+  # * <tt>:source_types</tt> - Specify which source type the tag should include. defaults to webm, mp4 and ogv.
+  # * <tt>:source_transformation</tt> - specific transformations to use for a specific source type.
+  # * <tt>:poster</tt> - override default thumbnail:
+  #   * url: provide an ad hoc url
+  #   * options: with specific poster transformations and/or Cloudinary +:public_id+
+  #
+  # ==== Examples
+  #   cl_video_tag("mymovie.mp4")
+  #   cl_video_tag("mymovie.mp4", :source_types => :webm)
+  #   cl_video_tag("mymovie.ogv", :poster => "myspecialplaceholder.jpg")
+  #   cl_video_tag("mymovie.webm", :source_types => [:webm, :mp4], :poster => {:effect => 'sepia'}) do
+  #     content_tag( :span, "Cannot present video!")
+  #   end
+  def cl_video_tag(source, options = {}, &block)
+    source = strip_known_ext(source)
+    video_attributes = [:autoplay,:controls,:loop,:muted,:poster, :preload]
+    options = Hash[options].deep_symbolize_keys
+
+    options[:source_types] ||= DEFAULT_SOURCE_TYPES
+    video_attributes.keep_if{ |key, _| options.has_key?(key)} # required prior to Rails 4.x
+    video_options = options.extract!(*video_attributes)
+    if video_options.has_key? :poster
+      poster = video_options.delete(:poster)
+      case poster
+      when String
+        video_options[:poster] = poster
+      when Hash
+        if poster.has_key? :public_id
+          poster[:resource_type] = "image"
+          poster_name            = poster[:public_id]
+          video_options[:poster] = cl_image_path(poster_name, poster)
+        else
+          video_options[:poster] = cl_video_thumbnail_path(source, poster)
+        end
+      else
+        # no poster
+      end
+    else
+      video_options[:poster] = cl_video_thumbnail_path(source, options)
+    end
+
+    source_transformation = options.delete(:source_transformation) || {}
+    source_types = Array(options.delete(:source_types))
+    fallback     = (capture(&block) if block_given?) || options.delete(:fallback_content)
+
+    if source_types.size > 1
+      cloudinary_tag(source, options) do |_, tag_options|
+        content_tag('video', tag_options.merge(video_options)) do
+          source_tags = source_types.map do |type|
+            transformation = source_transformation[type.to_sym] || {}
+            cloudinary_tag("#{source}.#{type}", tag_options.merge(transformation)) do |url, _|
+              mime_type = "video/#{(type == 'ogv' ? 'ogg' : type)}"
+              tag("source", :src => url, :type => mime_type)
+            end
+          end
+          source_tags.push(fallback.html_safe) unless fallback.blank?
+          safe_join(source_tags)
+        end
+      end
+    else
+      transformation      = source_transformation[source_types.first.to_sym] || {}
+      video_options[:src] = cl_video_path("#{source}.#{source_types.first.to_sym}", transformation.merge(options))
+      cloudinary_tag(source, options) do |url, tag_options|
+        content_tag('video', fallback, tag_options.merge(video_options))
+      end
+    end
+  end
+
+  # Returns a url for the given source with +options+
+  def cl_video_path(source, options={})
+    cl_image_path(source, DEFAULT_VIDEO_OPTIONS.merge(options))
+  end
+
+  # Returns an HTML <tt>img</tt> tag with the thumbnail for the given video +source+ and +options+
+  def cl_video_thumbnail_tag(source, options={})
+    cl_image_tag(source, DEFAULT_POSTER_OPTIONS.merge(options))
+  end
+
+  # Returns a url for the thumbnail for the given video +source+ and +options+
+  def cl_video_thumbnail_path(source, options={})
+    cl_image_path(source, DEFAULT_POSTER_OPTIONS.merge(options))
+  end
+
+  protected
+
+  def strip_known_ext(name)
+    name.sub(/\.(#{DEFAULT_SOURCE_TYPES.join("|")})$/, '')
+  end
+
+  def safe_join(array, sep=$,)
+    sep = ERB::Util.unwrapped_html_escape(sep)
+    array.flatten.map! { |i| ERB::Util.unwrapped_html_escape(i) }.join(sep).html_safe
+  end unless method_defined?( :safe_join)
+
+  # HTML escapes strings but doesn't wrap them with an ActiveSupport::SafeBuffer.
+  # This method is not for public consumption! Seriously!
+  def unwrapped_html_escape(s) # :nodoc:
+    s = s.to_s
+    if s.html_safe?
+      s
+    else
+      s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE)
+    end
+  end unless method_defined?( :unwrapped_html_escape)
+
+  HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;', "'" => '&#39;' } unless defined?( HTML_ESCAPE)
+  HTML_ESCAPE_REGEXP = /[&"'><]/ unless defined?(HTML_ESCAPE_REGEXP)
+
+end
+
+
+
+
+

data/spec/api_spec.rb

@@ -173,32 +173,33 @@ describe Cloudinary::Api do
     expect(transformation).not_to be_blank  
     expect(transformation["allowed_for_strict"]).to eq(false)
   end
+  describe "named transformations" do
+    it "should allow creating named transformation" do
+      @api.create_transformation("api_test_transformation", "crop"=>"scale", "width"=>102)
+      transformation = @api.transformation("api_test_transformation")
+      expect(transformation).not_to be_blank
+      expect(transformation["allowed_for_strict"]).to eq(true)
+      expect(transformation["info"]).to eq(["crop"=>"scale", "width"=>102])
+      expect(transformation["used"]).to eq(false)
+    end
 
-  it "should allow creating named transformation" do
-    @api.create_transformation("api_test_transformation", "crop"=>"scale", "width"=>102)
-    transformation = @api.transformation("api_test_transformation")
-    expect(transformation).not_to be_blank  
-    expect(transformation["allowed_for_strict"]).to eq(true)
-    expect(transformation["info"]).to eq(["crop"=>"scale", "width"=>102])
-    expect(transformation["used"]).to eq(false)
-  end
+    it "should allow deleting named transformation" do
+      @api.create_transformation("api_test_transformation2", "crop"=>"scale", "width"=>103)
+      @api.transformation("api_test_transformation2")
+      @api.delete_transformation("api_test_transformation2")
+      expect{@api.transformation("api_test_transformation2")}.to raise_error(Cloudinary::Api::NotFound)
+    end
 
-  it "should allow deleting named transformation" do
-    @api.create_transformation("api_test_transformation2", "crop"=>"scale", "width"=>103)
-    @api.transformation("api_test_transformation2")
-    @api.delete_transformation("api_test_transformation2")
-    expect{@api.transformation("api_test_transformation2")}.to raise_error(Cloudinary::Api::NotFound)
-  end  
+    it "should allow unsafe update of named transformation" do
+      @api.create_transformation("api_test_transformation3", "crop"=>"scale", "width"=>102)
+      @api.update_transformation("api_test_transformation3", :unsafe_update=>{"crop"=>"scale", "width"=>103})
+      transformation = @api.transformation("api_test_transformation3")
+      expect(transformation).not_to be_blank
+      expect(transformation["info"]).to eq(["crop"=>"scale", "width"=>103])
+      expect(transformation["used"]).to eq(false)
+    end
 
-  it "should allow unsafe update of named transformation" do
-    @api.create_transformation("api_test_transformation3", "crop"=>"scale", "width"=>102)
-    @api.update_transformation("api_test_transformation3", :unsafe_update=>{"crop"=>"scale", "width"=>103})
-    transformation = @api.transformation("api_test_transformation3")
-    expect(transformation).not_to be_blank  
-    expect(transformation["info"]).to eq(["crop"=>"scale", "width"=>103])
-    expect(transformation["used"]).to eq(false)
   end
-
   it "should allow deleting implicit transformation" do
     @api.transformation("c_scale,w_100")
     @api.delete_transformation("c_scale,w_100")

data/spec/cloudinary_helper_spec.rb

@@ -10,12 +10,28 @@ end
 
 RSpec.describe CloudinaryHelper do
   let(:helper) { helper_class.new }
-
-
+  let(:options) { {} }
   context "#cl_image_upload_tag" do
-    let(:options) { {} }
-    subject(:input) { helper.cl_image_upload_tag(:image_id, options) }
+    let(:options) {{:multiple => true}}
+    before do
+      if defined? allow
+        allow(Cloudinary::Utils).to receive_messages :cloudinary_api_url => '', :sign_request => Hash.new
+        allow(helper).to receive(:build_callback_url).and_return('')
+      else
+        Cloudinary::Utils.should_receive(:cloudinary_api_url).and_return('')
+        Cloudinary::Utils.should_receive(:sign_request).and_return(Hash.new)
+        helper.should_receive(:build_callback_url).and_return('')
+      end
+    end
+    let(:test_tag) { TestTag.new( helper.cl_image_upload_tag('image_id', options)) }
 
+    it "allow multiple upload" do
+      expect(test_tag['data-cloudinary-field']).to eq('image_id[]')
+      expect(test_tag['multiple']).to eq('multiple')
+    end
+  end
+  context "#cl_upload_tag" do
+    let(:options) {{:multiple => true}}
     before do
       if defined? allow
         allow(Cloudinary::Utils).to receive_messages :cloudinary_api_url => '', :sign_request => Hash.new
@@ -26,34 +42,32 @@ RSpec.describe CloudinaryHelper do
         helper.should_receive(:build_callback_url).and_return('')
       end
     end
+    let(:test_tag) { TestTag.new( helper.cl_upload_tag('image_id', options)) }
 
     it "allow multiple upload" do
-      options[:multiple] = true
-      expect(input).to include('data-cloudinary-field="image_id[]"')
-      expect(input).to include('multiple="multiple"')
+      expect(test_tag['data-cloudinary-field']).to eq('image_id[]')
+      expect(test_tag['multiple']).to eq('multiple')
     end
   end
 
   context "#cl_image_tag" do
-    subject(:input) { helper.cl_image_tag('sample.jpg', options) }
+    let(:test_tag) { TestTag.new( helper.cl_image_tag('sample.jpg', options)) }
 
-    context "responsive_width" do
-      let(:options) { {responsive_width: true, cloud_name: "test"} }
+    context ":responsive_width" do
+      let(:options) { {:responsive_width => true, :cloud_name => "test"} }
       it "should use data-src for responsive_width" do
-        img_tag = html_tag_matcher 'img'
-        expect(input).to match img_tag
-        expect(input).to include('class="cld-responsive"')
-        expect(input).to include( 'data-src="http://res.cloudinary.com/test/image/upload/c_limit,w_auto/sample.jpg"')
+        expect(test_tag.name).to match( 'img')
+        expect(test_tag['class']).to eq("cld-responsive")
+        expect(test_tag['data-src']).to eq( "http://res.cloudinary.com/test/image/upload/c_limit,w_auto/sample.jpg")
       end
     end
 
-    context "dpr_auto" do
-      let(:options) { {dpr: :auto, cloud_name: "test"} }
+    context ":dpr_auto" do
+      let(:options) { {:dpr => :auto, :cloud_name => "test"} }
       it "should use data-src for dpr auto" do
-        img_tag = html_tag_matcher 'img'
-        expect(input).to match(img_tag)
-        expect(input).to include('data-src="http://res.cloudinary.com/test/image/upload/dpr_auto/sample.jpg"')
-        expect(input).to include('class="cld-hidpi"')
+        expect(test_tag.name).to match( 'img')
+        expect(test_tag['class']).to eq( 'cld-hidpi')
+        expect(test_tag['data-src']).to eq( "http://res.cloudinary.com/test/image/upload/dpr_auto/sample.jpg")
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,83 @@
+require 'rspec'
+require 'rexml/parsers/ultralightparser'
+require 'rspec/version'
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
+  unless RSpec::Version::STRING.match( /^3/)
+    config.treat_symbols_as_metadata_keys_with_true_values = true
+  end
   config.run_all_when_everything_filtered = true
   config.filter_run_excluding :delete_all => true
 end
 
-# Create a regexp with the given tag name.
-# @param [String or Symbol] tag tag name (e.g. `img`)
-# @return [Regexp] the regular expression to match the tag
+# Create a regexp with the given +tag+ name.
 def html_tag_matcher( tag)
-  /<#{tag}([\s]+[-[:word:]]+[\s]*\=\s*\"[^\"]*\")*\s*>.*<\s*\/#{tag}\s*>/
+  /<#{tag}([\s]+([-[:word:]]+)[\s]*\=\s*\"([^\"]*)\")*\s*>.*<\s*\/#{tag}\s*>/
 end
+
+# Represents an HTML tag
+class TestTag
+  attr_accessor :name, :attributes, :children, :text, :html_string
+  # Creates a new +TestTag+ from a given +element+ string
+  def initialize(element)
+    @html_string = element
+    element = valid_tag(element) unless element.is_a? Array
+    case element[0]
+    when :start_element
+      @name = element[2]
+      @attributes = element[3]
+      @children = (Array(element[4..-1]) || []).map {|c | TestTag.new c}
+    when :text
+      @text = element[1]
+      @name = "text"
+      @attributes = []
+      @children = []
+    end
+
+  end
+
+  # Parses a given +tag+ in string format
+  def valid_tag(tag)
+    parser = REXML::Parsers::UltraLightParser.new( tag)
+    parser.parse[0]
+  end
+
+  # Returns attribute named +symbol_or_string+
+  def [](symbol_or_string)
+    attributes[symbol_or_string.to_s]
+  end
+
+  def method_missing(symbol, *args)
+    if (m = /children_by_(\w+)/.match(symbol.to_s)) and !args.empty?
+      @children.select{ |c| c[m[1]] == args[0]}
+    else
+      super
+    end
+  end
+
+  def ==(other)
+    case other
+    when String
+      @text == other
+    else
+      other.respond_to?( :text) &&
+        other.respond_to?( :name) &&
+        other.respond_to?( :attributes) &&
+        other.respond_to?( :children) &&
+        @text == other.text &&
+        @name == other.name &&
+        @attributes == other.attributes &&
+        @children == other.children
+    end
+  end
+end
+
+def test_cloudinary_url(public_id, options, expected_url, expected_options)
+  url = Cloudinary::Utils.cloudinary_url(public_id, options)
+  expect(url).to eq(expected_url)
+  expect(options).to eq(expected_options)
+  url
+end
+
+TEST_IMAGE_URL = "http://cloudinary.com/images/old_logo.png"

data/spec/uploader_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 require 'cloudinary'
 
+RSpec.configure do |c|
+  c.filter_run_excluding :large => true
+end
+
 describe Cloudinary::Uploader do
   break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
 
@@ -130,9 +134,20 @@ describe Cloudinary::Uploader do
     expect{Cloudinary::Uploader.upload("spec/logo.png", {:auto_tagging => 0.5})}.to raise_error(CloudinaryException, /Must use/)
   end
 
-  it "should support upload_large" do
-    result = Cloudinary::Uploader.upload_large("spec/logo.png")
-    expect(result["public_id"]).to match(/^[a-z0-9]+.png$/)
+  it "should support upload_large", :large => true do
+    io = StringIO.new
+    header = "BMJ\xB9Y\x00\x00\x00\x00\x00\x8A\x00\x00\x00|\x00\x00\x00x\x05\x00\x00x\x05\x00\x00\x01\x00\x18\x00\x00\x00\x00\x00\xC0\xB8Y\x00a\x0F\x00\x00a\x0F\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\x00\x00\xFF\x00\x00\xFF\x00\x00\x00\x00\x00\x00\xFFBGRs\x00\x00\x00\x00\x00\x00\x00\x00T\xB8\x1E\xFC\x00\x00\x00\x00\x00\x00\x00\x00fff\xFC\x00\x00\x00\x00\x00\x00\x00\x00\xC4\xF5(\xFF\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+    io.puts(header)
+    5880000.times{ io.write("\xFF") }
+    io.rewind
+    result = Cloudinary::Uploader.upload_large(io, :chunk_size => 5243000)
+    expect(result["resource_type"]).to eq('raw')
+    io.rewind
+    result = Cloudinary::Uploader.upload_large(io, :resource_type => 'image', :chunk_size => 5243000)
+    expect(result["resource_type"]).to eq('image')
+    expect(result["width"]).to eq(1400)
+    expect(result["height"]).to eq(1400)
+    expect(result["format"]).to eq("bmp")
   end
   
   context "unsigned" do
@@ -154,4 +169,18 @@ describe Cloudinary::Uploader do
       Cloudinary::Api.delete_upload_preset(preset["name"])
     end
   end
+
+  describe ":timeout" do
+    before do
+      @timeout = Cloudinary.config.timeout
+      Cloudinary.config.timeout = 0.01
+    end
+    after do
+      Cloudinary.config.timeout = @timeout
+    end
+
+    it "should fail if timeout is reached" do
+      expect{Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"))}.to raise_error
+    end
+  end
 end

data/spec/utils_methods_spec.rb

@@ -0,0 +1,18 @@
+require 'rspec'
+require 'spec_helper'
+require 'cloudinary'
+
+include Cloudinary
+
+describe Utils do
+
+  it 'should parse integer range values' do
+    expect(Utils.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"
+  end
+  it "should parse a percent range value" do
+    expect(Utils.norm_range_value("20p")).to eq("20p")
+  end
+end

data/spec/utils_spec.rb

@@ -3,8 +3,7 @@ require 'cloudinary'
 
 describe Cloudinary::Utils do
   before(:each) do
-    Cloudinary.config do
-      |config|
+    Cloudinary.config do |config|
       config.cloud_name = "test123"
       config.secure_distribution = nil
       config.private_cdn = false
@@ -15,16 +14,11 @@ describe Cloudinary::Utils do
       config.api_secret = "b"
     end
   end
-  
-  def test_cloudinary_url(public_id, options, expected_url, expected_options)
-    url = Cloudinary::Utils.cloudinary_url(public_id, options)
-    expect(url).to eq(expected_url)
-    expect(options).to eq(expected_options)
-    url
-  end
+  let(:root_path) { "http://res.cloudinary.com/test123" }
+  let(:upload_path) { "#{root_path}/image/upload" }
 
-  it "should use cloud_name from config" do    
-    test_cloudinary_url("test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
+  it "should use cloud_name from config" do
+    test_cloudinary_url("test", {}, "#{upload_path}/test", {})
   end
 
   it "should allow overriding cloud_name in options" do
@@ -58,7 +52,7 @@ describe Cloudinary::Utils do
 
   it "should allow overriding private_cdn if private_cdn=false" do
     Cloudinary.config.private_cdn = true
-    test_cloudinary_url("test", {:private_cdn => false}, "http://res.cloudinary.com/test123/image/upload/test", {})
+    test_cloudinary_url("test", { :private_cdn => false }, "#{upload_path}/test", {})
   end
 
   it "should allow overriding cname if cname=example.com" do
@@ -67,11 +61,11 @@ describe Cloudinary::Utils do
 
   it "should allow overriding cname if cname=false" do
     Cloudinary.config.cname = "example.com"
-    test_cloudinary_url("test", {:cname => nil}, "http://res.cloudinary.com/test123/image/upload/test", {})
+    test_cloudinary_url("test", { :cname => false }, "#{upload_path}/test", {})
   end
 
-  it "should use format from options" do    
-    test_cloudinary_url("test", {:format=>:jpg}, "http://res.cloudinary.com/test123/image/upload/test.jpg", {})
+  it "should use format from options" do
+    test_cloudinary_url("test", { :format => :jpg }, "#{upload_path}/test.jpg", {})
   end
 
   it "should disallow url_suffix in shared distribution" do
@@ -112,8 +106,8 @@ describe Cloudinary::Utils do
 
     it "should allow use_root_path in shared distribution" do
       # expect{Cloudinary::Utils.cloudinary_url("test", {:use_root_path=>true})}.to raise_error(CloudinaryException)
-      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>false}, "http://res.cloudinary.com/test123/test", {})
-      test_cloudinary_url("test", {:use_root_path=>true, :private_cdn=>false, :angle=>0}, "http://res.cloudinary.com/test123/a_0/test", {})
+      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", {})
     end
 
     it "should support use_root_path for private_cdn" do
@@ -133,38 +127,38 @@ describe Cloudinary::Utils do
   end
 
   it "should use width and height from options only if crop is given" do
-    test_cloudinary_url("test", {:width=>100, :height=>100}, "http://res.cloudinary.com/test123/image/upload/test", {:width=>100, :height=>100})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/test", {:width=>100, :height=>100})
+    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
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:limit}, "http://res.cloudinary.com/test123/image/upload/c_limit,h_100,w_100/test", {})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:lfill}, "http://res.cloudinary.com/test123/image/upload/c_lfill,h_100,w_100/test", {})
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:fit}, "http://res.cloudinary.com/test123/image/upload/c_fit,h_100,w_100/test", {})
+    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", {})
   end
 
   it "should not pass width and height to html in case angle was used" do
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:scale, :angle=>:auto}, "http://res.cloudinary.com/test123/image/upload/a_auto,c_scale,h_100,w_100/test", {})
+    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"}, "http://res.cloudinary.com/test123/image/upload/g_center,p_a,q_0.4,r_3,x_1,y_2/test", {})
+  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"}, "http://res.cloudinary.com/test123/image/upload/t_blip/test", {})
+  it "should support named tranformation" do
+    test_cloudinary_url("test", { :transformation => "blip" }, "#{upload_path}/t_blip/test", {})
   end
 
-  it "should support array of named tranformations" do    
-    test_cloudinary_url("test", {:transformation=>["blip", "blop"]}, "http://res.cloudinary.com/test123/image/upload/t_blip.blop/test", {})
+  it "should support array of named tranformations" do
+    test_cloudinary_url("test", { :transformation => ["blip", "blop"] }, "#{upload_path}/t_blip.blop/test", {})
   end
 
-  it "should support base tranformation" do    
-    test_cloudinary_url("test", {:transformation=>{:x=>100, :y=>100, :crop=>:fill}, :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/c_crop,w_100/test", {:width=>100})
+  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 base tranformations" do    
-    test_cloudinary_url("test", {:transformation=>[{:x=>100, :y=>100, :width=>200, :crop=>:fill}, {:radius=>10}], :crop=>:crop, :width=>100}, "http://res.cloudinary.com/test123/image/upload/c_fill,w_200,x_100,y_100/r_10/c_crop,w_100/test", {:width=>100})
+  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 array of tranformations" do    
@@ -172,30 +166,30 @@ describe Cloudinary::Utils do
     expect(result).to eq("c_fill,w_200,x_100,y_100/r_10")
   end
 
-  it "should not include empty tranformations" do    
-    test_cloudinary_url("test", {:transformation=>[{}, {:x=>100, :y=>100, :crop=>:fill}, {}]}, "http://res.cloudinary.com/test123/image/upload/c_fill,x_100,y_100/test", {})
+  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 size" do    
-    test_cloudinary_url("test", {:size=>"10x10", :crop=>:crop}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_10,w_10/test", {:width=>"10", :height=>"10"})
+  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" })
   end
 
   it "should use type from options" do
-    test_cloudinary_url("test", {:type=>:facebook}, "http://res.cloudinary.com/test123/image/facebook/test", {})
+    test_cloudinary_url("test", { :type => :facebook }, "#{root_path}/image/facebook/test", {})
   end
 
   it "should use resource_type from options" do
-    test_cloudinary_url("test", {:resource_type=>:raw}, "http://res.cloudinary.com/test123/raw/upload/test", {})
+    test_cloudinary_url("test", { :resource_type => :raw }, "#{root_path}/raw/upload/test", {})
   end
 
   it "should ignore http links only if type is not given or is asset" do
     test_cloudinary_url("http://test", {:type=>nil}, "http://test", {})
     test_cloudinary_url("http://test", {:type=>:asset}, "http://test", {})
-    test_cloudinary_url("http://test", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://test" , {})
+    test_cloudinary_url("http://test", { :type => :fetch }, "#{root_path}/image/fetch/http://test", {})
   end
 
   it "should use allow absolute links to /images" do
-    test_cloudinary_url("/images/test", {}, "http://res.cloudinary.com/test123/image/upload/test", {})
+    test_cloudinary_url("/images/test", {}, "#{upload_path}/test", {})
   end 
 
   it "should use ignore absolute links not to /images" do
@@ -203,60 +197,61 @@ describe Cloudinary::Utils do
   end 
 
   it "should escape fetch urls" do
-    test_cloudinary_url("http://blah.com/hello?a=b", {:type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db", {})
+    test_cloudinary_url("http://blah.com/hello?a=b", { :type => :fetch }, "#{root_path}/image/fetch/http://blah.com/hello%3Fa%3Db", {})
   end 
 
   it "should should escape http urls" do
-    test_cloudinary_url("http://www.youtube.com/watch?v=d9NF2edxy-M", {:type=>:youtube}, "http://res.cloudinary.com/test123/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M", {})
+    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 
 
   it "should support background" do
-    test_cloudinary_url("test", {:background=>"red"}, "http://res.cloudinary.com/test123/image/upload/b_red/test", {})
-    test_cloudinary_url("test", {:background=>"#112233"}, "http://res.cloudinary.com/test123/image/upload/b_rgb:112233/test", {})
+    test_cloudinary_url("test", { :background => "red" }, "#{upload_path}/b_red/test", {})
+    test_cloudinary_url("test", { :background => "#112233" }, "#{upload_path}/b_rgb:112233/test", {})
   end
   
   it "should support default_image" do
-    test_cloudinary_url("test", {:default_image=>"default"}, "http://res.cloudinary.com/test123/image/upload/d_default/test", {})
+    test_cloudinary_url("test", { :default_image => "default" }, "#{upload_path}/d_default/test", {})
   end
 
   it "should support angle" do
-    test_cloudinary_url("test", {:angle=>"55"}, "http://res.cloudinary.com/test123/image/upload/a_55/test", {})
-    test_cloudinary_url("test", {:angle=>["auto", "55"]}, "http://res.cloudinary.com/test123/image/upload/a_auto.55/test", {})
+    test_cloudinary_url("test", { :angle => "55" }, "#{upload_path}/a_55/test", {})
+    test_cloudinary_url("test", { :angle => ["auto", "55"] }, "#{upload_path}/a_auto.55/test", {})
   end
   
   it "should support format for fetch urls" do
-    test_cloudinary_url("http://cloudinary.com/images/logo.png", {:format=>"jpg", :type=>:fetch}, "http://res.cloudinary.com/test123/image/fetch/f_jpg/http://cloudinary.com/images/logo.png", {})
+    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", {})
   end
   
   it "should support effect" do
-    test_cloudinary_url("test", {:effect=>"sepia"}, "http://res.cloudinary.com/test123/image/upload/e_sepia/test", {})
+    test_cloudinary_url("test", { :effect => "sepia" }, "#{upload_path}/e_sepia/test", {})
   end
 
   it "should support effect with hash param" do
-    test_cloudinary_url("test", {:effect=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
+    test_cloudinary_url("test", { :effect => { "sepia" => 10 } }, "#{upload_path}/e_sepia:10/test", {})
   end
 
   it "should support effect with array param" do
-    test_cloudinary_url("test", {:effect=>["sepia", 10]}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {}) 
+    test_cloudinary_url("test", { :effect => ["sepia", 10] }, "#{upload_path}/e_sepia:10/test", {})
   end
 
   {:overlay=>:l, :underlay=>:u}.each do |param, letter|
     it "should support #{param}" do
-      test_cloudinary_url("test", {param=>"text:hello"}, "http://res.cloudinary.com/test123/image/upload/#{letter}_text:hello/test", {})
+      test_cloudinary_url("test", { param => "text:hello" }, "#{upload_path}/#{letter}_text:hello/test", {})
     end
     
     it "should not pass width/height to html for #{param}" do
-      test_cloudinary_url("test", {param=>"text:hello", :height=>100, :width=>100}, "http://res.cloudinary.com/test123/image/upload/h_100,#{letter}_text:hello,w_100/test", {})
+      test_cloudinary_url("test", { param => "text:hello", :height => 100, :width => 100 }, "#{upload_path}/h_100,#{letter}_text:hello,w_100/test", {})
     end
   end
 
+
   it "should use ssl_detected if secure is not given as parameter and not set to true in configuration" do    
     test_cloudinary_url("test", {:ssl_detected=>true}, "https://res.cloudinary.com/test123/image/upload/test", {})
   end 
 
   it "should use secure if given over ssl_detected and configuration" do    
     Cloudinary.config.secure = true
-    test_cloudinary_url("test", {:ssl_detected=>true, :secure=>false}, "http://res.cloudinary.com/test123/image/upload/test", {})
+    test_cloudinary_url("test", { :ssl_detected => true, :secure => false }, "#{upload_path}/test", {})
   end 
 
   it "should use secure: true from configuration over ssl_detected" do    
@@ -285,19 +280,19 @@ describe Cloudinary::Utils do
   end
 
   it "should support string param" do
-    test_cloudinary_url("test", {"effect"=>{"sepia"=>10}}, "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test", {})
+    test_cloudinary_url("test", { "effect" => { "sepia" => 10 } }, "#{upload_path}/e_sepia:10/test", {})
   end
   
   it "should support border" do
-    test_cloudinary_url("test", {"border"=>{:width=>5}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_black/test", {})
-    test_cloudinary_url("test", {"border"=>{:width=>5, :color=>"#ffaabbdd"}}, "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_rgb:ffaabbdd/test", {})
-    test_cloudinary_url("test", {"border"=>"1px_solid_blue"}, "http://res.cloudinary.com/test123/image/upload/bo_1px_solid_blue/test", {})
-    test_cloudinary_url("test", {"border"=>"2"}, "http://res.cloudinary.com/test123/image/upload/test", {:border=>"2"})
+    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" })
   end
   
   it "should support flags" do
-    test_cloudinary_url("test", {"flags"=>"abc"}, "http://res.cloudinary.com/test123/image/upload/fl_abc/test", {})
-    test_cloudinary_url("test", {"flags"=>["abc", "def"]}, "http://res.cloudinary.com/test123/image/upload/fl_abc.def/test", {})
+    test_cloudinary_url("test", { "flags" => "abc" }, "#{upload_path}/fl_abc/test", {})
+    test_cloudinary_url("test", { "flags" => ["abc", "def"] }, "#{upload_path}/fl_abc.def/test", {})
   end
 
   it "build_upload_params should not destroy options" do
@@ -319,16 +314,16 @@ describe Cloudinary::Utils do
   end
   
   it "should add version if public_id contains /" do
-    test_cloudinary_url("folder/test", {}, "http://res.cloudinary.com/test123/image/upload/v1/folder/test", {})
-    test_cloudinary_url("folder/test", {:version=>123}, "http://res.cloudinary.com/test123/image/upload/v123/folder/test", {})
+    test_cloudinary_url("folder/test", {}, "#{upload_path}/v1/folder/test", {})
+    test_cloudinary_url("folder/test", { :version => 123 }, "#{upload_path}/v123/folder/test", {})
   end
 
   it "should not add version if public_id contains version already" do
-    test_cloudinary_url("v1234/test", {}, "http://res.cloudinary.com/test123/image/upload/v1234/test", {})
+    test_cloudinary_url("v1234/test", {}, "#{upload_path}/v1234/test", {})
   end
 
   it "should allow to shorted image/upload urls" do
-    test_cloudinary_url("test", {:shorten=>true}, "http://res.cloudinary.com/test123/iu/test", {})
+    test_cloudinary_url("test", { :shorten => true }, "#{root_path}/iu/test", {})
   end
   
   it "should allow to use folders in PreloadedFile" do
@@ -347,23 +342,23 @@ describe Cloudinary::Utils do
       ["parentheses(interject)", "parentheses%28interject%29"]
     ].each do
       |source, target|
-      expect(Cloudinary::Utils.cloudinary_url(source)).to eq("http://res.cloudinary.com/test123/image/upload/#{target}")
+      expect(Cloudinary::Utils.cloudinary_url(source)).to eq("#{upload_path}/#{target}")
     end      
   end
   
   it "should correctly sign URLs", :signed => true do
-    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s----SjmNDA--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :type => :authenticated, :sign_url => true}, "http://res.cloudinary.com/test123/image/authenticated/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true}, "http://res.cloudinary.com/test123/image/fetch/s--hH_YcbiS--/v1234/http://google.com/path/to/image.png", {})
+    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", {})
   end
 
   it "should correctly sign URLs in deprecated sign_version mode", :signed => true do
-    test_cloudinary_url("image.jpg", {:version => 1234, :transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--MaRXzoEC--/c_crop,h_20,w_10/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--ZlgFLQcO--/v1234/image.jpg", {})
-    test_cloudinary_url("image.jpg", {:transformation => {:crop => "crop", :width => 10, :height => 20}, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/upload/s--Ai4Znfl3--/c_crop,h_20,w_10/image.jpg", {})
-    test_cloudinary_url("http://google.com/path/to/image.png", {:type => "fetch", :version => 1234, :sign_url => true, :sign_version => true}, "http://res.cloudinary.com/test123/image/fetch/s--_GAUclyB--/v1234/http://google.com/path/to/image.png", {})
+    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", {})
   end
   
   it "should correctly sign_request" do
@@ -372,9 +367,9 @@ describe Cloudinary::Utils do
   end
 
   it "should support responsive width" do
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_limit,w_auto/test", {responsive: true})
+    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 })
     Cloudinary.config.responsive_width_transformation = {:width => :auto, :crop => :pad}
-    test_cloudinary_url("test", {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}, "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_pad,w_auto/test", {responsive: true})
+    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 })
   end
 
   it "should correctly encode double arrays" do