cloudinary 1.0.35 → 1.0.36

data/lib/cloudinary/carrier_wave.rb

@@ -6,13 +6,12 @@ require 'cloudinary/carrier_wave/preloaded'
 require 'cloudinary/carrier_wave/storage'
 
 module Cloudinary::CarrierWave
-  
+
   def self.included(base)
     base.storage Cloudinary::CarrierWave::Storage
     base.extend ClassMethods
-    base.send(:attr_accessor, :metadata)
+    base.class_attribute :storage_type, :metadata
     base.send(:attr_reader, :stored_version)
-        
     override_in_versions(base, :blank?, :full_public_id, :all_versions_processors)
   end  
     
@@ -31,7 +30,7 @@ module Cloudinary::CarrierWave
       self.original_filename = sanitize(@file.filename)
     end
   end  
-           
+
   def url(*args)
     if args.first && !args.first.is_a?(Hash)
       super
@@ -46,7 +45,13 @@ module Cloudinary::CarrierWave
       end      
       options = args.extract_options!
       options = self.transformation.merge(options) if self.version_name.present?
-      Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format}.merge(options))
+      
+      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
     end
   end
 
@@ -104,7 +109,7 @@ module Cloudinary::CarrierWave
   end
   
   class CloudinaryFile
-    attr_reader :identifier, :public_id, :filename, :format, :version
+    attr_reader :identifier, :public_id, :filename, :format, :version, :storage_type
     def initialize(identifier, uploader)
       @uploader = uploader
       @identifier = identifier
@@ -115,12 +120,17 @@ module Cloudinary::CarrierWave
         @filename = @identifier
         @version = nil 
       end
+      @storage_type = uploader.class.storage_type
       @public_id, @format = Cloudinary::CarrierWave.split_format(@filename)      
     end
     
     def delete
       Cloudinary::Uploader.destroy(self.public_id) if @uploader.delete_remote?        
     end
+    
+    def exists?
+      Cloudinary::Uploader.exists?(self.identifier, :type=>self.storage_type)
+    end
   end
 
   def self.split_format(identifier)

data/lib/cloudinary/carrier_wave/process.rb

@@ -1,8 +1,7 @@
 module Cloudinary::CarrierWave
   module ClassMethods
     def make_private
-      process :cloudinary_transformation=>{:type => :private}
-      process_all_versions :cloudinary_transformation=>{:type => :private}
+      self.storage_type = :private
     end
     
     def process_all_versions(*args)

data/lib/cloudinary/carrier_wave/storage.rb

@@ -1,4 +1,5 @@
 class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
+
   def store!(file)
     return if !uploader.enable_processing
     if uploader.is_main_uploader?
@@ -23,7 +24,9 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       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
+      params[:resource_type] ||= :auto
+
       uploader.metadata = Cloudinary::Uploader.upload(data, params)
       if uploader.metadata["error"]
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])

data/lib/cloudinary/uploader.rb

@@ -51,6 +51,15 @@ class Cloudinary::Uploader
     end              
   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)
+    end
+    RestClient::Request.execute(:method => :head, :url => cloudinary_url, :timeout=>5).code.to_s =~ /2\d{2}/
+  end
+
   def self.explicit(public_id, options={})
     call_api("explicit", options) do    
       {

data/lib/cloudinary/utils.rb

@@ -112,6 +112,7 @@ class Cloudinary::Utils
         return original_source # requested asset, but no metadata - probably local file. return.
       end
     end
+    
     type ||= :upload
 
     if source.match(%r(^https?:/)i)
@@ -177,7 +178,7 @@ 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, options.merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
+    url = Cloudinary::Utils.cloudinary_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
@@ -198,7 +199,8 @@ class Cloudinary::Utils
   end
   
   def self.random_public_id
-    (defined?(ActiveSupport::SecureRandom) ? ActiveSupport::SecureRandom : SecureRandom).base64(16).downcase.gsub(/[^a-z0-9]/, "")    
+    sr = defined?(ActiveSupport::SecureRandom) ? ActiveSupport::SecureRandom : SecureRandom
+    sr.base64(20).downcase.gsub(/[^a-z0-9]/, "").sub(/^[0-9]+/, '')[0,20]
   end
 
   def self.signed_preloaded_image(result)
@@ -229,4 +231,14 @@ class Cloudinary::Utils
       else [array]
     end
   end
+  
+  IMAGE_FORMATS = %w(bmp png tif tiff jpg jpeg gif pdf ico) 
+  
+  def self.supported_image_format?(format)
+    IMAGE_FORMATS.include?(format.to_s.downcase)
+  end
+  
+  def self.resource_type_for_format(format)
+    self.supported_image_format?(format) ? 'image' : 'raw'
+  end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.35"
+  VERSION = "1.0.36"
 end

metadata

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