cloudinary 1.0.37 → 1.0.38

data/.gitignore

@@ -4,3 +4,5 @@ pkg
 assets/
 vendor/assets/
 Gemfile.lock
+.DS_Store
+*.tmproj

data/lib/cloudinary/api.rb

@@ -40,7 +40,7 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type = options[:type] || "upload"
     uri = "resources/#{resource_type}/#{type}/#{public_id}"
-    call_api(:get, uri, {}, options)      
+    call_api(:get, uri, only(options, :colors, :exif, :faces), options)      
   end
   
   def self.delete_resources(public_ids, options={})

data/lib/cloudinary/carrier_wave.rb

@@ -46,12 +46,8 @@ module Cloudinary::CarrierWave
       options = args.extract_options!
       options = self.transformation.merge(options) if self.version_name.present?
       
-      resource_type = Cloudinary::Utils.resource_type_for_format(self.format)
-      if self.class.storage_type == :authenticated
-        Cloudinary::Utils.signed_download_url(public_id, {:format=>self.format, :resource_type=>resource_type}.merge(options))        
-      else
-        Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format, :resource_type=>resource_type, :type=>self.class.storage_type}.merge(options))
-      end
+      resource_type = Cloudinary::Utils.resource_type_for_format(self.filename || self.format)
+      Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format, :resource_type=>resource_type, :type=>self.storage_type}.merge(options))
     end
   end
 
@@ -109,10 +105,11 @@ module Cloudinary::CarrierWave
   end
   
   class CloudinaryFile
-    attr_reader :identifier, :public_id, :filename, :format, :version, :storage_type
+    attr_reader :identifier, :public_id, :filename, :format, :version, :storage_type, :resource_type
     def initialize(identifier, uploader)
       @uploader = uploader
       @identifier = identifier
+
       if @identifier.include?("/")
         version, @filename = @identifier.split("/")
         @version = version[1..-1] # remove 'v' prefix
@@ -120,17 +117,25 @@ module Cloudinary::CarrierWave
         @filename = @identifier
         @version = nil 
       end
+
       @storage_type = uploader.class.storage_type
+      @resource_type = Cloudinary::Utils.resource_type_for_format(@filename)      
       @public_id, @format = Cloudinary::CarrierWave.split_format(@filename)      
     end
     
     def delete
-      Cloudinary::Uploader.destroy(self.public_id) if @uploader.delete_remote?        
+      Cloudinary::Uploader.destroy(self.public_id, :type=>self.storage_type, :resource_type=>self.resource_type) if @uploader.delete_remote?        
     end
     
     def exists?
-      Cloudinary::Uploader.exists?(self.identifier, :type=>self.storage_type)
+      Cloudinary::Uploader.exists?(self.identifier, :type=>self.storage_type, :resource_type=>self.resource_type)
     end
+    
+    def read(options={})
+      parameters={:type=>self.storage_type, :resource_type=>self.resource_type}.merge(options)
+      Cloudinary::Downloader.download(self.identifier, parameters)
+    end
+
   end
 
   def self.split_format(identifier)

data/lib/cloudinary/carrier_wave/storage.rb

@@ -25,6 +25,7 @@ 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
       params[:type]=uploader.class.storage_type
+
       params[:resource_type] ||= :auto
 
       uploader.metadata = Cloudinary::Uploader.upload(data, params)
@@ -58,5 +59,5 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     else
       raise "Only ActiveRecord and Mongoid are supported at the moment!"
     end
-  end  
+  end 
 end

data/lib/cloudinary/downloader.rb

@@ -3,19 +3,26 @@ class Cloudinary::Downloader
   
   def self.download(source, options={})
     options = options.clone
+
     if !source.match(/^https?:\/\//i)
-      source = Cloudinary::Utils.cloudinary_url(source, options)
+      source = Cloudinary::Utils.cloudinary_url(source, options)      
     end
-    
-    url = URI.parse(source) 
+
+
+    url = URI.parse(source)
     http = Net::HTTP.new(url.host, url.port)
-    req = Net::HTTP::Get.new(url.path)
+    req = Net::HTTP::Get.new(url.request_uri)
+
     if url.port == 443
       http.use_ssl=true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end  
-    res = http.start{|agent| agent.request(req)}
-    return res.body        
+    
+    res = http.start{|agent| 
+      agent.request(req)
+    }
+
+    return res.body
   end
     
 end

data/lib/cloudinary/migrator.rb

@@ -72,6 +72,7 @@ class Cloudinary::Migrator
         public_id
       )
     "
+
     if options[:reset_queue]
       @db.execute("delete from queue")
     end
@@ -262,7 +263,7 @@ class Cloudinary::Migrator
                 # Skip
               elsif data.match(/^https?:/)
                 url = data
-              else                
+              else
                 file = main.temporary_file(data, row["public_id"] || "cloudinaryfile") 
               end
             end

data/lib/cloudinary/uploader.rb

@@ -53,12 +53,13 @@ class Cloudinary::Uploader
   end
 
   def self.exists?(public_id, options={})
-    if options[:type] == :authenticated
-      cloudinary_url = Cloudinary::Utils.signed_download_url(public_id, options)
-    else
-      cloudinary_url = Cloudinary::Utils.cloudinary_url(public_id, options)
+    cloudinary_url = Cloudinary::Utils.cloudinary_url(public_id, options)
+    begin
+      RestClient::Request.execute(:method => :head, :url => cloudinary_url, :timeout=>5).code.to_s =~ /2\d{2}/
+    rescue RestClient::ResourceNotFound => e
+      return false
     end
-    RestClient::Request.execute(:method => :head, :url => cloudinary_url, :timeout=>5).code.to_s =~ /2\d{2}/
+    
   end
 
   def self.explicit(public_id, options={})

data/lib/cloudinary/utils.rb

@@ -48,9 +48,14 @@ class Cloudinary::Utils
     effect = options.delete(:effect)
     effect = Array(effect).flatten.join(":") if effect.is_a?(Array) || effect.is_a?(Hash)
     
-    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 
+    border = options.delete(:border)
+    if border.is_a?(Hash)
+      border = "#{border[:width] || 2}px_solid_#{(border[:color] || "black").sub(/^#/, 'rgb:')}"
+    end
+    
+    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border}
+    { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :cs=>:color_space,
+      :p=>:prefix, :l=>:overlay, :u=>:underlay, :f=>:fetch_format, :dn=>:density, :pg=>:page, :dl=>:delay
     }.each do
       |param, option|
       params[param] = options.delete(option)
@@ -72,7 +77,8 @@ class Cloudinary::Utils
   end
 
   # Warning: options are being destructively updated!
-  def self.cloudinary_url(source, options = {})
+  def self.unsigned_download_url(source, options = {})
+
     type = options.delete(:type)
 
     options[:fetch_format] ||= options.delete(:format) if type == :fetch 
@@ -81,7 +87,6 @@ class Cloudinary::Utils
     resource_type = options.delete(:resource_type) || "image"
     version = options.delete(:version)
     format = options.delete(:format)
-    
     cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise("Must supply cloud_name in tag or in configuration")    
     secure = options.delete(:secure)
     ssl_detected = options.delete(:ssl_detected)
@@ -94,6 +99,7 @@ class Cloudinary::Utils
     
     original_source = source
     return original_source if source.blank?
+    source = source.to_s
     if !force_remote    
       return original_source if (type.nil? || type == :asset) && source.match(%r(^https?:/)i)
       if source.start_with?("/") 
@@ -120,7 +126,7 @@ class Cloudinary::Utils
     elsif !format.blank? 
       source = "#{source}.#{format}"
     end
-    
+
     if cloud_name.start_with?("/")
       prefix = "/res" + cloud_name
     else
@@ -178,11 +184,20 @@ class Cloudinary::Utils
     authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise("Must supply authenticated_distribution")
     @signers ||= Hash.new{|h,k| path, id = k; h[k] = AwsCfSigner.new(path, id)}
     signer = @signers[[aws_private_key_path, aws_key_pair_id]]
-    url = Cloudinary::Utils.cloudinary_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
+    url = Cloudinary::Utils.unsigned_download_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
     expires_at = options[:expires_at] || (Time.now+3600)
     signer.sign(url, :ending => expires_at)
   end
   
+  def self.cloudinary_url(public_id, options = {})
+    if options[:type].to_s == 'authenticated'
+      result = signed_download_url(public_id, options)
+    else
+      result = unsigned_download_url(public_id, options)
+    end
+    return result
+  end
+
   def self.asset_file_name(path)
     data = Rails.root.join(path).read(:mode=>"rb")
     ext = path.extname
@@ -232,10 +247,12 @@ class Cloudinary::Utils
     end
   end
   
-  IMAGE_FORMATS = %w(bmp png tif tiff jpg jpeg gif pdf ico) 
+  IMAGE_FORMATS = %w(bmp png tif tiff jpg jpeg gif pdf ico eps) 
   
   def self.supported_image_format?(format)
-    IMAGE_FORMATS.include?(format.to_s.downcase)
+    format = format.to_s.downcase
+    extension = format =~ /\./ ? format.split('.').last : format
+    IMAGE_FORMATS.include?(extension)
   end
   
   def self.resource_type_for_format(format)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.37"
+  VERSION = "1.0.38"
 end

data/spec/utils_spec.rb

@@ -310,4 +310,18 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test" 
   end
   
+  it "should support border" do
+    options = {"border"=>{:width=>5}}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_black/test"     
+    options = {"border"=>{:width=>5, :color=>"#ffaabbdd"}}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/bo_5px_solid_rgb:ffaabbdd/test"     
+    options = {"border"=>"1px_solid_blue"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/bo_1px_solid_blue/test"     
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.37
+  version: 1.0.38
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client