cloudinary 1.0.57 → 1.0.58

data/README.md

@@ -155,6 +155,11 @@ For more details on CarrierWave integration see [our documentation](http://cloud
 
 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).
 
+### Samples
+
+You can find our simple and ready-to-use samples projects, along with documentation in the [samples folder](https://github.com/cloudinary/cloudinary_gem/tree/master/samples). 
+Please consult with the [README file](https://github.com/cloudinary/cloudinary_gem/blob/master/samples/README.md), for usage and explanations.
+
 
 ## Additional resources ##########################################################
 

data/lib/cloudinary/helper.rb

@@ -9,7 +9,7 @@ module CloudinaryHelper
   # cl_image_tag "israel.png", :width=>100, :height=>100, :alt=>"hello", :crop=>:fit # W/H are sent to cloudinary
   def cl_image_tag(source, options = {})
     options = options.clone
-    source = cloudinary_url(source, options)
+    source = cloudinary_url_internal(source, options)
     options[:width] = options.delete(:html_width) if options.include?(:html_width)
     options[:height] = options.delete(:html_height) if options.include?(:html_height)
     options[:size] = options.delete(:html_size) if options.include?(:html_size)
@@ -20,7 +20,7 @@ module CloudinaryHelper
 
   def cl_image_path(source, options = {})
     options = options.clone
-    url = cloudinary_url(source, options)
+    url = cloudinary_url_internal(source, options)
     original_image_path(url)    
   end
     
@@ -98,7 +98,7 @@ module CloudinaryHelper
     end  
     
     options[:format] = "css" unless source.ends_with?(".css")
-    cloudinary_url(source, options.merge(:type=>:sprite))
+    cloudinary_url_internal(source, options.merge(:type=>:sprite))
   end
 
   def cl_sprite_tag(source, options = {})
@@ -143,20 +143,9 @@ module CloudinaryHelper
   end
 
   def cloudinary_url(source, options = {})
-    options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
-    if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)      
-      if source.version_name.present?
-        options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation]) 
-      end         
-      options.reverse_merge!(      
-        :resource_type => Cloudinary::Utils.resource_type_for_format(source.filename || source.format),
-        :type => source.storage_type,
-        :format => source.format)
-      source = source.full_public_id      
-    end
-    Cloudinary::Utils.cloudinary_url(source, options)
-  end  
-
+    cloudinary_url_internal(source, options.clone)
+  end
+  
   def cl_image_upload(object_name, method, options={})
     cl_image_upload_tag("#{object_name}[#{method}]", options)
   end
@@ -199,6 +188,21 @@ module CloudinaryHelper
   end
   
   private
+  def cloudinary_url_internal(source, options = {})
+    options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
+    if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)      
+      if source.version_name.present?
+        options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation]) 
+      end         
+      options.reverse_merge!(      
+        :resource_type => Cloudinary::Utils.resource_type_for_format(source.filename || source.format),
+        :type => source.storage_type,
+        :format => source.format)
+      source = source.full_public_id      
+    end
+    Cloudinary::Utils.cloudinary_url(source, options)
+  end  
+
   def build_callback_url(options)
     callback_path = options.delete(:callback_cors) || Cloudinary.config.callback_cors || "/cloudinary_cors.html"
     if !callback_path.match(/^https?:\/\//)

data/lib/cloudinary/utils.rb

@@ -26,7 +26,7 @@ class Cloudinary::Utils
     crop = options.delete(:crop)
     angle = build_array(options.delete(:angle)).join(".")
 
-    no_html_sizes = has_layer || !angle.blank? || crop.to_s == "fit" || crop.to_s == "limit"
+    no_html_sizes = has_layer || !angle.blank? || crop.to_s == "fit" || crop.to_s == "limit" || crop.to_s == "lfill"
     options.delete(:width) if width && (width.to_f < 1 || no_html_sizes)
     options.delete(:height) if height && (height.to_f < 1 || no_html_sizes)
 
@@ -263,7 +263,7 @@ class Cloudinary::Utils
     end
   end
   
-  IMAGE_FORMATS = %w(bmp png tif tiff jpg jpeg gif pdf ico eps) 
+  IMAGE_FORMATS = %w(bmp png tif tiff jpg jpeg gif pdf ico eps jpc jp2 psd) 
   
   def self.supported_image_format?(format)
     format = format.to_s.downcase

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.57"
+  VERSION = "1.0.58"
 end

data/spec/utils_spec.rb

@@ -104,11 +104,15 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/test" 
   end
 
-  it "should not pass width and height to html in case of fit or limit crop" do
+  it "should not pass width and height to html in case of fit, lfill or limit crop" do
     options = {:width=>100, :height=>100, :crop=>:limit}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/upload/c_limit,h_100,w_100/test" 
+    options = {:width=>100, :height=>100, :crop=>:lfill}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_lfill,h_100,w_100/test" 
     options = {:width=>100, :height=>100, :crop=>:fit}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}

metadata

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