cloudinary 1.0.24 → 1.0.25

data/lib/cloudinary/carrier_wave/storage.rb

@@ -40,14 +40,17 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
   def store_cloudinary_version(version)
     name = "v#{version}/#{identifier.split("/").last}"
     model_class = uploader.model.class
+    column = uploader.model.send(:_mounter, uploader.mounted_as).send(:serialization_column)
     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)
+      model_class.update_all({column=>name}, {primary_key=>uploader.model.send(primary_key)})
+      uploader.model.send :write_attribute, column, name
+    elsif defined?(Mongoid::Document) && uploader.model.is_a?(Mongoid::Document)
       # Mongoid support
-      model_class.where(:_id=>uploader.model._id).update_all(uploader.mounted_as=>name)
-      uploader.model.send :write_attribute, uploader.mounted_as, name
+      uploader.model.set(column, name)
+    elsif model_class.respond_to?(:update_all) && uploader.model.respond_to?(:_id)
+      model_class.where(:_id=>uploader.model._id).update_all(column=>name)
+      uploader.model.send :write_attribute, column, name
     else
       raise "Only ActiveRecord and Mongoid are supported at the moment!"
     end

data/lib/cloudinary/uploader.rb

@@ -61,7 +61,7 @@ class Cloudinary::Uploader
       {
         :timestamp=>Time.now.to_i,
         :tag=>tag,
-        :transformation => Cloudinary::Utils.generate_transformation_string(options)
+        :transformation => Cloudinary::Utils.generate_transformation_string(options.merge(:fetch_format=>options[:format]))        
       }    
     end
     

data/lib/cloudinary/utils.rb

@@ -11,11 +11,13 @@ class Cloudinary::Utils
     options[:width], options[:height] = size.split("x") if size    
     width = options[:width]
     height = options[:height]
-    options.delete(:width) if width && width.to_f < 1 
-    options.delete(:height) if height && height.to_f < 1    
+    has_overlay = !options[:overlay].blank?
+    
+    options.delete(:width) if width && (width.to_f < 1 || has_overlay) 
+    options.delete(:height) if height && (height.to_f < 1 || has_overlay)
      
     crop = options.delete(:crop)
-    width=height=nil if crop.nil?
+    width=height=nil if crop.nil? && !has_overlay
 
     background = options.delete(:background)
     background = background.sub(/^#/, 'rgb:') if background

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.24"
+  VERSION = "1.0.25"
 end

data/spec/utils_spec.rb

@@ -226,5 +226,12 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test" 
   end
+
+  it "should not pass width/height to html for overlay" do
+    options = {:overlay=>"text:hello", :height=>100, :width=>100}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/h_100,l_text:hello,w_100/test" 
+  end
   
 end

metadata

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