cloudinary 1.0.20 → 1.0.21

data/lib/cloudinary/carrier_wave.rb

@@ -109,7 +109,7 @@ module Cloudinary::CarrierWave
 
   def self.split_format(identifier)
     last_dot = identifier.rindex(".")
-    return [public_id, nil] if last_dot.nil?
+    return [identifier, nil] if last_dot.nil?
     public_id = identifier[0, last_dot]
     format = identifier[last_dot+1..-1]
     return [public_id, format]    

data/lib/cloudinary/uploader.rb

@@ -45,6 +45,15 @@ class Cloudinary::Uploader
     end              
   end
     
+  TEXT_PARAMS = [:public_id, :font_family, :font_size, :font_color, :text_align, :font_weight, :font_style, :background, :opacity, :text_decoration]  
+  def self.text(text, options={})
+    call_api("text", options) do
+      params = {:timestamp => Time.now.to_i, :text=>text}
+      TEXT_PARAMS.each{|k| params[k] = options[k] if !options[k].nil?}
+      params
+    end
+  end  
+    
   def self.generate_sprite(tag, options={})
     version_store = options.delete(:version_store)
     

data/lib/cloudinary/utils.rb

@@ -17,15 +17,9 @@ class Cloudinary::Utils
     crop = options.delete(:crop)
     width=height=nil if crop.nil?
 
-    x = options.delete(:x)
-    y = options.delete(:y)
-    radius = options.delete(:radius)
-    default_image = options.delete(:default_image)
     background = options.delete(:background)
     background = background.sub(/^#/, 'rgb:') if background
-    
-    gravity = options.delete(:gravity)
-    quality = options.delete(:quality)
+        
     base_transformations = build_array(options.delete(:transformation))
     if base_transformations.any?{|base_transformation| base_transformation.is_a?(Hash)}
       base_transformations = base_transformations.map do
@@ -36,9 +30,13 @@ class Cloudinary::Utils
       named_transformation = base_transformations.join(".")
       base_transformations = []
     end
-    prefix = options.delete(:prefix)
 
-    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :q=>quality, :g=>gravity, :p=>prefix, :x=>x, :y=>y, :r=>radius, :d=>default_image, :b=>background}
+    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
+      |param, option|
+      params[param] = options.delete(option)
+    end    
+
     transformation = params.reject{|k,v| v.blank?}.map{|k,v| [k.to_s, v]}.sort_by(&:first).map{|k,v| "#{k}_#{v}"}.join(",")
     raw_transformation = options.delete(:raw_transformation)
     transformation = [transformation, raw_transformation].reject(&:blank?).join(",")

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.20"
+  VERSION = "1.0.21"
 end

data/spec/utils_spec.rb

@@ -184,5 +184,19 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/upload/d_default/test" 
   end
+
+  it "should support angle" do
+    options = {:angle=>"55"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/a_55/test" 
+  end
+  
+  it "should support overlay" do
+    options = {:overlay=>"text:hello"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/l_text:hello/test" 
+  end
   
 end

metadata

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