cloudinary 1.0.60 → 1.0.61

data/README.md

@@ -11,6 +11,9 @@ Cloudinary provides URL and HTTP based APIs that can be easily integrated with a
 
 For Ruby on Rails, Cloudinary provides a GEM for simplifying the integration even further.
 
+## Getting started guide
+![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png)  **Take a look at our [Getting started guide of Ruby on Rails](http://cloudinary.com/documentation/rails_integration#getting_started_guide)**.
+
 ## Setup ######################################################################
 
 To install the Cloudinary Ruby GEM, run:
@@ -114,7 +117,8 @@ Same goes for Twitter:
 
     twitter_name_profile_image_tag("billclinton.jpg")
 
-See [our documentation](http://cloudinary.com/documentation/rails_integration#display_and_transform) for more information about displaying and transforming images in Rails.                                         
+![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **See [our documentation](http://cloudinary.com/documentation/rails_image_manipulation) for more information about displaying and transforming images in Rails**.                                         
+
 
 
 ### Upload
@@ -138,8 +142,9 @@ You can also specify your own public ID:
     cl_image_tag("sample_remote.jpg")
 
     http://res.cloudinary.com/demo/image/upload/sample_remote.jpg
-        
-See [our documentation](http://cloudinary.com/documentation/rails_integration#direct_upload) for plenty more options of direct uploading to the cloud from your Ruby code. 
+
+
+![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **See [our documentation](http://cloudinary.com/documentation/rails_image_upload) for plenty more options of uploading to the cloud from your Ruby code or directly from the browser**.
 
 
 ### CarrierWave Integration
@@ -151,7 +156,7 @@ Cloudinary's Ruby GEM includes an optional plugin for [CarrierWave](https://gith
         ...  
     end
 
-For more details on CarrierWave integration see [our documentation](http://cloudinary.com/documentation/rails_integration#carrierwave_upload).
+![](http://res.cloudinary.com/cloudinary/image/upload/see_more_bullet.png) **For more details on CarrierWave integration see [our documentation](http://cloudinary.com/documentation/rails_carrierwave)**.
 
 We also published an interesting blog post about [Ruby on Rails image uploads with CarrierWave and Cloudinary](http://cloudinary.com/blog/ruby_on_rails_image_uploads_with_carrierwave_and_cloudinary).
 
@@ -167,17 +172,20 @@ Additional resources are available at:
 
 * [Website](http://cloudinary.com)
 * [Documentation](http://cloudinary.com/documentation)
+* [Knowledge Base](http://support.cloudinary.com/forums)
 * [Documentation for Ruby on Rails integration](http://cloudinary.com/documentation/rails_integration)
+* [Ruby on Rails image upload documentation](http://cloudinary.com/documentation/rails_image_upload)
+* [Ruby on Rails image manipulation documentation](http://cloudinary.com/documentation/rails_image_manipulation)
 * [Image transformations documentation](http://cloudinary.com/documentation/image_transformations)
-* [Upload API documentation](http://cloudinary.com/documentation/upload_images)
 
 ## Support
 
 You can [open an issue through GitHub](https://github.com/cloudinary/cloudinary_gem/issues).
 
-Contact us at [info@cloudinary.com](mailto:info@cloudinary.com)
+Contact us [http://cloudinary.com/contact](http://cloudinary.com/contact)
+
+Stay tuned for updates, tips and tutorials: [Blog](http://cloudinary.com/blog), [Twitter](https://twitter.com/cloudinary), [Facebook](http://www.facebook.com/Cloudinary).
 
-Or via Twitter: [@cloudinary](https://twitter.com/#!/cloudinary)
 
 ## License #######################################################################
 

data/lib/cloudinary/api.rb

@@ -18,6 +18,10 @@ class Cloudinary::Api
       @rate_limit_remaining = response.headers[:x_featureratelimit_remaining].to_i     
     end
   end
+
+  def self.ping(options={})
+    call_api(:get, "ping", {}, options)
+  end
   
   def self.usage(options={})
     call_api(:get, "usage", {}, options)

data/lib/cloudinary/carrier_wave.rb

@@ -20,7 +20,9 @@ module Cloudinary::CarrierWave
   end
   
   def retrieve_from_store!(identifier)
-    if identifier.blank?
+    # Workaround cloudinary-mongoid hack of setting column to _old_ before saving it.
+    mongoid_blank = defined?(Mongoid::Extensions::Object) && self.is_a?(Mongoid::Extensions::Object) && identifier == "_old_"
+    if identifier.blank? || mongoid_blank
       @file = @stored_version = @stored_public_id = nil
       self.original_filename = nil
     else

data/lib/cloudinary/carrier_wave/storage.rb

@@ -6,30 +6,30 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       case file
       when Cloudinary::CarrierWave::PreloadedCloudinaryFile
         storage_type = uploader.class.storage_type || "upload"
-        raise CloudinaryException, "Uploader configured for type #{storage_type} but resource of type #{file.type} given." if storage_type != file.type 
+        raise CloudinaryException, "Uploader configured for type #{storage_type} but resource of type #{file.type} given." if storage_type != file.type
         if uploader.public_id && uploader.auto_rename_preloaded?
           @stored_version = file.version
           uploader.rename(nil, true)
         else
           store_cloudinary_identifier(file.version, file.filename)
-        end 
-        return 
+        end
+        return
       when Cloudinary::CarrierWave::CloudinaryFile
         return nil # Nothing to do
       when Cloudinary::CarrierWave::RemoteFile
         data = file.uri.to_s
-      else 
+      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.     
+
+      # This is the toplevel, need to upload the actual file.
       params = uploader.transformation.dup
       params[:return_error] = true
       params[:format] = uploader.format
       params[:public_id] = uploader.my_public_id
       uploader.versions.values.each(&:tags) # Validate no tags in versions
-      params[:tags] = uploader.tags if uploader.tags 
+      params[:tags] = uploader.tags if uploader.tags
       eager_versions = uploader.versions.values.select(&:eager)
       params[:eager] = eager_versions.map{|version| [version.transformation, version.format]} if eager_versions.length > 0
       params[:type]=uploader.class.storage_type
@@ -40,11 +40,11 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       if uploader.metadata["error"]
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])
       end
-      
+
       if uploader.metadata["version"]
-        filename = [uploader.metadata["public_id"], uploader.metadata["format"]].reject(&:blank?).join(".") 
+        filename = [uploader.metadata["public_id"], uploader.metadata["format"]].reject(&:blank?).join(".")
         store_cloudinary_identifier(uploader.metadata["version"], filename)
-      end 
+      end
       # Will throw an exception on error
     else
       raise CloudinaryException, "nested versions are not allowed." if (uploader.class.version_names.length > 1)
@@ -52,15 +52,15 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     end
     nil
   end
-  
+
   # @deprecated For backward compatibility
   def store_cloudinary_version(version)
     if identifier.match(%r(^(v[0-9]+)/(.*)))
       filename = $2
-    else 
+    else
       filename = identifier
     end
-    
+
     store_cloudinary_identifier(version, filename)
   end
 
@@ -78,12 +78,16 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       uploader.model.send :write_attribute, column, name
     elsif defined?(Mongoid::Document) && uploader.model.is_a?(Mongoid::Document)
       # Mongoid support
-      uploader.model.set(column, name)
+      if Mongoid::VERSION.split(".").first.to_i >= 4
+        uploader.model.set(:"#{column}" => name)
+      else
+        uploader.model.set(column, name)
+      end
     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 CloudinaryException, "Only ActiveRecord and Mongoid are supported at the moment!"
     end
-  end 
+  end
 end

data/lib/cloudinary/helper.rb

@@ -228,7 +228,7 @@ if defined? ActionView::Helpers::AssetUrlHelper
   module ActionView::Helpers::AssetUrlHelper
     alias :original_path_to_asset :path_to_asset
   
-    def path_to_asset(source, options)
+    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))

data/lib/cloudinary/uploader.rb

@@ -42,7 +42,7 @@ class Cloudinary::Uploader
   def self.upload(file, options={})
     call_api("upload", options) do    
       params = build_upload_params(options)
-      if file.respond_to?(:read) || file =~ /^https?:|^s3:|^data:image\/\w*;base64,([a-zA-Z0-9\/+\n=]+)$/
+      if file.respond_to?(:read) || file =~ /^https?:|^s3:|^data:[^;]*;base64,([a-zA-Z0-9\/+\n=]+)$/
         params[:file] = file
       else 
         params[:file] = File.open(file, "rb")

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.60"
+  VERSION = "1.0.61"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.60
+  version: 1.0.61
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client