cloudinary 1.0.10 → 1.0.11

data/lib/cloudinary.rb

@@ -16,22 +16,30 @@ require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
 module Cloudinary  
   @@config = nil
   
-  def self.config(new_config=nil)    
-    @@config = new_config if new_config
-    if block_given?
-      @@config = OpenStruct.new
-      yield(@@config)
-    end 
+  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 {}))
+        
     # Heroku support
-    if @@config.nil? && ENV["CLOUDINARY_CLOUD_NAME"]
-      @@config = OpenStruct.new(
+    if first_time && ENV["CLOUDINARY_CLOUD_NAME"]
+      set_config(
         "cloud_name" => ENV["CLOUDINARY_CLOUD_NAME"],
         "api_key" => ENV["CLOUDINARY_API_KEY"],
         "api_secret" => ENV["CLOUDINARY_API_SECRET"],
         "secure_distribution" => ENV["CLOUDINARY_SECURE_DISTRIBUTION"],
         "private_cdn" => ENV["CLOUDINARY_PRIVATE_CDN"].to_s == 'true'
       )
-    end    
-    @@config ||= OpenStruct.new((YAML.load_file(Rails.root.join("config").join("cloudinary.yml"))[Rails.env] rescue {}))
+    end
+
+    set_config(new_config) if new_config
+    yield(@@config) if block_given?
+
+    @@config    
+  end
+  
+  private
+  
+  def self.set_config(new_config)
+    new_config.each{|k,v| @@config.send(:"#{k}=", v) if !v.nil?}
   end
 end

data/lib/cloudinary/helper.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 module CloudinaryHelper
   include ActionView::Helpers::AssetTagHelper  
   alias :original_image_tag :image_tag
@@ -48,6 +49,10 @@ module CloudinaryHelper
     cl_image_tag(profile, {:type=>:facebook}.merge(options))
   end
 
+  def gravatar_profile_image_tag(email, options = {})    
+    cl_image_tag(Digest::MD5.hexdigest(email.strip.downcase), {:type=>:gravatar, :format=>:jpg}.merge(options))
+  end
+
   def twitter_profile_image_tag(profile, options = {})    
     cl_image_tag(profile, {:type=>:twitter}.merge(options))
   end

data/lib/cloudinary/utils.rb

@@ -72,9 +72,8 @@ class Cloudinary::Utils
         end
       end 
       @metadata ||= defined?(Cloudinary::Static) ? Cloudinary::Static.metadata : {}
-      if @metadata["images/#{source}"]
-        return source if !Cloudinary.config.static_image_support
-        type = :asset
+      if type == :asset && @metadata["images/#{source}"]
+        return source if !Cloudinary.config.static_image_support        
         original_source = source
         source = @metadata["images/#{source}"]["public_id"]
         source += File.extname(original_source) if !format
@@ -84,7 +83,7 @@ class Cloudinary::Utils
     end
     type ||= :upload
 
-    source = "#{source}.#{format}" if format && type != :fetch
+    source = "#{source}.#{format}" if !format.blank? && type != :fetch
     source = smart_escape(source) if [:fetch, :asset].include?(type)
     
     if cloud_name.start_with?("/")

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

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