cloudinary 1.0.21 → 1.0.22

data/lib/cloudinary/carrier_wave/process.rb

@@ -77,7 +77,7 @@ module Cloudinary::CarrierWave
         set_or_yell(@transformation, :height, args[1])
         set_or_yell(@transformation, :crop, :scale)
       when :crop
-        set_or_yell(@transformation, :width, args[0])    
+        set_or_yell(@transformation, :width, args[0])
         set_or_yell(@transformation, :height, args[1])
         set_or_yell(@transformation, :gravity, args[2].to_s.downcase)
         set_or_yell(@transformation, :crop, :crop)
@@ -86,6 +86,13 @@ module Cloudinary::CarrierWave
           |attr, value|        
           set_or_yell(@transformation, attr, value)
         end
+      else
+        if args.blank?
+          send(name).each do
+            |attr, value|        
+            set_or_yell(@transformation, attr, value)
+          end
+        end
       end
     end
     @transformation     

data/lib/cloudinary/carrier_wave/storage.rb

@@ -1,8 +1,18 @@
 class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
   def store!(file)
     if uploader.class.version_names.blank?
-      return store_cloudinary_version(file.version) if file.is_a?(Cloudinary::CarrierWave::PreloadedCloudinaryFile)
-      
+      case file
+      when Cloudinary::CarrierWave::PreloadedCloudinaryFile 
+        return store_cloudinary_version(file.version)
+      when Cloudinary::CarrierWave::CloudinaryFile
+        return nil # Nothing to do
+      when Cloudinary::CarrierWave::RemoteFile
+        data = file.uri.to_s
+      else 
+        data = file.file
+        data.rewind if !file.is_path? && data.respond_to?(:rewind)
+      end
+            
       # This is the toplevel, need to upload the actual file.     
       params = uploader.transformation.dup
       params[:return_error] = true
@@ -13,13 +23,6 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       eager_versions = uploader.versions.values.select(&:eager)
       params[:eager] = eager_versions.map{|version| [version.transformation, version.format]} if eager_versions.length > 0
       
-      data = nil
-      if (file.is_a?(Cloudinary::CarrierWave::RemoteFile))
-        data = file.uri.to_s
-      else
-        data = file.file
-        data.rewind if !file.is_path? && data.respond_to?(:rewind)
-      end
       uploader.metadata = Cloudinary::Uploader.upload(data, params)
       if uploader.metadata["error"]
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])

data/lib/cloudinary/version.rb

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

metadata

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