cloudinary 1.0.13 → 1.0.14

data/lib/cloudinary.rb

@@ -1,12 +1,13 @@
 # Copyright Cloudinary
 require "ostruct"
+require "pathname"
+require "yaml"
 require "cloudinary/version"
 require "cloudinary/utils"
 require "cloudinary/uploader"
 require "cloudinary/downloader"
 require "cloudinary/blob" 
 require "cloudinary/static" if defined?(::ActiveSupport)
-require 'active_support' 
 require "cloudinary/missing"
 require "cloudinary/carrier_wave" if defined?(::CarrierWave)
 require "cloudinary/helper" if defined?(::ActionView::Base)
@@ -18,7 +19,7 @@ module Cloudinary
   
   def self.config(new_config=nil)
     first_time = @@config.nil?
-    @@config ||= OpenStruct.new((YAML.load_file(Rails.root.join("config").join("cloudinary.yml"))[Rails.env] rescue {}))
+    @@config ||= OpenStruct.new((YAML.load_file(config_dir.join("cloudinary.yml"))[config_env] rescue {}))
         
     # Heroku support
     if first_time && ENV["CLOUDINARY_CLOUD_NAME"]
@@ -39,6 +40,18 @@ module Cloudinary
   
   private
   
+  def self.config_env
+    return ENV["CLOUDINARY_ENV"] if ENV["CLOUDINARY_ENV"]
+    return Rails.env if defined?(Rails)
+    nil
+  end
+  
+  def self.config_dir
+    return Pathname.new(ENV["CLOUDINARY_CONFIG_DIR"]) if ENV["CLOUDINARY_CONFIG_DIR"] 
+    return Rails.root.join("config") if defined?(Rails)
+    Pathname.new("config")
+  end
+  
   def self.set_config(new_config)
     new_config.each{|k,v| @@config.send(:"#{k}=", v) if !v.nil?}
   end

data/lib/cloudinary/carrier_wave.rb

@@ -173,17 +173,21 @@ module Cloudinary::CarrierWave
     end
   end
 
+  def recreate_versions!
+    # Do nothing
+  end
+  
   def process!(new_file=nil)
     # Do nothing
   end
 
   def stored_filename
-    @stored_filename = model.read_uploader(mounted_as) if @stored_filename.blank?
-    @stored_filename
+    model.read_uploader(mounted_as)
   end  
 
   def my_filename
-    @my_filename ||= stored_filename.present? ? stored_filename : ("#{self.public_id}.#{self.format}")
+    return stored_filename if stored_filename.present?
+    @my_filename ||= "#{self.public_id}.#{self.format}"
   end
     
   def public_id

data/lib/cloudinary/static.rb

@@ -1,3 +1,4 @@
+require 'active_support/time'
 require 'find'
 class Cloudinary::Static
   IGNORE_FILES = [".svn", "CVS", "RCS", ".git", ".hg"]

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

data/lib/tasks/cloudinary.rake

@@ -1,6 +1,7 @@
 namespace :cloudinary do
   desc "Sync static resources with cloudinary"
   task :sync_static do
-    Cloudinary::Static.sync
+    delete_missing = ENV["DELETE_MISSING"] == 'true' || ENV["DELETE_MISSING"] == '1'
+    Cloudinary::Static.sync(:delete_missing=>delete_missing)
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-22 00:00:00 +03:00
+date: 2012-04-23 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency