cloudinary 1.0.9 → 1.0.10

data/.gitignore

@@ -1,4 +1,4 @@
 pkg
 .project
 .rvmrc
-
+assets/

data/.rspec

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

data/Rakefile

@@ -1,3 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+task :fetch_assets do
+  system "/bin/rm -rf assets; mkdir -p assets; cd assets; curl -L https://github.com/cloudinary/cloudinary_js/tarball/master | tar zxvf - --strip=1"
+end
+
+task :build=>:fetch_assets

data/cloudinary.gemspec

@@ -13,10 +13,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cloudinary"
 
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n") + Dir.glob("assets/*/*")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
   s.add_dependency "rest-client"
+  s.add_development_dependency "rspec"
 end

data/lib/cloudinary.rb

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

data/lib/cloudinary/carrier_wave.rb

@@ -1,6 +1,8 @@
 # Copyright Cloudinary
 require 'pp'
 module Cloudinary::CarrierWave
+  CLOUDINARY_PATH = /^([^\/]+)\/upload\/v(\d+)\/([^\/]+)#([^\/]+)$/
+  
   class UploadError < StandardError
     attr_reader :http_code
     def initialize(message, http_code)
@@ -55,8 +57,40 @@ module Cloudinary::CarrierWave
     base.storage Cloudinary::CarrierWave::Storage
     base.extend ClassMethods
     base.send(:attr_accessor, :metadata)
+    base.send(:alias_method, :original_cache!, :cache!)
+    base.send(:alias_method, :original_cache_name, :cache_name)
+    base.send(:alias_method, :original_retrieve_from_cache!, :retrieve_from_cache!)
+    base.send(:include, Override)
   end
   
+  module Override
+    def cache!(new_file)
+      if new_file.is_a?(String) && new_file.match(CLOUDINARY_PATH)
+        @file = CloudinaryFile.new(new_file)
+        self.original_filename = @cache_id = @my_filename = @filename = @file.original_filename
+      else
+        original_cache!(new_file)
+      end
+    end
+
+    def retrieve_from_cache!(new_file)
+      if new_file.is_a?(String) && new_file.match(CLOUDINARY_PATH)
+        @file = CloudinaryFile.new(new_file)
+        self.original_filename = @cache_id = @my_filename = @filename = @file.original_filename
+      else
+        original_retrieve_from_cache!(new_file)
+      end
+    end
+    
+    def cache_name
+      if @file.is_a?(CloudinaryFile)
+        return @file.to_s
+      else
+        return original_cache_name
+      end
+    end
+  end
+      
   def set_or_yell(hash, attr, value)
     raise "conflicting transformation on #{attr} #{value}!=#{hash[attr]}" if hash[attr]
     hash[attr] = value
@@ -129,12 +163,13 @@ module Cloudinary::CarrierWave
   end
   
   def url(*args)
-    if(args.first)
+    if args.first && !args.first.is_a?(Hash)
       super
     else
-      return nil if blank?
-      options = self.class.version_names.blank? ? {} : self.transformation
-      Cloudinary::Utils.cloudinary_url(self.my_filename, options.clone)
+      return nil if self.my_identifier.blank?
+      options = args.extract_options!
+      options = options.merge(self.class.version_names.blank? ? {} : self.transformation)
+      Cloudinary::Utils.cloudinary_url(self.my_filename, options)
     end
   end
 
@@ -143,16 +178,17 @@ module Cloudinary::CarrierWave
   end
 
   def stored_filename
-    @stored_filename ||= model.read_uploader(mounted_as)
+    @stored_filename = model.read_uploader(mounted_as) if @stored_filename.blank?
+    @stored_filename
   end  
 
   def my_filename
-    @my_filename ||= stored_filename || ("#{self.public_id}.#{self.format}")
+    @my_filename ||= stored_filename.present? ? stored_filename : ("#{self.public_id}.#{self.format}")
   end
     
   def public_id
     return @public_id if @public_id
-    if stored_filename
+    if stored_filename.present?
       last_dot = stored_filename.rindex(".")
       @public_id = last_dot ? stored_filename[0, last_dot] : stored_filename 
     end    
@@ -165,8 +201,18 @@ module Cloudinary::CarrierWave
     @file = RemoteFile.new(uri, @filename)
   end
   
-  def blank?
-    self.filename.blank? && self.stored_filename.blank?
+  def my_identifier
+    (self.filename || self.stored_filename.present?) ? self.my_filename : nil    
+  end
+  
+  class RemoveableFile
+    def initialize(identifier)
+      @public_id = identifier.split("/").last.split(".").first
+    end
+    
+    def delete
+      Cloudinary::Uploader.destroy(@public_id)
+    end
   end
   
   class RemoteFile
@@ -181,10 +227,33 @@ module Cloudinary::CarrierWave
     end
   end
   
+  class CloudinaryFile
+    attr_reader :original_filename, :version
+    def initialize(file_info)
+      resource_type, @version, @original_filename, @signature = file_info.scan(CLOUDINARY_PATH).first
+      raise "Cloudinary CarrierWave integration supports images only" if resource_type != "image"
+      public_id = @original_filename[0..(@original_filename.rindex(".")-1)]
+      expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>public_id, :version=>version}, Cloudinary.config.api_secret)
+      if @signature != expected_signature
+        raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.cloudinary_signature_error", :public_id=>public_id, :default=>"Invalid signature for #{public_id}")
+      end
+    end
+    
+    def to_s
+      "image/upload/v#{@version}/#{@original_filename}##{@signature}"
+    end
+
+    def delete
+      # Do nothing. This is a virtual file.
+    end
+  end
+  
   class Storage < ::CarrierWave::Storage::Abstract
     def store!(file)
       # Moved to identifier...
       if uploader.class.version_names.blank?
+        return store_cloudinary_version(file.version) if file.is_a?(CloudinaryFile)
+        
         # This is the toplevel, need to upload the actual file.     
         params = uploader.transformation.dup
         params[:return_error] = true
@@ -206,35 +275,41 @@ module Cloudinary::CarrierWave
           raise UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])
         end
         
-        if uploader.metadata["version"]
-
-          name = "v#{uploader.metadata["version"]}/#{identifier.split("/").last}"
-          model_class = uploader.model.class
-          if defined?(ActiveRecord::Base) && uploader.model.is_a?(ActiveRecord::Base)
-            primary_key = model_class.primary_key.to_sym
-            model_class.update_all({uploader.mounted_as=>name}, {primary_key=>uploader.model.send(primary_key)})
-            uploader.model.send :write_attribute, uploader.mounted_as, name
-          elsif model_class.respond_to?(:update_all) && uploader.model.respond_to?(:_id)
-            # Mongoid support
-            model_class.where(:_id=>uploader.model._id).update_all(uploader.mounted_as=>name)
-            uploader.model.send :write_attribute, uploader.mounted_as, name
-          else
-            raise "Only ActiveRecord and Mongoid are supported at the moment!"
-          end
-        end
+        store_cloudinary_version(uploader.metadata["version"]) if uploader.metadata["version"]
         # Will throw an exception on error
       else
         raise "nested versions are not allowed." if (uploader.class.version_names.length > 1)
         # Do nothing
       end
+      nil
+    end
+    
+    def store_cloudinary_version(version)
+      name = "v#{version}/#{identifier.split("/").last}"
+      model_class = uploader.model.class
+      if defined?(ActiveRecord::Base) && uploader.model.is_a?(ActiveRecord::Base)
+        primary_key = model_class.primary_key.to_sym
+        model_class.update_all({uploader.mounted_as=>name}, {primary_key=>uploader.model.send(primary_key)})
+        uploader.model.send :write_attribute, uploader.mounted_as, name
+      elsif model_class.respond_to?(:update_all) && uploader.model.respond_to?(:_id)
+        # Mongoid support
+        model_class.where(:_id=>uploader.model._id).update_all(uploader.mounted_as=>name)
+        uploader.model.send :write_attribute, uploader.mounted_as, name
+      else
+        raise "Only ActiveRecord and Mongoid are supported at the moment!"
+      end
     end
     
     def retrieve!(identifier)
-      # Do nothing
+      if uploader.class.version_names.blank?
+        return RemoveableFile.new(identifier)
+      else
+        return nil # Version files should not be deleted.
+      end      
     end 
     
     def identifier
-      (uploader.filename || uploader.stored_filename) ? uploader.my_filename : nil
+      uploader.my_identifier      
     end   
   end
 end

data/lib/cloudinary/helper.rb

@@ -81,12 +81,9 @@ module CloudinaryHelper
     form_options[:method] = :post
     form_options[:multipart] = true
      
-    options[:timestamp] = Time.now.to_i
-    options[:callback] = callback_url    
-    options[:transformation] = Cloudinary::Utils.generate_transformation_string(options[:transformation]) if options[:transformation]
-    options[:tags] = Cloudinary::Utils.build_array(options[:tags]).join(",") if options[:tags]  
-    options[:signature] = Cloudinary::Utils.api_sign_request(options, Cloudinary.config.api_secret)  
-    options[:api_key] = Cloudinary.config.api_key
+    params = Cloudinary::Uploader.build_upload_params(options.merge(:callback=>callback_url))  
+    params[:signature] = Cloudinary::Utils.api_sign_request(params, Cloudinary.config.api_secret)  
+    params[:api_key] = Cloudinary.config.api_key
   
     api_url = Cloudinary::Utils.cloudinary_api_url("upload", 
                 {:resource_type => options.delete(:resource_type), :upload_prefix => options.delete(:upload_prefix)})
@@ -94,7 +91,7 @@ module CloudinaryHelper
     form_tag(api_url, form_options) do
       content = []
   
-      options.each do |name, value|
+      params.each do |name, value|
         content << hidden_field_tag(name, value)
       end
   
@@ -104,10 +101,67 @@ module CloudinaryHelper
     end
   end
 
+  CLOUDINARY_JS_CONFIG_PARAMS = [:api_key, :cloud_name, :private_cdn, :secure_distribution, :cdn_subdomain]
+  def cloudinary_js_config
+    params = {}
+    CLOUDINARY_JS_CONFIG_PARAMS.each{|param| params[param] = Cloudinary.config.send(param)}    
+    content_tag("script", "$.cloudinary.config(#{params.to_json});".html_safe, :type=>"text/javascript")      
+  end
+
   def cloudinary_url(source, options = {})
     options[:secure] = request.ssl? if !options.include?(:secure) && defined?(request) && request && request.respond_to?(:ssl?)
     Cloudinary::Utils.cloudinary_url(source, options)
   end  
+
+  def cl_image_upload(object_name, method, options={})
+    cl_image_upload_tag("#{object_name}[#{method}]", options)
+  end
+  
+  def cl_image_upload_tag(field, options={})
+    html_options = options.delete(:html) || {}
+    cloudinary_upload_url = Cloudinary::Utils.cloudinary_api_url("upload", {:resource_type=>:auto}.merge(options))
+    
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+
+    cloudinary_params = Cloudinary::Uploader.build_upload_params(options)
+    cloudinary_params[:callback] = build_callback_url(options)
+    cloudinary_params[:signature] = Cloudinary::Utils.api_sign_request(cloudinary_params, api_secret)
+    cloudinary_params[:api_key] = api_key
+
+    tag_options = html_options.merge(:type=>"file", :name=>"file", 
+      :"data-url"=>cloudinary_upload_url,
+      :"data-form-data"=>cloudinary_params.reject{|k, v| v.blank?}.to_json,
+      :"data-cloudinary-field"=>field,
+      :"class" => [html_options[:class], "cloudinary-fileupload"].flatten.compact 
+    ).reject{|k,v| v.blank?}
+    content_tag("input", nil, tag_options)
+  end
+  
+  def self.included(base)
+    ActionView::Helpers::FormBuilder.send(:include, Cloudinary::FormBuilder)
+  end
+  
+  private
+  def build_callback_url(options)
+    callback_path = options.delete(:callback_cors) || Cloudinary.config.callback_cors || "/cloudinary_cors.html"
+    if !callback_path.match(/^https?:\/\//)
+      callback_url = request.scheme + "://"
+      callback_url << request.host
+      if request.scheme == "https" && request.port != 443 ||
+        request.scheme == "http" && request.port != 80
+        callback_url << ":#{request.port}"
+      end
+      callback_url << callback_path
+    end
+    callback_url
+  end  
+end
+
+module Cloudinary::FormBuilder
+  def cl_image_upload(method, options={})
+    @template.cl_image_upload(@object_name, method, objectify_options(options))
+  end
 end
 
 ActionView::Base.send :include, CloudinaryHelper

data/lib/cloudinary/static.rb

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

data/lib/cloudinary/uploader.rb

@@ -4,23 +4,28 @@ require 'json'
 
 class Cloudinary::Uploader
   
+  def self.build_upload_params(options)
+    params = {:timestamp=>Time.now.to_i,
+              :transformation => Cloudinary::Utils.generate_transformation_string(options),
+              :public_id=> options[:public_id],
+              :callback=> options[:callback],
+              :format=>options[:format],
+              :type=>options[:type],
+              :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
+    if options[:eager]
+      params[:eager] = options[:eager].map do
+        |transformation, format|
+        transformation = transformation.clone
+        format = transformation.delete(:format) || format
+        [Cloudinary::Utils.generate_transformation_string(transformation), format].compact.join("/")
+      end.join("|")
+    end
+    params    
+  end
+   
   def self.upload(file, options={})
     call_api("upload", options) do    
-      params = {:timestamp=>Time.now.to_i,
-                :transformation => Cloudinary::Utils.generate_transformation_string(options),
-                :public_id=> options[:public_id],
-                :callback=> options[:callback],
-                :format=>options[:format],
-                :type=>options[:type],
-                :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
-      if options[:eager]
-        params[:eager] = options[:eager].map do
-          |transformation, format|
-          transformation = transformation.clone
-          format = transformation.delete(:format) || format
-          [Cloudinary::Utils.generate_transformation_string(transformation), format].compact.join("/")
-        end.join("|")
-      end
+      params = build_upload_params(options)
       if file.respond_to?(:read) || file =~ /^https?:/
         params[:file] = file
       else 

data/lib/cloudinary/utils.rb

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

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/spec/spec_helper.rb

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

data/spec/utils_spec.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 +03:00
+date: 2012-04-18 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +26,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Client library for easily using the Cloudinary service
 email: 
 - nadav.soferman@cloudinary.com
@@ -39,6 +50,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -57,6 +69,13 @@ files:
 - lib/cloudinary/utils.rb
 - lib/cloudinary/version.rb
 - lib/tasks/cloudinary.rake
+- spec/spec_helper.rb
+- spec/utils_spec.rb
+- assets/html/cloudinary_cors.html
+- assets/js/jquery.cloudinary.js
+- assets/js/jquery.fileupload.js
+- assets/js/jquery.iframe-transport.js
+- assets/js/jquery.ui.widget.js
 has_rdoc: true
 homepage: http://cloudinary.com
 licenses: []
@@ -85,5 +104,6 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Client library for easily using the Cloudinary service
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/utils_spec.rb