cloudinary 1.0.26 → 1.0.27

data/lib/cloudinary/helper.rb

@@ -114,7 +114,7 @@ module CloudinaryHelper
   end
 
   def cloudinary_url(source, options = {})
-    options[:secure] = request.ssl? if !options.include?(:secure) && defined?(request) && request && request.respond_to?(:ssl?)
+    options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
     Cloudinary::Utils.cloudinary_url(source, options)
   end  
 
@@ -143,6 +143,15 @@ module CloudinaryHelper
     content_tag("input", nil, tag_options)
   end
   
+  def cl_private_download_url(public_id, format, options = {})
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    cloudinary_params = {:timestamp=>Time.now.to_i, :public_id=>public_id, :format=>format}.reject{|k, v| v.blank?}
+    cloudinary_params[:signature] = Cloudinary::Utils.api_sign_request(cloudinary_params, api_secret)
+    cloudinary_params[:api_key] = api_key
+    return Cloudinary::Utils.cloudinary_api_url("download", options) + "?" + cloudinary_params.to_query 
+  end
+  
   def self.included(base)
     ActionView::Helpers::FormBuilder.send(:include, Cloudinary::FormBuilder)
   end

data/lib/cloudinary/uploader.rb

@@ -11,6 +11,7 @@ class Cloudinary::Uploader
               :callback=> options[:callback],
               :format=>options[:format],
               :type=>options[:type],
+              :backup=>options[:backup],
               :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
     if options[:eager]
       params[:eager] = Cloudinary::Utils.build_array(options[:eager]).map do
@@ -116,9 +117,9 @@ class Cloudinary::Uploader
 
     result = nil
     
-    api_url = Cloudinary::Utils.cloudinary_api_url(action, {:resource_type => options.delete(:resource_type), :upload_prefix => options.delete(:upload_prefix)})
+    api_url = Cloudinary::Utils.cloudinary_api_url(action, options)
     
-    RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject{|k, v| v.blank?}, :timeout=>60) do
+    RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject{|k, v| v.nil? || v==""}, :timeout=>60) do
       |response, request, tmpresult|
       raise "Server returned unexpected status code - #{response.code} - #{response.body}" if ![200,400,500].include?(response.code)
       begin

data/lib/cloudinary/utils.rb

@@ -11,13 +11,13 @@ class Cloudinary::Utils
     options[:width], options[:height] = size.split("x") if size    
     width = options[:width]
     height = options[:height]
-    has_overlay = !options[:overlay].blank?
+    has_layer = !options[:overlay].blank? || !options[:underlay].blank?
     
-    options.delete(:width) if width && (width.to_f < 1 || has_overlay) 
-    options.delete(:height) if height && (height.to_f < 1 || has_overlay)
+    options.delete(:width) if width && (width.to_f < 1 || has_layer) 
+    options.delete(:height) if height && (height.to_f < 1 || has_layer)
      
     crop = options.delete(:crop)
-    width=height=nil if crop.nil? && !has_overlay
+    width=height=nil if crop.nil? && !has_layer
 
     background = options.delete(:background)
     background = background.sub(/^#/, 'rgb:') if background
@@ -37,7 +37,7 @@ class Cloudinary::Utils
     effect = Array(effect).flatten.join(":") if effect.is_a?(Array) || effect.is_a?(Hash)
 
     params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect}
-    { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :p=>:prefix, :a=>:angle, :l=>:overlay, :f=>:fetch_format }.each do
+    { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :p=>:prefix, :a=>:angle, :l=>:overlay, :u=>:underlay, :f=>:fetch_format }.each do
       |param, option|
       params[param] = options.delete(option)
     end    
@@ -48,8 +48,12 @@ class Cloudinary::Utils
     (base_transformations << transformation).reject(&:blank?).join("/")    
   end
   
+  def self.api_string_to_sign(params_to_sign)
+    params_to_sign.map{|k,v| [k.to_s, v.is_a?(Array) ? v.join(",") : v]}.reject{|k,v| v.nil? || v == ""}.sort_by(&:first).map{|k,v| "#{k}=#{v}"}.join("&")
+  end
+  
   def self.api_sign_request(params_to_sign, api_secret)
-    to_sign = params_to_sign.reject{|k,v| v.blank?}.map{|k,v| [k.to_s, v.is_a?(Array) ? v.join(",") : v]}.sort_by(&:first).map{|k,v| "#{k}=#{v}"}.join("&")
+    to_sign = api_string_to_sign(params_to_sign)
     Digest::SHA1.hexdigest("#{to_sign}#{api_secret}")
   end
 
@@ -64,8 +68,10 @@ class Cloudinary::Utils
     version = options.delete(:version)
     format = options.delete(:format)
     
-    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
+    cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise("Must supply cloud_name in tag or in configuration")    
+    secure = options.delete(:secure)
+    ssl_detected = options.delete(:ssl_detected)
+    secure = ssl_detected || Cloudinary.config.secure if secure.nil?
     private_cdn = options.delete(:private_cdn) || Cloudinary.config.private_cdn    
     secure_distribution = options.delete(:secure_distribution) || Cloudinary.config.secure_distribution
     force_remote = options.delete(:force_remote)  
@@ -123,7 +129,7 @@ class Cloudinary::Utils
   
   def self.cloudinary_api_url(action = 'upload', options = {})
     cloudinary = options[:upload_prefix] || Cloudinary.config.upload_prefix || "https://api.cloudinary.com"
-    cloud_name = Cloudinary.config.cloud_name || raise("Must supply cloud_name")
+    cloud_name = options[:cloud_name] || Cloudinary.config.cloud_name || raise("Must supply cloud_name")
     resource_type = options[:resource_type] || "image"
     return [cloudinary, "v1_1", cloud_name, resource_type, action].join("/")
   end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.26"
+  VERSION = "1.0.27"
 end

data/spec/spec_helper.rb

@@ -1,11 +1,5 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper.rb"` to ensure that it is only
-# loaded once.
-#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
 end

data/spec/utils_spec.rb

@@ -8,6 +8,7 @@ describe Cloudinary::Utils do
       config.cloud_name = "test123"
       config.secure_distribution = nil
       config.private_cdn = false
+      config.secure = false
     end
   end
   
@@ -192,13 +193,6 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/upload/a_55/test" 
   end
   
-  it "should support overlay" do
-    options = {:overlay=>"text:hello"}
-    result = Cloudinary::Utils.cloudinary_url("test", options)
-    options.should == {}
-    result.should == "http://res.cloudinary.com/test123/image/upload/l_text:hello/test" 
-  end
-  
   it "should support format for fetch urls" do
     options = {:format=>"jpg", :type=>:fetch}
     result = Cloudinary::Utils.cloudinary_url("http://cloudinary.com/images/logo.png", options)
@@ -227,11 +221,42 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/upload/e_sepia:10/test" 
   end
 
-  it "should not pass width/height to html for overlay" do
-    options = {:overlay=>"text:hello", :height=>100, :width=>100}
+  {:overlay=>:l, :underlay=>:u}.each do |param, letter|
+    it "should support #{param}" do
+      options = {param=>"text:hello"}
+      result = Cloudinary::Utils.cloudinary_url("test", options)
+      options.should == {}
+      result.should == "http://res.cloudinary.com/test123/image/upload/#{letter}_text:hello/test" 
+    end
+    
+    it "should not pass width/height to html for #{param}" do
+      options = {param=>"text:hello", :height=>100, :width=>100}
+      result = Cloudinary::Utils.cloudinary_url("test", options)
+      options.should == {}
+      result.should == "http://res.cloudinary.com/test123/image/upload/h_100,#{letter}_text:hello,w_100/test" 
+    end
+  end
+
+  it "should use ssl_detected if secure is not given as parameter and not set to true in configuration" do    
+    options = {:ssl_detected=>true}
     result = Cloudinary::Utils.cloudinary_url("test", options)
     options.should == {}
-    result.should == "http://res.cloudinary.com/test123/image/upload/h_100,l_text:hello,w_100/test" 
-  end
-  
+    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+  end 
+
+  it "should use secure if given over ssl_detected and configuration" do    
+    options = {:ssl_detected=>true, :secure=>false}
+    Cloudinary.config.secure = true
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/test" 
+  end 
+
+  it "should use secure: true from configuration over ssl_detected" do    
+    options = {:ssl_detected=>false}
+    Cloudinary.config.secure = true
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "https://d3jpl91pxevbkh.cloudfront.net/test123/image/upload/test" 
+  end 
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-08 00:00:00 +03:00
+date: 2012-06-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency