cloudinary 1.0.72 → 1.0.73

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmFlNDk5YjhhMmM0MmE0YTFhM2Y1MDVkMjAyOGYyMDc5ZDhmZWM4OA==
+  data.tar.gz: !binary |-
+    OTNlOTg2MTRkNzVkNTc5M2FiNWQwMmU0NTQyMDc4Yzc0OTQ0NjE3MQ==
+SHA512:
+  metadata.gz: !binary |-
+    NjdlMTRkOWNiNDQ2ZWE5NTJkZDc0ZmQwMTE0MGIyMjcxZTAzMTNjYjA5Mjhl
+    Mzk1NTdmNzI0ODg1OGM5YzUzNzNhOThiYTQ5ZDNjYmRlZWQwZTQwYTlkMzE0
+    YTRhMmI0MDFlMzc2NjI3OWQ5ZWVkMTlkZjRiZWM3ZDNhNTAwZDM=
+  data.tar.gz: !binary |-
+    ZmEwZGU0NzU3MTg2MWM4MWEwMDlmNTFmZTUxNDMzOWRhNTkxN2Q1YTE0YzNj
+    YTAxYzBiNDA2ZjQ4OTVkYjY1NTViNWE1YWZjYzM0N2NhMWQyZWEwZGUwMDY1
+    NGVkNjMyNTFhNWQ3ZDFkYjg2M2ZkNzJlNWMzNTk0MzM1Yzk0Yjg=

data/CHANGELOG

@@ -1,3 +1,13 @@
+= Version 1.0.73 - 2014-06-30
+  * Support dpr transformation parameter.
+  * Support automatic dpr (for HiDPI) and automatic width (for responsive).
+  * Accept timestamp parameter in upload method options.
+  * Support pHash info in admin API.
+  * Support the multiple upload flag directly in cl_image_upload_tag.
+  * 'secure' configuration parameter from environment variable.
+  * Make api_key and api_secret optional in unsigned upload.
+  * Support the case Rails is defined but Rails.root isn't.
+
 = Version 1.0.72 - 2014-04-15
   * Fixing broken sign_request.
 

data/cloudinary.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency "rest-client"
   s.add_dependency "aws_cf_signer"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "actionpack"
 end

data/lib/cloudinary.rb

@@ -50,7 +50,8 @@ module Cloudinary
         "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'
+        "private_cdn" => ENV["CLOUDINARY_PRIVATE_CDN"].to_s == 'true',
+        "secure" => ENV["CLOUDINARY_SECURE"].to_s == 'true'
       )
     elsif first_time && ENV["CLOUDINARY_URL"]
       config_from_url(ENV["CLOUDINARY_URL"])

data/lib/cloudinary/api.rb

@@ -62,7 +62,7 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type = options[:type] || "upload"
     uri = "resources/#{resource_type}/#{type}/#{public_id}"
-    call_api(:get, uri, only(options, :colors, :exif, :faces, :image_metadata, :pages, :max_results), options)      
+    call_api(:get, uri, only(options, :colors, :exif, :faces, :image_metadata, :pages, :phash, :max_results), options)      
   end
   
   def self.update(public_id, options={})

data/lib/cloudinary/helper.rb

@@ -1,8 +1,10 @@
 require 'digest/md5'
 module CloudinaryHelper
+  CL_BLANK = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
+
   # Stand-in for Rails image_tag helper that accepts various options for transformations.
   #
-  # source:: the public ID, possibly with a file type extension.  If there is no extension, the 
+  # source:: the public ID, possibly with a file type extension.  If there is no extension, the
   #          :format option is expected to indicate what the extension is.  This value can contain
   #          the version, or not.
   # options:: Options you would normally pass to image_tag as well as Cloudinary-specific options
@@ -29,17 +31,33 @@ module CloudinaryHelper
     options[:height] = options.delete(:html_height) if options.include?(:html_height)
     options[:size] = options.delete(:html_size) if options.include?(:html_size)
     options[:border] = options.delete(:html_border) if options.include?(:html_border)
-
-    image_tag_without_cloudinary(source, options)
+    responsive_placeholder = Cloudinary::Utils.config_option_consume(options, :responsive_placeholder)
+    hidpi = options.delete(:hidpi)
+    responsive = options.delete(:responsive)
+    if hidpi || responsive
+      options["data-src"] = source      
+      extra_class = responsive ? "cld-responsive" : "cld-hidpi"
+      options[:class] = [options[:class], extra_class].compact.join(" ")
+      source = responsive_placeholder
+    end
+    if source
+      image_tag_without_cloudinary(source, options)
+    else
+      content_tag 'img', nil, options
+    end
   end
 
+  def cl_blank
+    CL_BLANK
+  end
+  
   # Works similarly to cl_image_tag, however just generates the URL of the image
   def cl_image_path(source, options = {})
     options = options.clone
     url = cloudinary_url_internal(source, options)
-    image_path_without_cloudinary(url)    
+    image_path_without_cloudinary(url)
   end
-    
+
   def image_tag_with_cloudinary(*args)
     source, options = args
     cl_image_tag(source, {:type=>:asset}.merge(options || {}))
@@ -50,61 +68,61 @@ module CloudinaryHelper
     cl_image_path(source, {:type=>:asset}.merge(options || {}))
   end
 
-  def fetch_image_tag(profile, options = {})    
+  def fetch_image_tag(profile, options = {})
     cl_image_tag(profile, {:type=>:fetch}.merge(options))
   end
-  
-  def facebook_profile_image_tag(profile, options = {})    
+
+  def facebook_profile_image_tag(profile, options = {})
     cl_image_tag(profile, {:type=>:facebook}.merge(options))
   end
-  
-  def facebook_profile_image_path(profile, options = {})    
+
+  def facebook_profile_image_path(profile, options = {})
     cl_image_path(profile, {:type=>:facebook}.merge(options))
   end
 
-  def gravatar_profile_image_tag(email, options = {})    
+  def gravatar_profile_image_tag(email, options = {})
     cl_image_tag(Digest::MD5.hexdigest(email.strip.downcase), {:type=>:gravatar, :format=>:jpg}.merge(options))
   end
-  
-  def gravatar_profile_image_path(email, options = {})    
+
+  def gravatar_profile_image_path(email, options = {})
     cl_image_path(Digest::MD5.hexdigest(email.strip.downcase), {:type=>:gravatar, :format=>:jpg}.merge(options))
   end
 
-  def twitter_profile_image_tag(profile, options = {})    
+  def twitter_profile_image_tag(profile, options = {})
     cl_image_tag(profile, {:type=>:twitter}.merge(options))
   end
-  
-  def twitter_profile_image_path(profile, options = {})    
+
+  def twitter_profile_image_path(profile, options = {})
     cl_image_path(profile, {:type=>:twitter}.merge(options))
   end
 
-  def twitter_name_profile_image_tag(profile, options = {})    
+  def twitter_name_profile_image_tag(profile, options = {})
     cl_image_tag(profile, {:type=>:twitter_name}.merge(options))
   end
-  
-  def twitter_name_profile_image_path(profile, options = {})    
+
+  def twitter_name_profile_image_path(profile, options = {})
     cl_image_path(profile, {:type=>:twitter_name}.merge(options))
   end
-  
-  def gplus_profile_image_tag(profile, options = {})    
+
+  def gplus_profile_image_tag(profile, options = {})
     cl_image_tag(profile, {:type=>:gplus}.merge(options))
   end
-  
-  def gplus_profile_image_path(profile, options = {})    
+
+  def gplus_profile_image_path(profile, options = {})
     cl_image_path(profile, {:type=>:gplus}.merge(options))
   end
 
   def cl_sprite_url(source, options = {})
     options = options.clone
-    
+
     version_store = options.delete(:version_store)
     if options[:version].blank? && (version_store == :file) && defined?(Rails) && defined?(Rails.root)
       file_name = "#{Rails.root}/tmp/cloudinary/cloudinary_sprite_#{source.sub(/\..*/, '')}.version"
       if File.exists?(file_name)
-        options[:version] = File.read(file_name).chomp        
+        options[:version] = File.read(file_name).chomp
       end
-    end  
-    
+    end
+
     options[:format] = "css" unless source.ends_with?(".css")
     cloudinary_url_internal(source, options.merge(:type=>:sprite))
   end
@@ -118,23 +136,23 @@ module CloudinaryHelper
     form_options = options.delete(:form) || {}
     form_options[:method] = :post
     form_options[:multipart] = true
-     
-    params = Cloudinary::Uploader.build_upload_params(options.merge(:callback=>callback_url))  
-    params[:signature] = Cloudinary::Utils.api_sign_request(params, Cloudinary.config.api_secret)  
+
+    params = Cloudinary::Uploader.build_upload_params(options.merge(:callback=>callback_url))
+    params[:signature] = Cloudinary::Utils.api_sign_request(params, Cloudinary.config.api_secret)
     params[:api_key] = Cloudinary.config.api_key
-  
-    api_url = Cloudinary::Utils.cloudinary_api_url("upload", 
+
+    api_url = Cloudinary::Utils.cloudinary_api_url("upload",
                 {:resource_type => options.delete(:resource_type), :upload_prefix => options.delete(:upload_prefix)})
 
     form_tag(api_url, form_options) do
       content = []
-  
+
       params.each do |name, value|
         content << hidden_field_tag(name, value, :id => nil) if value.present?
       end
-  
+
       content << capture(&block)
-  
+
       content.join("\n").html_safe
     end
   end
@@ -143,29 +161,29 @@ module CloudinaryHelper
   def cloudinary_js_config
     params = {}
     CLOUDINARY_JS_CONFIG_PARAMS.each do
-      |param| 
+      |param|
       value = Cloudinary.config.send(param)
       params[param] = value if !value.nil?
-    end    
-    content_tag("script", "$.cloudinary.config(#{params.to_json});".html_safe, :type=>"text/javascript")      
+    end
+    content_tag("script", "$.cloudinary.config(#{params.to_json});".html_safe, :type=>"text/javascript")
   end
 
   def cloudinary_url(source, options = {})
     cloudinary_url_internal(source, options.clone)
   end
-  
+
   def cl_image_upload(object_name, method, options={})
     cl_image_upload_tag("#{object_name}[#{method}]", options)
   end
-  
+
   def cl_unsigned_image_upload(object_name, method, upload_preset, options={})
     cl_unsigned_image_upload_tag("#{object_name}[#{method}]", upload_preset, options)
   end
-  
+
   def cl_upload_url(options={})
     Cloudinary::Utils.cloudinary_api_url("upload", {:resource_type=>:auto}.merge(options))
   end
-  
+
   def cl_upload_tag_params(options={})
     cloudinary_params = Cloudinary::Uploader.build_upload_params(options)
     cloudinary_params[:callback] = build_callback_url(options)
@@ -175,23 +193,27 @@ module CloudinaryHelper
       return Cloudinary::Utils.sign_request(cloudinary_params, options).to_json
     end
   end
-  
+
   def cl_image_upload_tag(field, options={})
-    html_options = options.delete(:html) || {}         
+    html_options = options.delete(:html) || {}
+    if options.delete(:multiple)
+      html_options[:multiple] = true
+      field = "#{ field }[]" unless field.to_s[-2..-1] == "[]"
+    end
 
-    tag_options = html_options.merge(:type=>"file", :name=>"file", 
+    tag_options = html_options.merge(:type=>"file", :name=>"file",
       :"data-url"=>cl_upload_url(options),
       :"data-form-data"=>cl_upload_tag_params(options),
       :"data-cloudinary-field"=>field,
-      :"class" => [html_options[:class], "cloudinary-fileupload"].flatten.compact 
+      :"class" => [html_options[:class], "cloudinary-fileupload"].flatten.compact
     ).reject{|k,v| v.blank?}
     content_tag("input", nil, tag_options)
   end
-  
+
   def cl_unsigned_image_upload_tag(field, upload_preset, options={})
     cl_image_upload_tag(field, options.merge(:unsigned => true, :upload_preset => upload_preset))
   end
-  
+
   def cl_private_download_url(public_id, format, options = {})
     Cloudinary::Utils.private_download_url(public_id, format, options)
   end
@@ -203,7 +225,7 @@ module CloudinaryHelper
   def cl_signed_download_url(public_id, options = {})
     Cloudinary::Utils.signed_download_url(public_id, options)
   end
-  
+
   def self.included(base)
     ActionView::Helpers::FormBuilder.send(:include, Cloudinary::FormBuilder)
     base.class_eval do
@@ -219,22 +241,22 @@ module CloudinaryHelper
       end
     end
   end
-  
+
   private
   def cloudinary_url_internal(source, options = {})
     options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
-    if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)      
+    if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)
       if source.version_name.present?
-        options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation]) 
-      end         
-      options.reverse_merge!(      
+        options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation])
+      end
+      options.reverse_merge!(
         :resource_type => Cloudinary::Utils.resource_type_for_format(source.filename || source.format),
         :type => source.storage_type,
         :format => source.format)
-      source = source.full_public_id      
+      source = source.full_public_id
     end
     Cloudinary::Utils.cloudinary_url(source, options)
-  end  
+  end
 
   def build_callback_url(options)
     callback_path = options.delete(:callback_cors) || Cloudinary.config.callback_cors || "/cloudinary_cors.html"
@@ -248,7 +270,7 @@ module CloudinaryHelper
       callback_url << callback_path
     end
     callback_url
-  end  
+  end
 end
 
 module Cloudinary::FormBuilder
@@ -263,14 +285,14 @@ end
 if defined? ActionView::Helpers::AssetUrlHelper
   module ActionView::Helpers::AssetUrlHelper
     alias :original_path_to_asset :path_to_asset
-  
+
     def path_to_asset(source, options={})
       options ||= {}
       if Cloudinary.config.enhance_image_tag && options[:type] == :image
         source = Cloudinary::Utils.cloudinary_url(source, options.merge(:type=>:asset))
       end
       original_path_to_asset(source, options)
-    end    
+    end
   end
 end
 
@@ -289,10 +311,10 @@ begin
           original_image_path(Cloudinary::Utils.cloudinary_url(img, :type=>:asset))
         else
           original_image_path(img)
-        end      
-      end      
+        end
+      end
     end
-  end  
+  end
 rescue LoadError
   # no sass rails support. Ignore.
 end
@@ -305,11 +327,11 @@ begin
       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})")      
+      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

@@ -34,7 +34,7 @@ class Cloudinary::Static
   end
   
   def self.root
-    defined?(Rails) ? Rails.root : Pathname.new(".")
+    (defined?(Rails) && Rails.root) || Pathname.new(".")
   end
   
   def self.metadata_file_path

data/lib/cloudinary/uploader.rb

@@ -19,10 +19,10 @@ class Cloudinary::Uploader
     options = options.clone
     options.keys.each{|key| options[key.to_sym] = options.delete(key) if key.is_a?(String)}
     
-    params = {:timestamp=>Time.now.to_i,
+    params = {:timestamp=>(options[:timestamp] || Time.now.to_i),
               :transformation => Cloudinary::Utils.generate_transformation_string(options.clone),
-              :public_id=> options[:public_id],
-              :callback=> options[:callback],
+              :public_id=>options[:public_id],
+              :callback=>options[:callback],
               :format=>options[:format],
               :type=>options[:type],
               :backup=>Cloudinary::Utils.as_safe_bool(options[:backup]),
@@ -108,7 +108,7 @@ class Cloudinary::Uploader
   def self.upload_large_part(file, options={})
     call_api("upload_large", options.merge(:resource_type=>:raw)) do    
       params = {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=>options[:public_id],
         :backup=>options[:backup],
@@ -128,7 +128,7 @@ class Cloudinary::Uploader
   def self.destroy(public_id, options={})
     call_api("destroy", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=> public_id,
         :invalidate=>options[:invalidate],
@@ -139,7 +139,7 @@ class Cloudinary::Uploader
   def self.rename(from_public_id, to_public_id, options={})
     call_api("rename", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :overwrite=>options[:overwrite],
         :from_public_id=>from_public_id,
@@ -161,7 +161,7 @@ class Cloudinary::Uploader
   def self.explicit(public_id, options={})
     call_api("explicit", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=> public_id,
         :callback=> options[:callback],
@@ -187,7 +187,7 @@ class Cloudinary::Uploader
     
     result = call_api("sprite", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :async=>options[:async],
         :notification_url=>options[:notification_url],
@@ -207,7 +207,7 @@ class Cloudinary::Uploader
   def self.multi(tag, options={})
     call_api("multi", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :format=>options[:format],
         :async=>options[:async],
@@ -220,7 +220,7 @@ class Cloudinary::Uploader
   def self.explode(public_id, options={})    
     call_api("explode", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :public_id=>public_id,
         :type=>options[:type],
         :format=>options[:format],
@@ -250,7 +250,7 @@ class Cloudinary::Uploader
   def self.call_tags_api(tag, command, public_ids = [], options = {})
     return call_api("tags", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :public_ids => Cloudinary::Utils.build_array(public_ids),
         :command => command,
@@ -262,13 +262,13 @@ class Cloudinary::Uploader
   def self.call_api(action, options)
     options = options.clone
     return_error = options.delete(:return_error)
-    api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
-    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
 
     params, non_signable = yield
     non_signable ||= []
     
     unless options[:unsigned]
+      api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
+      api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
       params[:signature] = Cloudinary::Utils.api_sign_request(params.reject{|k,v| non_signable.include?(k)}, api_secret)
       params[:api_key] = api_key
     end

data/lib/cloudinary/utils.rb

@@ -7,6 +7,7 @@ require 'aws_cf_signer'
 class Cloudinary::Utils
   # @deprecated Use Cloudinary::SHARED_CDN
   SHARED_CDN = Cloudinary::SHARED_CDN  
+  DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {:width => :auto, :crop => :limit}
   
   # Warning: options are being destructively updated!
   def self.generate_transformation_string(options={})
@@ -18,9 +19,11 @@ class Cloudinary::Utils
       options[key.to_sym] = options.delete(key) if key.is_a?(String)
     end
     
+    responsive_width = config_option_consume(options, :responsive_width) 
     size = options.delete(:size)
     options[:width], options[:height] = size.split("x") if size    
     width = options[:width]
+    width = width.to_s if width.is_a?(Symbol)
     height = options[:height]
     has_layer = !options[:overlay].blank? || !options[:underlay].blank?
          
@@ -28,10 +31,10 @@ class Cloudinary::Utils
     angle = build_array(options.delete(:angle)).join(".")
 
     no_html_sizes = has_layer || !angle.blank? || crop.to_s == "fit" || crop.to_s == "limit" || crop.to_s == "lfill"
-    options.delete(:width) if width && (width.to_f < 1 || no_html_sizes)
-    options.delete(:height) if height && (height.to_f < 1 || no_html_sizes)
+    options.delete(:width) if width && (width.to_f < 1 || no_html_sizes || width == "auto" || responsive_width)
+    options.delete(:height) if height && (height.to_f < 1 || no_html_sizes || responsive_width)
 
-    width=height=nil if crop.nil? && !has_layer
+    width=height=nil if crop.nil? && !has_layer && width != "auto"
 
     background = options.delete(:background)
     background = background.sub(/^#/, 'rgb:') if background
@@ -61,8 +64,9 @@ class Cloudinary::Utils
       border = nil
     end
     flags = build_array(options.delete(:flags)).join(".")
+    dpr = config_option_consume(options, :dpr)
     
-    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border, :fl=>flags, :co=>color}
+    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border, :fl=>flags, :co=>color, :dpr=>dpr}
     { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :cs=>:color_space, :o=>:opacity,
       :p=>:prefix, :l=>:overlay, :u=>:underlay, :f=>:fetch_format, :dn=>:density, :pg=>:page, :dl=>:delay
     }.each do
@@ -73,7 +77,20 @@ class Cloudinary::Utils
     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(",")
-    (base_transformations << transformation).reject(&:blank?).join("/")    
+    transformations = base_transformations << transformation
+    if responsive_width
+      responsive_width_transformation = Cloudinary.config.responsive_width_transformation || DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION
+      transformations << generate_transformation_string(responsive_width_transformation.clone)
+    end
+
+    if width.to_s == "auto" || responsive_width
+      options[:responsive] = true
+    end
+    if dpr.to_s == "auto"
+      options[:hidpi] = true
+    end
+
+    transformations.reject(&:blank?).join("/")    
   end
   
   def self.api_string_to_sign(params_to_sign)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.72"
+  VERSION = "1.0.73"
 end

data/spec/api_spec.rb

@@ -5,11 +5,12 @@ describe Cloudinary::Api do
   break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
 
   before(:all) do
+    @timestamp_tag = "api_test_tag_#{Time.now.to_i}"
     @api = Cloudinary::Api
     Cloudinary::Uploader.destroy("api_test")
     Cloudinary::Uploader.destroy("api_test2")
-    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test", :tags=>"api_test_tag", :context => "key=value", :eager=>[:width=>100,:crop=>:scale])
-    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test2", :tags=>"api_test_tag", :context => "key=value", :eager=>[:width=>100,:crop=>:scale])
+    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test", :tags=> ["api_test_tag", @timestamp_tag], :context => "key=value", :eager=>[:width=>100,:crop=>:scale])
+    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test2", :tags=> ["api_test_tag", @timestamp_tag], :context => "key=value", :eager=>[:width=>100,:crop=>:scale])
     @api.delete_transformation("api_test_transformation") rescue nil
     @api.delete_transformation("api_test_transformation2") rescue nil
     @api.delete_transformation("api_test_transformation3") rescue nil
@@ -44,20 +45,20 @@ describe Cloudinary::Api do
   it "should allow listing resources by type" do
     resource = @api.resources(:type=>"upload", :tags=>true)["resources"].find{|resource| resource["public_id"] == "api_test"}
     resource.should_not be_blank
-    resource["tags"].should == ["api_test_tag"]
+    resource["tags"].should == ["api_test_tag", @timestamp_tag]
   end
 
   it "should allow listing resources by prefix" do
     resources = @api.resources(:type=>"upload", :prefix=>"api_test", :tags => true, :context => true)["resources"]
     resources.map{|resource| resource["public_id"]}.should include("api_test", "api_test2")
-    resources.map{|resource| resource["tags"]}.should include(["api_test_tag"])
+    resources.map{|resource| resource["tags"]}.should include(["api_test_tag", @timestamp_tag])
     resources.map{|resource| resource["context"]}.should include({"custom" => {"key" => "value"}})
   end
 
   it "should allow listing resources by tag" do
     resources = @api.resources_by_tag("api_test_tag", :tags => true, :context => true)["resources"]
     resources.find{|resource| resource["public_id"] == "api_test"}.should_not be_blank
-    resources.map{|resource| resource["tags"]}.should include(["api_test_tag"])
+    resources.map{|resource| resource["tags"]}.should include(["api_test_tag", @timestamp_tag])
     resources.map{|resource| resource["context"]}.should include({"custom" => {"key" => "value"}})
   end
   
@@ -65,7 +66,7 @@ describe Cloudinary::Api do
     resources = @api.resources_by_ids(["api_test", "api_test2"], :tags => true, :context => true)["resources"]
     resources.length.should == 2
     resources.find{|resource| resource["public_id"] == "api_test"}.should_not be_blank
-    resources.map{|resource| resource["tags"]}.should include(["api_test_tag"])
+    resources.map{|resource| resource["tags"]}.should include(["api_test_tag", @timestamp_tag])
     resources.map{|resource| resource["context"]}.should include({"custom" => {"key" => "value"}})
   end
   
@@ -79,16 +80,16 @@ describe Cloudinary::Api do
   end
   
   it "should allow listing resources in both directions" do
-    asc_resources = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => "asc")["resources"]
-    desc_resources = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => "desc")["resources"]
+    asc_resources = @api.resources_by_tag(@timestamp_tag, :type=>"upload", :direction => "asc")["resources"]
+    desc_resources = @api.resources_by_tag(@timestamp_tag, :type=>"upload", :direction => "desc")["resources"]
     # NOTE: this assumes the full list fits in a page which is the case unless resources with 'api_test' prefix were
     # uploaded to the account against which this test runs
     asc_resources.reverse.should == desc_resources
-    asc_resources_alt = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => 1)["resources"]
-    desc_resources_alt = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => -1)["resources"]
+    asc_resources_alt = @api.resources_by_tag(@timestamp_tag, :type=>"upload", :direction => 1)["resources"]
+    desc_resources_alt = @api.resources_by_tag(@timestamp_tag, :type=>"upload", :direction => -1)["resources"]
     asc_resources_alt.reverse.should == desc_resources_alt
     asc_resources.should == asc_resources_alt
-    lambda{@api.resources(:type=>"upload", :prefix=>"api_test", :direction => "anythingelse")["resources"]}.should raise_error(Cloudinary::Api::BadRequest)
+    lambda{@api.resources_by_tag(@timestamp_tag, :type=>"upload", :direction => "anythingelse")["resources"]}.should raise_error(Cloudinary::Api::BadRequest)
   end
 
   it "should allow get resource metadata" do

data/spec/cloudinary_helper_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'cloudinary'
+require 'action_view'
+require 'cloudinary/helper'
+
+helper_class = Class.new do
+  include CloudinaryHelper
+end
+
+describe CloudinaryHelper do
+  let(:helper) { helper_class.new }
+
+
+  context "#cl_image_upload_tag" do
+    let(:options) { {} }
+    subject(:input) { helper.cl_image_upload_tag(:image_id, options) }
+
+    before do
+      Cloudinary::Utils.stub(:cloudinary_api_url)
+      Cloudinary::Utils.stub(:sign_request)
+      helper.stub(:build_callback_url)
+    end
+
+    it "allow multiple upload" do
+      options[:multiple] = true
+      expect(input).to include('data-cloudinary-field="image_id[]"')
+      expect(input).to include('multiple="multiple"')
+    end
+  end
+
+  context "#cl_image_tag" do
+    subject(:input) { helper.cl_image_tag("sample.jpg", options) }
+
+    context "responsive_width" do
+      let(:options) { {responsive_width: true, cloud_name: "test"} }
+      it "should use data-src for responsive_width" do
+        expect(input).to eq("<img class=\"cld-responsive\" data-src=\"http://res.cloudinary.com/test/image/upload/c_limit,w_auto/sample.jpg\"></img>")
+      end
+    end
+
+    context "dpr_auto" do
+      let(:options) { {dpr: :auto, cloud_name: "test"} }
+      it "should use data-src for dpr auto" do
+        expect(input).to eq("<img class=\"cld-hidpi\" data-src=\"http://res.cloudinary.com/test/image/upload/dpr_auto/sample.jpg\"></img>")
+      end
+    end
+  end
+end

data/spec/uploader_spec.rb

@@ -135,10 +135,23 @@ describe Cloudinary::Uploader do
     result["public_id"].should match(/^[a-z0-9]+.png$/)
   end
   
-  it "should support unsigned uploading using presets", :upload_preset => true do
-    preset = Cloudinary::Api.create_upload_preset(:folder => "upload_folder", :unsigned => true)
-    result = Cloudinary::Uploader.unsigned_upload("spec/logo.png", preset["name"])
-    result["public_id"].should match(/^upload_folder\/[a-z0-9]+$/)
-    Cloudinary::Api.delete_upload_preset(preset["name"])
+  context "unsigned" do
+    after do
+      Cloudinary.class_variable_set(:@@config, nil)
+    end
+    
+    it "should support unsigned uploading using presets", :upload_preset => true do
+      preset = Cloudinary::Api.create_upload_preset(:folder => "upload_folder", :unsigned => true)
+
+      Cloudinary.config.api_key = nil
+      Cloudinary.config.api_secret = nil
+
+      result = Cloudinary::Uploader.unsigned_upload("spec/logo.png", preset["name"])
+      result["public_id"].should match(/^upload_folder\/[a-z0-9]+$/)
+
+      Cloudinary.class_variable_set(:@@config, nil)
+
+      Cloudinary::Api.delete_upload_preset(preset["name"])
+    end
   end
 end

data/spec/utils_spec.rb

@@ -465,4 +465,16 @@ describe Cloudinary::Utils do
     params = Cloudinary::Utils.sign_request({:public_id=>"folder/file", :version=>"1234"})
     params.should == {:public_id=>"folder/file", :version=>"1234", :signature=>"7a3349cbb373e4812118d625047ede50b90e7b67", :api_key=>"1234"}
   end
+
+  it "should support responsive width" do
+    options = {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {responsive: true}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_limit,w_auto/test" 
+    Cloudinary.config.responsive_width_transformation = {width: :auto, crop: :pad}
+    options = {:width=>100, :height=>100, :crop=>:crop, :responsive_width=>true}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {responsive: true}
+    result.should == "http://res.cloudinary.com/test123/image/upload/c_crop,h_100,w_100/c_pad,w_auto/test"     
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.72
-  prerelease: 
+  version: 1.0.73
 platform: ruby
 authors:
 - Nadav Soferman
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -101,12 +108,14 @@ files:
 - lib/cloudinary/version.rb
 - lib/tasks/cloudinary.rake
 - spec/api_spec.rb
+- spec/cloudinary_helper_spec.rb
 - spec/docx.docx
 - spec/favicon.ico
 - spec/logo.png
 - spec/spec_helper.rb
 - spec/uploader_spec.rb
 - spec/utils_spec.rb
+- vendor/assets/html/cloudinary_cors.html
 - vendor/assets/javascripts/cloudinary/canvas-to-blob.min.js
 - vendor/assets/javascripts/cloudinary/index.js
 - vendor/assets/javascripts/cloudinary/jquery.cloudinary.js
@@ -118,34 +127,33 @@ files:
 - vendor/assets/javascripts/cloudinary/jquery.ui.widget.js
 - vendor/assets/javascripts/cloudinary/load-image.min.js
 - vendor/assets/javascripts/cloudinary/processing.js
-- vendor/assets/html/cloudinary_cors.html
 homepage: http://cloudinary.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudinary
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library for easily using the Cloudinary service
 test_files:
 - spec/api_spec.rb
+- spec/cloudinary_helper_spec.rb
 - spec/docx.docx
 - spec/favicon.ico
 - spec/logo.png