cloudinary 1.0.47 → 1.0.48

data/lib/cloudinary/api.rb

@@ -1,3 +1,5 @@
+require 'rest_client'
+
 class Cloudinary::Api
   class Error < CloudinaryException; end
   class NotFound < Error; end

data/lib/cloudinary/carrier_wave.rb

@@ -103,6 +103,11 @@ module Cloudinary::CarrierWave
   def delete_remote?
     true
   end
+
+  # Let Cloudinary download remote URLs directly
+  def cloudinary_should_handle_remote?
+    true
+  end
   
   class CloudinaryFile
     attr_reader :identifier, :public_id, :filename, :format, :version, :storage_type, :resource_type

data/lib/cloudinary/carrier_wave/remote.rb

@@ -1,5 +1,6 @@
 module Cloudinary::CarrierWave
   def download!(uri)
+    return super if !self.cloudinary_should_handle_remote?
     if respond_to?(:process_uri)
       uri = process_uri(uri)
     else # Backward compatibility with old CarrierWave

data/lib/cloudinary/helper.rb

@@ -210,6 +210,20 @@ module Cloudinary::FormBuilder
   end
 end
 
+if defined? ActionView::Helpers::AssetUrlHelper
+  module ActionView::Helpers::AssetUrlHelper
+    alias :original_path_to_asset :path_to_asset
+  
+    def path_to_asset(source, options)
+      options ||= {}
+      if Cloudinary.config.enhance_image_tag && options[:type] == :image
+        source = Cloudinary::Utils.cloudinary_url(source, options.merge(:type=>:asset))
+      end
+      original_path_to_asset(source, options)
+    end    
+  end
+end
+
 ActionView::Base.send :include, CloudinaryHelper
 
 begin

data/lib/cloudinary/uploader.rb

@@ -16,7 +16,7 @@ class Cloudinary::Uploader
   
   def self.build_upload_params(options)
     params = {:timestamp=>Time.now.to_i,
-              :transformation => Cloudinary::Utils.generate_transformation_string(options),
+              :transformation => Cloudinary::Utils.generate_transformation_string(options.clone),
               :public_id=> options[:public_id],
               :callback=> options[:callback],
               :format=>options[:format],
@@ -123,7 +123,7 @@ class Cloudinary::Uploader
         :format=>options[:format],
         :async=>options[:async],
         :notification_url=>options[:notification_url],
-        :transformation => Cloudinary::Utils.generate_transformation_string(options)        
+        :transformation => Cloudinary::Utils.generate_transformation_string(options.clone)        
       }    
     end
   end
@@ -136,7 +136,7 @@ class Cloudinary::Uploader
         :type=>options[:type],
         :format=>options[:format],
         :notification_url=>options[:notification_url],
-        :transformation => Cloudinary::Utils.generate_transformation_string(options)        
+        :transformation => Cloudinary::Utils.generate_transformation_string(options.clone)        
       }    
     end
   end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.47"
+  VERSION = "1.0.48"
 end

data/spec/utils_spec.rb

@@ -372,4 +372,10 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/upload/fl_abc.def/test"     
   end
+
+  it "build_upload_params should not destroy options" do
+    options = {:width=>100, :crop=>:scale}
+    Cloudinary::Uploader.build_upload_params(options)[:transformation].should == "c_scale,w_100"
+    options.length.should == 2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.47
+  version: 1.0.48
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client