cloudinary 1.0.50 → 1.0.51

data/lib/cloudinary.rb

@@ -3,6 +3,7 @@ require "ostruct"
 require "pathname"
 require "yaml"
 require "uri"
+require "erb"
 require "cloudinary/version"
 require "cloudinary/exceptions"
 require "cloudinary/missing"
@@ -37,7 +38,7 @@ module Cloudinary
   
   def self.config(new_config=nil)
     first_time = @@config.nil?
-    @@config ||= OpenStruct.new((YAML.load_file(config_dir.join("cloudinary.yml"))[config_env] rescue {}))
+    @@config ||= OpenStruct.new((YAML.load(ERB.new(IO.read(config_dir.join("cloudinary.yml"))).result)[config_env] rescue {}))
         
     # Heroku support
     if first_time && ENV["CLOUDINARY_CLOUD_NAME"]

data/lib/cloudinary/carrier_wave.rb

@@ -81,7 +81,7 @@ module Cloudinary::CarrierWave
     @public_id ||= Cloudinary::Utils.random_public_id
   end
   
-  def rename(to_public_id = nil)
+  def rename(to_public_id = nil, overwrite=false)
     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}"
@@ -98,8 +98,8 @@ module Cloudinary::CarrierWave
       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)
-    storage.store_cloudinary_version(@stored_version)
+    Cloudinary::Uploader.rename(from_public_id, to_public_id, :type=>self.storage_type, :resource_type=>resource_type, :overwrite=>overwrite)
+    storage.store_cloudinary_identifier(@stored_version, [@public_id, self.format].join("."))
   end  
 
   def recreate_versions!

data/lib/cloudinary/carrier_wave/storage.rb

@@ -7,9 +7,9 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       when Cloudinary::CarrierWave::PreloadedCloudinaryFile
         if uploader.public_id && uploader.auto_rename_preloaded?
           @stored_version = file.version
-          uploader.rename
+          uploader.rename(nil, true)
         else
-          store_cloudinary_version(file.version)
+          store_cloudinary_identifier(file.version, file.filename)
         end 
         return 
       when Cloudinary::CarrierWave::CloudinaryFile
@@ -39,7 +39,10 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])
       end
       
-      store_cloudinary_version(uploader.metadata["version"]) if uploader.metadata["version"]
+      if uploader.metadata["version"]
+        filename = [uploader.metadata["public_id"], uploader.metadata["format"]].reject(&:blank?).join(".") 
+        store_cloudinary_identifier(uploader.metadata["version"], filename)
+      end 
       # Will throw an exception on error
     else
       raise CloudinaryException, "nested versions are not allowed." if (uploader.class.version_names.length > 1)
@@ -48,8 +51,19 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     nil
   end
   
+  # @deprecated For backward compatibility
   def store_cloudinary_version(version)
-    name = "v#{version}/#{identifier.split("/", 2).last}"
+    if identifier.match(%r(^(v[0-9]+)/(.*)))
+      filename = $2
+    else 
+      filename = identifier
+    end
+    
+    store_cloudinary_identifier(version, filename)
+  end
+
+  def store_cloudinary_identifier(version, filename)
+    name = "v#{version}/#{filename}"
     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/uploader.rb

@@ -65,6 +65,7 @@ class Cloudinary::Uploader
       {
         :timestamp=>Time.now.to_i,
         :type=>options[:type],
+        :overwrite=>options[:overwrite],
         :from_public_id=>from_public_id,
         :to_public_id=>to_public_id,
       }

data/lib/cloudinary/version.rb

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

metadata

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