cloudinary 1.0.31 → 1.0.32

data/lib/cloudinary/carrier_wave.rb

@@ -13,8 +13,12 @@ module Cloudinary::CarrierWave
     base.send(:attr_accessor, :metadata)
     base.send(:attr_reader, :stored_version)
         
-    override_in_versions(base, :blank?, :full_public_id)
+    override_in_versions(base, :blank?, :full_public_id, :all_versions_processors)
   end  
+    
+  def is_main_uploader?
+    self.class.version_names.blank?
+  end
   
   def retrieve_from_store!(identifier)
     if identifier.blank?

data/lib/cloudinary/carrier_wave/process.rb

@@ -1,5 +1,15 @@
 module Cloudinary::CarrierWave
   module ClassMethods
+    def make_private
+      process :cloudinary_transformation=>{:type => :private}
+      process_all_versions :cloudinary_transformation=>{:type => :private}
+    end
+    
+    def process_all_versions(*args)
+      @all_versions ||= Class.new(self)
+      @all_versions.process *args
+    end
+        
     def eager
       process :eager => true
     end
@@ -42,14 +52,14 @@ module Cloudinary::CarrierWave
   end
 
   def set_or_yell(hash, attr, value)
-    raise "conflicting transformation on #{attr} #{value}!=#{hash[attr]}" if hash[attr]
+    raise "conflicting transformation on #{attr} #{value}!=#{hash[attr]}" if hash[attr] && hash[attr] != value
     hash[attr] = value
   end
   
   def transformation
     return @transformation if @transformation
     @transformation = {}
-    self.class.processors.each do
+    self.all_processors.each do
       |name, args|
       case name
       when :convert # Do nothing. This is handled by format
@@ -98,18 +108,28 @@ module Cloudinary::CarrierWave
     @transformation     
   end
 
+  def all_versions_processors
+    all_versions = self.class.instance_variable_get('@all_versions')
+    
+    all_versions ? all_versions.processors : []
+  end
+
+  def all_processors    
+    (self.is_main_uploader? ? [] : all_versions_processors) + self.class.processors
+  end
+
   def eager
-    @eager ||= self.class.processors.any?{|processor| processor[0] == :eager}
+    @eager ||= self.all_processors.any?{|processor| processor[0] == :eager}
   end
 
   def tags
-    @tags ||= self.class.processors.select{|processor| processor[0] == :tags}.map(&:second).first
+    @tags ||= self.all_processors.select{|processor| processor[0] == :tags}.map(&:second).first
     raise "tags cannot be used in versions." if @tags.present? && self.version_name.present?
     @tags
   end
   
   def format
-    format_processor = self.class.processors.find{|processor| processor[0] == :convert}
+    format_processor = self.all_processors.find{|processor| processor[0] == :convert}
     if format_processor 
       # Explicit format is given
       return Array(format_processor[1]).first 

data/lib/cloudinary/carrier_wave/storage.rb

@@ -1,7 +1,7 @@
 class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
   def store!(file)
     return if !uploader.enable_processing
-    if uploader.class.version_names.blank?
+    if uploader.is_main_uploader?
       case file
       when Cloudinary::CarrierWave::PreloadedCloudinaryFile 
         return store_cloudinary_version(file.version)

data/lib/cloudinary/uploader.rb

@@ -58,7 +58,7 @@ class Cloudinary::Uploader
         :type=>options[:type],
         :public_id=> public_id,
         :callback=> options[:callback],
-        :eagar=>build_eager(options[:eager]),
+        :eager=>build_eager(options[:eager]),
       }
     end              
   end

data/lib/cloudinary/utils.rb

@@ -102,8 +102,11 @@ class Cloudinary::Utils
     end
     type ||= :upload
 
-    source = "#{source}.#{format}" if !format.blank? && type != :fetch
-    source = smart_escape(source) if [:fetch, :asset].include?(type)
+    if source.match(%r(^https?:/)i)
+      source = smart_escape(source)
+    elsif !format.blank? 
+      source = "#{source}.#{format}"
+    end
     
     if cloud_name.start_with?("/")
       prefix = "/res" + cloud_name

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.31"
+  VERSION = "1.0.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client