cloudinary 1.0.33 → 1.0.34

data/lib/cloudinary.rb

@@ -9,6 +9,7 @@ require "cloudinary/uploader"
 require "cloudinary/api"
 require "cloudinary/downloader"
 require "cloudinary/blob" 
+require "cloudinary/preloaded_file"
 require "cloudinary/static"
 require "cloudinary/missing"
 require "cloudinary/carrier_wave" if defined?(::CarrierWave)

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -3,7 +3,7 @@
 # Field value must be in the format:  "image/upload/v<version>/#<public_id>.<format>#<signature>"
 # Where signature is the cloduinary API signature on the public_id and version.
 module Cloudinary::CarrierWave
-  PRELOADED_CLOUDINARY_PATH = /^([^\/]+)\/upload\/v(\d+)\/([^\/]+)#([^\/]+)$/
+  PRELOADED_CLOUDINARY_PATH = Cloudinary::PreloadedFile::PRELOADED_CLOUDINARY_PATH
 
   def cache!(new_file)
     if new_file.is_a?(String) && new_file.match(PRELOADED_CLOUDINARY_PATH)
@@ -35,28 +35,21 @@ module Cloudinary::CarrierWave
     return @file.is_a?(PreloadedCloudinaryFile) ? @file.to_s : super
   end
   
-  class PreloadedCloudinaryFile
-    attr_reader :original_filename, :version, :public_id, :signature
+  class PreloadedCloudinaryFile < Cloudinary::PreloadedFile
     def initialize(file_info)
-      resource_type, @version, @original_filename, @signature = file_info.scan(PRELOADED_CLOUDINARY_PATH).first
-      raise "Cloudinary CarrierWave integration supports images only" if resource_type != "image"
-      @public_id = @original_filename[0..(@original_filename.rindex(".")-1)]
-      expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>public_id, :version=>version}, Cloudinary.config.api_secret)
-      if @signature != expected_signature
+      super
+      raise "Cloudinary CarrierWave integration only supports uploaded images" if resource_type != "image" || type != "upload"
+      if !valid?
         raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.cloudinary_signature_error", :public_id=>public_id, :default=>"Invalid signature for #{public_id}")
-      end      
-    end
-    
-    def identifier
-      "v#{version}/#{original_filename}"
-    end
-    
-    def to_s
-      "image/upload/v#{version}/#{original_filename}##{signature}"
-    end
+      end
+    end    
 
     def delete
       # Do nothing. This is a virtual file.
     end
-  end  
+    
+    def original_filename
+      self.filename
+    end
+  end
 end

data/lib/cloudinary/preloaded_file.rb

@@ -0,0 +1,23 @@
+class Cloudinary::PreloadedFile
+  PRELOADED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^\/]+)#([^\/]+)$/
+
+  attr_reader :filename, :version, :public_id, :signature, :resource_type, :type
+  def initialize(file_info)
+    @resource_type, @type, @version, @filename, @signature = file_info.scan(PRELOADED_CLOUDINARY_PATH).first    
+    @public_id = @resource_type == "image" ? @filename[0..(@filename.rindex(".")-1)] : @filename
+  end
+  
+  def valid?
+    expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>public_id, :version=>version}, Cloudinary.config.api_secret)
+    @signature == expected_signature
+  end
+  
+  def identifier
+    "v#{version}/#{filename}"
+  end
+  
+  def to_s
+    "#{resource_type}/#{type}/v#{version}/#{filename}##{signature}"
+  end
+  
+end

data/lib/cloudinary/utils.rb

@@ -21,11 +21,14 @@ class Cloudinary::Utils
     width = options[:width]
     height = options[:height]
     has_layer = !options[:overlay].blank? || !options[:underlay].blank?
-    
-    options.delete(:width) if width && (width.to_f < 1 || has_layer) 
-    options.delete(:height) if height && (height.to_f < 1 || has_layer)
-     
+         
     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"
+    options.delete(:width) if width && (width.to_f < 1 || no_html_sizes)
+    options.delete(:height) if height && (height.to_f < 1 || no_html_sizes)
+
     width=height=nil if crop.nil? && !has_layer
 
     background = options.delete(:background)
@@ -45,8 +48,6 @@ class Cloudinary::Utils
     effect = options.delete(:effect)
     effect = Array(effect).flatten.join(":") if effect.is_a?(Array) || effect.is_a?(Hash)
     
-    angle = build_array(options.delete(:angle)).join(".")
-
     params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle}
     { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, 
       :p=>:prefix, :l=>:overlay, :u=>:underlay, :f=>:fetch_format, :dn=>:density, :pg=>:page 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.33"
+  VERSION = "1.0.34"
 end

data/spec/utils_spec.rb

@@ -68,7 +68,25 @@ describe Cloudinary::Utils do
     options.should == {:width=>100, :height=>100}
     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
+    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=>:fit}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_fit,h_100,w_100/test" 
+  end
+
+  it "should not pass width and height to html in case angle was used" do
+    options = {:width=>100, :height=>100, :crop=>:scale, :angle=>:auto}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/a_auto,c_scale,h_100,w_100/test" 
+  end
+    
   it "should use x, y, radius, prefix, gravity and quality from options" do    
     options = {:x=>1, :y=>2, :radius=>3, :gravity=>:center, :quality=>0.4, :prefix=>"a"}
     result = Cloudinary::Utils.cloudinary_url("test", options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -91,6 +91,7 @@ files:
 - lib/cloudinary/helper.rb
 - lib/cloudinary/migrator.rb
 - lib/cloudinary/missing.rb
+- lib/cloudinary/preloaded_file.rb
 - lib/cloudinary/railtie.rb
 - lib/cloudinary/static.rb
 - lib/cloudinary/uploader.rb