cloudinary 1.0.1 → 1.0.2

data/lib/cloudinary.rb

@@ -4,62 +4,13 @@ require "cloudinary/version"
 require "cloudinary/utils"
 require "cloudinary/uploader"
 require "cloudinary/downloader"
-require "cloudinary/migrator"  
 require "cloudinary/blob" 
+require "cloudinary/static" 
 require 'active_support' 
-if defined?(::CarrierWave)
-  require "cloudinary/carrier_wave"
-end  
-
-if defined?(::ActionView::Base)
-  require "cloudinary/helper"  
-end
-
-if !nil.respond_to?(:blank?)
-class Object
-  def blank?
-    respond_to?(:empty?) ? empty? : !self
-  end
-end
-
-class NilClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class FalseClass #:nodoc:
-  def blank?
-    true
-  end
-end
-
-class TrueClass #:nodoc:
-  def blank?
-    false
-  end
-end
-
-class Array #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class Hash #:nodoc:
-  alias_method :blank?, :empty?
-end
-
-class String #:nodoc:
-  def blank?
-    self !~ /\S/
-  end
-end
-
-class Numeric #:nodoc:
-  def blank?
-    false
-  end
-end  
-end
+require "cloudinary/missing"
+require "cloudinary/carrier_wave" if defined?(::CarrierWave)
+require "cloudinary/helper" if defined?(::ActionView::Base)
+require "cloudinary/railtie" if defined?(Rails)
 
 module Cloudinary  
   @@config = nil

data/lib/cloudinary/helper.rb

@@ -1,6 +1,10 @@
 # Copyright Cloudinary
 
-module CloudinaryHelper  
+module CloudinaryHelper
+  include ActionView::Helpers::AssetTagHelper  
+  alias :original_image_tag :image_tag
+  alias :original_image_path :image_path
+      
   # Examples
   # cl_image_tag "israel.png", :width=>100, :height=>100, :alt=>"hello" # W/H are not sent to cloudinary
   # cl_image_tag "israel.png", :width=>100, :height=>100, :alt=>"hello", :crop=>:fit # W/H are sent to cloudinary
@@ -9,8 +13,35 @@ module CloudinaryHelper
     source = cloudinary_url(source, options)
     options[:width] = options.delete(:html_width) if options.include?(:html_width)
     options[:height] = options.delete(:html_height) if options.include?(:html_height)
+    options[:size] = options.delete(:html_size) if options.include?(:html_size)
 
-    image_tag(source, options)
+    original_image_tag(source, options)
+  end
+
+  def cl_image_path(source, options = {})
+    options = options.clone
+    url = cloudinary_url(source, options)
+    original_image_path(url, options)    
+  end
+    
+  def image_tag(*args)
+    if Cloudinary.config.enhance_image_tag
+      cl_image_tag(*args)
+    else
+      original_image_tag(*args)
+    end
+  end
+
+  def image_path(*args)
+    if Cloudinary.config.enhance_image_tag
+      cl_image_path(*args)
+    else
+      original_image_path(*args)
+    end
+  end
+
+  def fetch_image_tag(profile, options = {})    
+    cl_image_tag(profile, {:type=>:fetch}.merge(options))
   end
   
   def facebook_profile_image_tag(profile, options = {})    
@@ -51,3 +82,17 @@ module CloudinaryHelper
 end
 
 ActionView::Base.send :include, CloudinaryHelper
+
+if defined?(Sass::Rails)
+  class Sass::Rails::Resolver
+    alias :original_image_path :image_path
+    def image_path(img)
+      if Cloudinary.config.enhance_image_tag
+        Cloudinary::Utils.cloudinary_url(img, :type=>:asset)
+      else
+        original_image_path(img)
+      end      
+    end      
+  end  
+end
+

data/lib/cloudinary/migrator.rb

@@ -37,6 +37,7 @@ class Cloudinary::Migrator
     @debug = options[:debug] || false
     @ignore_duplicates = options[:ignore_duplicates]
     @threads = [options[:threads] || 10, 100].min
+    @threads = 1 if RUBY_VERSION < "1.9"
     @extra_options = {:api_key=>options[:api_key], :api_secret=>options[:api_secret]}
     @delete_after_done = options[:delete_after_done] || options[:private_database]
     @max_processing = @threads * 10

data/lib/cloudinary/missing.rb

@@ -0,0 +1,45 @@
+if !nil.respond_to?(:blank?)
+  class Object
+    def blank?
+      respond_to?(:empty?) ? empty? : !self
+    end
+  end
+  
+  class NilClass #:nodoc:
+    def blank?
+      true
+    end
+  end
+  
+  class FalseClass #:nodoc:
+    def blank?
+      true
+    end
+  end
+  
+  class TrueClass #:nodoc:
+    def blank?
+      false
+    end
+  end
+  
+  class Array #:nodoc:
+    alias_method :blank?, :empty?
+  end
+  
+  class Hash #:nodoc:
+    alias_method :blank?, :empty?
+  end
+  
+  class String #:nodoc:
+    def blank?
+      self !~ /\S/
+    end
+  end
+  
+  class Numeric #:nodoc:
+    def blank?
+      false
+    end
+  end  
+end

data/lib/cloudinary/railtie.rb

@@ -0,0 +1,5 @@
+class Cloudinary::Railtie < Rails::Railtie
+  rake_tasks do
+    Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
+  end  
+end

data/lib/cloudinary/static.rb

@@ -0,0 +1,107 @@
+require 'find'
+class Cloudinary::Static
+  IGNORE_FILES = [".svn", "CVS", "RCS", ".git", ".hg", /^.htaccess/]
+  STATIC_IMAGE_DIRS = ["app/assets/images", "public/images"]
+  METADATA_FILE = ".cloudinary.static"
+  METADATA_TRASH_FILE = ".cloudinary.static.trash"
+  
+  def self.discover
+    ignore_files = Cloudinary.config.ignore_files || IGNORE_FILES 
+    relative_dirs = Cloudinary.config.statis_image_dirs || STATIC_IMAGE_DIRS
+    dirs = relative_dirs.map{|dir| Rails.root.join(dir)}.select(&:exist?)
+    dirs.each do
+      |dir|
+      dir.find do
+        |path|
+        file = path.basename.to_s
+        if IGNORE_FILES.any?{|pattern| pattern.is_a?(String) ? pattern == file : file.match(pattern)}
+          Find.prune
+          next
+        elsif path.directory?
+          next
+        else
+          relative_path = path.relative_path_from(Rails.root)
+          public_path = path.relative_path_from(dir.dirname)
+          yield(relative_path, public_path)
+        end
+      end
+    end
+  end
+  
+  UTC = ActiveSupport::TimeZone["UTC"]
+  
+  def self.metadata_file_path
+    Rails.root.join(METADATA_FILE)
+  end
+
+  def self.metadata_trash_file_path
+    Rails.root.join(METADATA_TRASH_FILE)
+  end
+  
+  def self.metadata(metadata_file = metadata_file_path, hash=true) 
+    metadata = []
+    if File.exist?(metadata_file)
+      IO.foreach(metadata_file) do
+        |line|
+        line.strip!
+        next if line.blank?
+        path, public_id, upload_time, version, width, height = line.split("\t")
+        metadata << [path, {
+          "public_id" => public_id, 
+          "upload_time" => UTC.at(upload_time.to_i), 
+          "version" => version,
+          "width" => width.to_i,
+          "height" => height.to_i
+        }]
+      end
+    end
+    hash ? Hash[*metadata.flatten] : metadata
+  end
+
+  def self.sync(options={})
+    options = options.clone
+    delete_missing = options.delete(:delete_missing)
+    metadata = self.metadata
+    found_paths = Set.new
+    found_public_ids = Set.new
+    metadata_lines = []
+    self.discover do
+      |path, public_path|
+      next if found_paths.include?(path)
+      found_paths << path
+      data = Rails.root.join(path).read(:mode=>"rb")
+      ext = path.extname
+      format = ext[1..-1]
+      md5 = Digest::MD5.hexdigest(data)
+      public_id = "#{public_path.basename(ext)}-#{md5}"
+      found_public_ids << public_id
+      current_metadata = metadata.delete(public_path.to_s)      
+      if current_metadata && current_metadata["public_id"] == public_id # Signature match
+        result = current_metadata
+      else
+        result = Cloudinary::Uploader.upload(Cloudinary::Blob.new(data, :original_filename=>path.to_s),
+          options.merge(:format=>format, :public_id=>public_id, :type=>:asset)
+        )
+      end
+      metadata_lines << [public_path, public_id, Time.now.to_i, result["version"], result["width"], result["height"]].join("\t")+"\n"
+    end
+    File.open(self.metadata_file_path, "w"){|f| f.print(metadata_lines.join)}
+    # Files no longer needed 
+    trash = metadata.to_a + self.metadata(metadata_trash_file_path, false).reject{|public_path, info| found_public_ids.include?(info["public_id"])} 
+    
+    if delete_missing
+      trash.each do
+        |path, info|
+        Cloudinary::Uploader.destroy(info["public_id"], options.merge(:type=>:asset))
+      end
+      FileUtils.rm_f(self.metadata_trash_file_path)
+    else
+      # Add current removed file to the trash file.
+      metadata_lines = trash.map do
+        |public_path, info|
+        [public_path, info["public_id"], info["upload_time"].to_i, info["version"], info["width"], info["height"]].join("\t")+"\n"
+      end
+      File.open(self.metadata_trash_file_path, "w"){|f| f.print(metadata_lines.join)}    
+    end
+  end
+end

data/lib/cloudinary/uploader.rb

@@ -9,7 +9,9 @@ class Cloudinary::Uploader
       params = {:timestamp=>Time.now.to_i,
                 :transformation => Cloudinary::Utils.generate_transformation_string(options),
                 :public_id=> options[:public_id],
+                :callback=> options[:callback],
                 :format=>options[:format],
+                :type=>options[:type],
                 :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}.reject{|k,v| v.blank?}    
       if options[:eager]
         params[:eager] = options[:eager].map do
@@ -27,6 +29,16 @@ class Cloudinary::Uploader
       [params, [:file]]
     end              
   end
+
+  def self.destroy(public_id, options={})
+    call_api("destroy", options) do    
+      {
+        :timestamp=>Time.now.to_i,
+        :type=>options[:type],
+        :public_id=> public_id
+      }
+    end              
+  end
     
   def self.generate_sprite(tag, options={})
     version_store = options.delete(:version_store)

data/lib/cloudinary/utils.rb

@@ -10,18 +10,22 @@ class Cloudinary::Utils
     height = options[:height]
     size = options.delete(:size)
     width, height = size.split("x") if size    
-    options.delete(:width) if width && width < 1 
-    options.delete(:height) if height && height < 1    
+    options.delete(:width) if width && width.to_f < 1 
+    options.delete(:height) if height && height.to_f < 1    
      
     crop = options.delete(:crop)
     width=height=nil if crop.nil?
+
+    x = options.delete(:x)
+    y = options.delete(:y)
+    radius = options.delete(:radius)
     
     gravity = options.delete(:gravity)
     quality = options.delete(:quality)
     named_transformation = build_array(options.delete(:transformation)).join(".")
     prefix = options.delete(:prefix)
 
-    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :q=>quality, :g=>gravity, :p=>prefix}
+    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :q=>quality, :g=>gravity, :p=>prefix, :x=>x, :y=>y, :radius=>radius}
     transformation = params.reject{|k,v| v.blank?}.map{|k,v| [k.to_s, v]}.sort_by(&:first).map{|k,v| "#{k}_#{v}"}.join(",")
     raw_transformation = options.delete(:raw_transformation)
     transformation = [transformation, raw_transformation].reject(&:blank?).join(",")
@@ -37,23 +41,37 @@ class Cloudinary::Utils
   def self.cloudinary_url(source, options = {})
     transformation = self.generate_transformation_string(options)
 
-    type = options.delete(:type) || :upload
+    type = options.delete(:type)
     resource_type = options.delete(:resource_type) || "image"
     version = options.delete(:version)
-
     format = options.delete(:format)
-    source = "#{source}.#{format}" if format
     
-    # Configuration options
-    # newsodrome.cloudinary.com, images.newsodrome.com, cloudinary.com/res/newsodrome, a9fj209daf.cloudfront.net
     cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise("Must supply cloud_name in tag or in configuration")
+    secure = options.delete(:secure) || Cloudinary.config.secure
+    private_cdn = options.delete(:private_cdn) || Cloudinary.config.private_cdn    
+    secure_distribution = options.delete(:secure_distribution) || Cloudinary.config.secure_distribution
+    
+    return source if :type.nil? && source.match(%r(^https?:/)i)
+    if source.start_with?("/") 
+      if source.start_with?("/images/")
+        source = source.sub(%r(/images/), '')
+      else
+        return source
+      end
+    end 
+    type ||= :upload
+    @metadata ||= Cloudinary::Static.metadata
+    if @metadata["images/#{source}"]
+      return source if !Cloudinary.config.static_image_support
+      type = :asset
+      original_source = source
+      source = @metadata["images/#{source}"]["public_id"]
+      source += File.extname(original_source) if !format
+    end
     
     if cloud_name.start_with?("/")
       prefix = "/res" + cloud_name
     else
-      secure = options.delete(:secure) || Cloudinary.config.secure
-      private_cdn = options.delete(:private_cdn) || Cloudinary.config.private_cdn    
-      secure_distribution = options.delete(:secure_distribution) || Cloudinary.config.secure_distribution
       if secure && secure_distribution.nil?
         if private_cdn
           raise "secure_distribution not defined"
@@ -70,9 +88,26 @@ class Cloudinary::Utils
       prefix += "/#{cloud_name}" if !private_cdn
     end
     
+    source = "#{source}.#{format}" if format && type != :fetch
+    source = smart_escape(source) if [:fetch, :asset].include?(type)
     source = prefix + "/" + [resource_type, 
      type, transformation, version ? "v#{version}" : nil,
-     source].reject(&:blank?).join("/").gsub("//", "/")
+     source].reject(&:blank?).join("/").gsub(%r(([^:])//), '\1/')
+  end
+
+  def self.asset_file_name(path)
+    data = Rails.root.join(path).read(:mode=>"rb")
+    ext = path.extname
+    md5 = Digest::MD5.hexdigest(data)
+    public_id = "#{path.basename(ext)}-#{md5}"
+    "#{public_id}#{ext}"    
+  end
+  
+  # Based on CGI::unescape. In addition does not escape / : 
+  def self.smart_escape(string)
+    string.gsub(/([^ a-zA-Z0-9_.-\/:]+)/) do
+      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+    end.tr(' ', '+')
   end
   
   def self.random_public_id

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/tasks/cloudinary.rake

@@ -0,0 +1,6 @@
+namespace :cloudinary do
+  desc "Sync static resources with cloudinary"
+  task :sync_static do
+    Cloudinary::Static.sync
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 +02:00
+date: 2012-04-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,13 @@ files:
 - lib/cloudinary/helper.rb
 - lib/cloudinary/helpers.rb
 - lib/cloudinary/migrator.rb
+- lib/cloudinary/missing.rb
+- lib/cloudinary/railtie.rb
+- lib/cloudinary/static.rb
 - lib/cloudinary/uploader.rb
 - lib/cloudinary/utils.rb
 - lib/cloudinary/version.rb
+- lib/tasks/cloudinary.rake
 has_rdoc: true
 homepage: http://cloudinary.com
 licenses: []