cloudinary 1.0.55 → 1.0.56

data/lib/cloudinary/carrier_wave.rb

@@ -35,19 +35,18 @@ module Cloudinary::CarrierWave
     if args.first && !args.first.is_a?(Hash)
       super
     else
+      options = args.extract_options!
       if self.blank?
         url = self.default_url
         return url if !url.blank?
         public_id = self.default_public_id
         return nil if public_id.nil?
       else
-        public_id = self.full_public_id
+        public_id = options.include?(:version) ? self.my_public_id : self.full_public_id
       end      
-      options = args.extract_options!
       options = self.transformation.merge(options) if self.version_name.present?
       
-      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))
+      Cloudinary::Utils.cloudinary_url(public_id, {:format=>self.format, :resource_type=>self.resource_type, :type=>self.storage_type}.merge(options))
     end
   end
 
@@ -94,12 +93,11 @@ module Cloudinary::CarrierWave
     return if from_public_id == to_public_id
     
     @public_id = @stored_public_id = to_public_id
-    resource_type = Cloudinary::Utils.resource_type_for_format(self.format)
-    if resource_type == 'raw'
+    if self.resource_type == 'raw'
       from_public_id = [from_public_id, self.format].join(".") 
       to_public_id = [to_public_id, self.format].join(".")
     end
-    Cloudinary::Uploader.rename(from_public_id, to_public_id, :type=>self.storage_type, :resource_type=>resource_type, :overwrite=>overwrite)
+    Cloudinary::Uploader.rename(from_public_id, to_public_id, :type=>self.storage_type, :resource_type=>self.resource_type, :overwrite=>overwrite)
     storage.store_cloudinary_identifier(@stored_version, [@public_id, self.format].join("."))
   end  
 
@@ -142,9 +140,9 @@ module Cloudinary::CarrierWave
       @uploader = uploader
       @identifier = identifier
 
-      if @identifier.include?("/")
-        version, @filename = @identifier.split("/", 2)
-        @version = version[1..-1] # remove 'v' prefix
+      if @identifier.match(%r(^v([0-9]+)/(.*)))
+        @version = $1
+        @filename = $2
       else
         @filename = @identifier
         @version = nil 
@@ -152,7 +150,7 @@ module Cloudinary::CarrierWave
 
       @storage_type = uploader.class.storage_type
       @resource_type = Cloudinary::Utils.resource_type_for_format(@filename)      
-      @public_id, @format = Cloudinary::CarrierWave.split_format(@filename)      
+      @public_id, @format = Cloudinary::PreloadedFile.split_format(@filename)      
     end
     
     def delete
@@ -170,15 +168,16 @@ module Cloudinary::CarrierWave
     end
 
   end
-
+  
+  # @deprecated 
   def self.split_format(identifier)
-    last_dot = identifier.rindex(".")
-    return [identifier, nil] if last_dot.nil?
-    public_id = identifier[0, last_dot]
-    format = identifier[last_dot+1..-1]
-    return [public_id, format]    
+    return Cloudinary::PreloadedFile.split_format(identifier)
   end
 
+  def resource_type
+    Cloudinary::Utils.resource_type_for_format(self.filename || self.format)
+  end
+  
   # For the given methods - versions should call the main uploader method
   def self.override_in_versions(base, *methods)
     methods.each do

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -38,7 +38,6 @@ module Cloudinary::CarrierWave
   class PreloadedCloudinaryFile < Cloudinary::PreloadedFile
     def initialize(file_info)
       super
-      raise CloudinaryException, "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

data/lib/cloudinary/carrier_wave/process.rb

@@ -140,7 +140,7 @@ module Cloudinary::CarrierWave
       format = uploader.format
     else
       # Try to auto-detect format
-      format = Cloudinary::CarrierWave.split_format(original_filename || "").last
+      format = Cloudinary::PreloadedFile.split_format(original_filename || "").last
       format ||= "png" # TODO Default format? 
     end
     format = format.to_s.downcase

data/lib/cloudinary/carrier_wave/storage.rb

@@ -5,6 +5,8 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     if uploader.is_main_uploader?
       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 
         if uploader.public_id && uploader.auto_rename_preloaded?
           @stored_version = file.version
           uploader.rename(nil, true)

data/lib/cloudinary/preloaded_file.rb

@@ -4,10 +4,11 @@ class Cloudinary::PreloadedFile
   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
+    @public_id, @format = Cloudinary::PreloadedFile.split_format(@filename)      
   end
   
   def valid?
+    public_id = @resource_type == "raw" ? self.filename : self.public_id
     expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>public_id, :version=>version}, Cloudinary.config.api_secret)
     @signature == expected_signature
   end
@@ -19,5 +20,13 @@ class Cloudinary::PreloadedFile
   def to_s
     "#{resource_type}/#{type}/v#{version}/#{filename}##{signature}"
   end
+
+  def self.split_format(identifier)
+    last_dot = identifier.rindex(".")
+    return [identifier, nil] if last_dot.nil?
+    public_id = identifier[0, last_dot]
+    format = identifier[last_dot+1..-1]
+    return [public_id, format]    
+  end
   
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.55"
+  VERSION = "1.0.56"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.55
+  version: 1.0.56
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client