cloudinary 1.0.14 → 1.0.15

data/lib/cloudinary.rb

@@ -7,7 +7,7 @@ require "cloudinary/utils"
 require "cloudinary/uploader"
 require "cloudinary/downloader"
 require "cloudinary/blob" 
-require "cloudinary/static" if defined?(::ActiveSupport)
+require "cloudinary/static"
 require "cloudinary/missing"
 require "cloudinary/carrier_wave" if defined?(::CarrierWave)
 require "cloudinary/helper" if defined?(::ActionView::Base)

data/lib/cloudinary/helper.rb

@@ -97,7 +97,7 @@ module CloudinaryHelper
       content = []
   
       params.each do |name, value|
-        content << hidden_field_tag(name, value)
+        content << hidden_field_tag(name, value, :id => nil) if value.present?
       end
   
       content << capture(&block)
@@ -171,7 +171,8 @@ end
 
 ActionView::Base.send :include, CloudinaryHelper
 
-if defined?(Sass::Rails)
+begin
+  require 'sass-rails'
   class Sass::Rails::Resolver
     alias :original_image_path :image_path
     def image_path(img)
@@ -182,5 +183,22 @@ if defined?(Sass::Rails)
       end      
     end      
   end  
+rescue LoadError
+  # no sass rails support. Ignore.
 end
 
+begin
+  require 'sass/script/functions'
+  module Sass::Script::Functions
+    def cloudinary_url(public_id, sass_options={})
+      options = {}
+      sass_options.each{|k, v| options[k.to_sym] = v.value}
+      url = Cloudinary::Utils.cloudinary_url(public_id.value, {:type=>:asset}.merge(options))
+      Sass::Script::String.new("url(#{url})")      
+    end
+    declare :cloudinary_url, [:string], :var_kwargs => true
+  end
+rescue LoadError
+  # no sass support. Ignore.
+end
+  

data/lib/cloudinary/static.rb

@@ -1,5 +1,6 @@
-require 'active_support/time'
 require 'find'
+require 'time'
+require 'set'
 class Cloudinary::Static
   IGNORE_FILES = [".svn", "CVS", "RCS", ".git", ".hg"]
   SUPPORTED_IMAGES = [/\.gif$/i, /\.jpe?g$/i, /\.png$/i, /\.bmp$/i, /\.ico$/i]
@@ -32,8 +33,6 @@ class Cloudinary::Static
     end
   end
   
-  UTC = ActiveSupport::TimeZone["UTC"]
-  
   def self.root
     defined?(Rails) ? Rails.root : Pathname.new(".")
   end
@@ -56,7 +55,7 @@ class Cloudinary::Static
         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), 
+          "upload_time" => Time.at(upload_time.to_i).getutc, 
           "version" => version,
           "width" => width.to_i,
           "height" => height.to_i
@@ -94,9 +93,9 @@ class Cloudinary::Static
         $stderr.print "#{public_path} - #{public_id} - Uploading\n"
         result = Cloudinary::Uploader.upload(Cloudinary::Blob.new(data, :original_filename=>path.to_s),
           options.merge(:format=>format, :public_id=>public_id, :type=>:asset)
-        )
+        ).merge("upload_time"=>Time.now)        
       end
-      metadata_lines << [public_path, public_id, Time.now.to_i, result["version"], result["width"], result["height"]].join("\t")+"\n"
+      metadata_lines << [public_path, public_id, result["upload_time"].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)}
     metadata.to_a.each do |path, info|

data/lib/cloudinary/uploader.rb

@@ -13,7 +13,7 @@ class Cloudinary::Uploader
               :type=>options[:type],
               :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
     if options[:eager]
-      params[:eager] = options[:eager].map do
+      params[:eager] = Cloudinary::Utils.build_array(options[:eager]).map do
         |transformation, format|
         transformation = transformation.clone
         format = transformation.delete(:format) || format

data/lib/cloudinary/utils.rb

@@ -28,7 +28,7 @@ class Cloudinary::Utils
     if base_transformations.any?{|base_transformation| base_transformation.is_a?(Hash)}
       base_transformations = base_transformations.map do
         |base_transformation|
-        base_transformation.is_a?(Hash) ? generate_transformation_string(base_transformation) : generate_transformation_string(:transformation=>base_transformation)
+        base_transformation.is_a?(Hash) ? generate_transformation_string(base_transformation.clone) : generate_transformation_string(:transformation=>base_transformation)
       end
     else      
       named_transformation = base_transformations.join(".")
@@ -50,6 +50,7 @@ class Cloudinary::Utils
 
   # Warning: options are being destructively updated!
   def self.cloudinary_url(source, options = {})
+    original_source = source
     transformation = self.generate_transformation_string(options)
 
     type = options.delete(:type)
@@ -64,22 +65,21 @@ class Cloudinary::Utils
     force_remote = options.delete(:force_remote)  
     
     if !force_remote    
-      return source if (type.nil? || type == :asset) && source.match(%r(^https?:/)i)
+      return original_source if (type.nil? || type == :asset) && source.match(%r(^https?:/)i)
       if source.start_with?("/") 
         if source.start_with?("/images/")
           source = source.sub(%r(/images/), '')
         else
-          return source
+          return original_source
         end
       end 
       @metadata ||= defined?(Cloudinary::Static) ? Cloudinary::Static.metadata : {}
       if type == :asset && @metadata["images/#{source}"]
-        return source if !Cloudinary.config.static_image_support        
-        original_source = source
+        return original_source if !Cloudinary.config.static_image_support        
         source = @metadata["images/#{source}"]["public_id"]
         source += File.extname(original_source) if !format
       elsif type == :asset
-        return source # requested asset, but no metadata - probably local file. return.
+        return original_source # requested asset, but no metadata - probably local file. return.
       end
     end
     type ||= :upload

data/lib/cloudinary/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors: 
 - Nadav Soferman