cloudinary 1.0.49 → 1.0.50

data/lib/cloudinary/carrier_wave.rb

@@ -81,11 +81,19 @@ module Cloudinary::CarrierWave
     @public_id ||= Cloudinary::Utils.random_public_id
   end
   
-  def rename(to_public_id)
-    raise "rename cannot be used if the public_id method is overridden" if self.public_id
-    resource_type = Cloudinary::Utils.resource_type_for_format(self.filename || self.format)
-    from_public_id = self.my_public_id
+  def rename(to_public_id = nil)
+    to_public_id ||= self.public_id
+    if self.public_id && to_public_id != self.public_id 
+      raise CloudinaryException, "The public_id method was overridden and returns #{self.public_id} - can't rename to #{to_public_id}"
+    elsif to_public_id.nil?
+      raise CloudinaryException, "No to_public_id given"
+    end
+     
+    from_public_id = @stored_public_id || self.my_public_id
+    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'
       from_public_id = [from_public_id, self.format].join(".") 
       to_public_id = [to_public_id, self.format].join(".")
@@ -122,6 +130,11 @@ module Cloudinary::CarrierWave
     true
   end
   
+  # Rename preloaded uploads if public_id was overridden
+  def auto_rename_preloaded?
+    true
+  end
+  
   class CloudinaryFile
     attr_reader :identifier, :public_id, :filename, :format, :version, :storage_type, :resource_type
     def initialize(identifier, uploader)
@@ -129,7 +142,7 @@ module Cloudinary::CarrierWave
       @identifier = identifier
 
       if @identifier.include?("/")
-        version, @filename = @identifier.split("/")
+        version, @filename = @identifier.split("/", 2)
         @version = version[1..-1] # remove 'v' prefix
       else
         @filename = @identifier

data/lib/cloudinary/carrier_wave/storage.rb

@@ -4,8 +4,14 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     return if !uploader.enable_processing
     if uploader.is_main_uploader?
       case file
-      when Cloudinary::CarrierWave::PreloadedCloudinaryFile 
-        return store_cloudinary_version(file.version)
+      when Cloudinary::CarrierWave::PreloadedCloudinaryFile
+        if uploader.public_id && uploader.auto_rename_preloaded?
+          @stored_version = file.version
+          uploader.rename
+        else
+          store_cloudinary_version(file.version)
+        end 
+        return 
       when Cloudinary::CarrierWave::CloudinaryFile
         return nil # Nothing to do
       when Cloudinary::CarrierWave::RemoteFile
@@ -43,7 +49,7 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
   end
   
   def store_cloudinary_version(version)
-    name = "v#{version}/#{identifier.split("/").last}"
+    name = "v#{version}/#{identifier.split("/", 2).last}"
     model_class = uploader.model.class
     column = uploader.model.send(:_mounter, uploader.mounted_as).send(:serialization_column)
     if defined?(ActiveRecord::Base) && uploader.model.is_a?(ActiveRecord::Base)

data/lib/cloudinary/utils.rb

@@ -100,6 +100,7 @@ class Cloudinary::Utils
     private_cdn = config_option_consume(options, :private_cdn) 
     secure_distribution = config_option_consume(options, :secure_distribution) 
     cname = config_option_consume(options, :cname) 
+    shorten = config_option_consume(options, :shorten) 
     force_remote = options.delete(:force_remote)
     cdn_subdomain = config_option_consume(options, :cdn_subdomain) 
     
@@ -151,6 +152,11 @@ class Cloudinary::Utils
       prefix += "/#{cloud_name}" if !private_cdn || (secure && secure_distribution == Cloudinary::AKAMAI_SHARED_CDN)
     end
     
+    if shorten && resource_type.to_s == "image" && type.to_s == "upload"
+      resource_type = "iu"
+      type = nil
+    end
+    version ||= 1 if source.include?("/") and type != :fetch && !source.match(/^v[0-9]+/)
     source = prefix + "/" + [resource_type, 
      type, transformation, version ? "v#{version}" : nil,
      source].reject(&:blank?).join("/").gsub(%r(([^:])//), '\1/')

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.49"
+  VERSION = "1.0.50"
 end

data/spec/utils_spec.rb

@@ -390,4 +390,21 @@ describe Cloudinary::Utils do
     Cloudinary::Uploader.build_upload_params(:backup=>nil)[:backup].should be_nil
     Cloudinary::Uploader.build_upload_params({})[:backup].should be_nil
   end
+  
+  it "should add version if public_id contains /" do
+    result = Cloudinary::Utils.cloudinary_url("folder/test")
+    result.should == "http://res.cloudinary.com/test123/image/upload/v1/folder/test"         
+    result = Cloudinary::Utils.cloudinary_url("folder/test", :version=>123)
+    result.should == "http://res.cloudinary.com/test123/image/upload/v123/folder/test"         
+  end
+
+  it "should not add version if public_id contains version already" do
+    result = Cloudinary::Utils.cloudinary_url("v1234/test")
+    result.should == "http://res.cloudinary.com/test123/image/upload/v1234/test"         
+  end
+
+  it "should allow to shorted image/upload urls" do
+    result = Cloudinary::Utils.cloudinary_url("test", :shorten=>true)
+    result.should == "http://res.cloudinary.com/test123/iu/test"         
+  end
 end

metadata

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