cloudinary 1.0.22 → 1.0.23

data/lib/cloudinary/utils.rb

@@ -32,7 +32,7 @@ class Cloudinary::Utils
     end
 
     params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background}
-    { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :p=>:prefix, :a=>:angle, :l=>:overlay }.each do
+    { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :p=>:prefix, :a=>:angle, :l=>:overlay, :f=>:fetch_format, :e=>:effects }.each do
       |param, option|
       params[param] = options.delete(option)
     end    
@@ -50,10 +50,11 @@ class Cloudinary::Utils
 
   # Warning: options are being destructively updated!
   def self.cloudinary_url(source, options = {})
-    original_source = source
+    type = options.delete(:type)
+
+    options[:fetch_format] ||= options.delete(:format) if type == :fetch 
     transformation = self.generate_transformation_string(options)
 
-    type = options.delete(:type)
     resource_type = options.delete(:resource_type) || "image"
     version = options.delete(:version)
     format = options.delete(:format)
@@ -64,6 +65,7 @@ class Cloudinary::Utils
     secure_distribution = options.delete(:secure_distribution) || Cloudinary.config.secure_distribution
     force_remote = options.delete(:force_remote)  
     
+    original_source = source
     return original_source if source.blank?
     if !force_remote    
       return original_source if (type.nil? || type == :asset) && source.match(%r(^https?:/)i)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.22"
+  VERSION = "1.0.23"
 end

data/spec/utils_spec.rb

@@ -199,4 +199,18 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/upload/l_text:hello/test" 
   end
   
+  it "should support format for fetch urls" do
+    options = {:format=>"jpg", :type=>:fetch}
+    result = Cloudinary::Utils.cloudinary_url("http://cloudinary.com/images/logo.png", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/fetch/f_jpg/http://cloudinary.com/images/logo.png" 
+  end
+  
+  it "should support effects" do
+    options = {:effects=>"sepia"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/e_sepia/test" 
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 +03:00
+date: 2012-05-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency