cloudinary 1.0.70 → 1.0.71

data/CHANGELOG

@@ -1,3 +1,10 @@
+= Version 1.0.71 - 2014-04-15
+  * Upload preset support.
+  * Unsigned upload support.
+  * phash upload parameter support.
+  * Resource listing by start_at support.
+  * Updating to jQuery plugin v1.0.14.
+
 = Version 1.0.70 - 2014-03-25
   * Support upload_large without public_id. 
   * Remove public_id from method parameters.

data/lib/cloudinary/api.rb

@@ -36,7 +36,7 @@ class Cloudinary::Api
     type = options[:type]
     uri = "resources/#{resource_type}"
     uri += "/#{type}" if !type.blank?
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context, :moderations, :direction), options)    
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context, :moderations, :direction, :start_at), options)    
   end
   
   def self.resources_by_tag(tag, options={})
@@ -147,6 +147,29 @@ class Cloudinary::Api
     call_api(:post, "transformations/#{name}", {:transformation=>transformation_string(definition)}, options)
   end
   
+  # upload presets
+  def self.upload_presets(options={})
+    call_api(:get, "upload_presets", only(options, :next_cursor, :max_results), options)    
+  end
+
+  def self.upload_preset(name, options={})
+    call_api(:get, "upload_presets/#{name}", only(options, :max_results), options)
+  end
+  
+  def self.delete_upload_preset(name, options={})
+    call_api(:delete, "upload_presets/#{name}", {}, options)    
+  end
+  
+  def self.update_upload_preset(name, options={})
+    params = Cloudinary::Uploader.build_upload_params(options)
+    call_api(:put, "upload_presets/#{name}", params.merge(only(options, :unsigned, :disallow_public_id)), options)
+  end
+  
+  def self.create_upload_preset(options={})
+    params = Cloudinary::Uploader.build_upload_params(options)
+    call_api(:post, "upload_presets", params.merge(only(options, :name, :unsigned, :disallow_public_id)), options)
+  end
+  
   protected
   
   def self.call_api(method, uri, params, options)

data/lib/cloudinary/helper.rb

@@ -158,6 +158,10 @@ module CloudinaryHelper
     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
@@ -165,7 +169,11 @@ module CloudinaryHelper
   def cl_upload_tag_params(options={})
     cloudinary_params = Cloudinary::Uploader.build_upload_params(options)
     cloudinary_params[:callback] = build_callback_url(options)
-    return Cloudinary::Utils.sign_request(cloudinary_params, options).to_json
+    if options[:unsigned]
+      return cloudinary_params.reject{|k, v| Cloudinary::Utils.safe_blank?(v)}.to_json
+    else
+      return Cloudinary::Utils.sign_request(cloudinary_params, options).to_json
+    end
   end
   
   def cl_image_upload_tag(field, options={})
@@ -180,6 +188,10 @@ module CloudinaryHelper
     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
@@ -243,6 +255,9 @@ module Cloudinary::FormBuilder
   def cl_image_upload(method, options={})
     @template.cl_image_upload(@object_name, method, objectify_options(options))
   end
+  def cl_unsigned_image_upload(method, upload_preset, options={})
+    @template.cl_unsigned_image_upload(@object_name, method, upload_preset, objectify_options(options))
+  end
 end
 
 if defined? ActionView::Helpers::AssetUrlHelper

data/lib/cloudinary/uploader.rb

@@ -15,6 +15,10 @@ class Cloudinary::Uploader
   end
   
   def self.build_upload_params(options)
+    #symbolize keys
+    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,
               :transformation => Cloudinary::Utils.generate_transformation_string(options.clone),
               :public_id=> options[:public_id],
@@ -48,9 +52,15 @@ class Cloudinary::Uploader
               :categorization => options[:categorization],
               :detection => options[:detection],
               :similarity_search => options[:similarity_search],
-              :auto_tagging => options[:auto_tagging] && options[:auto_tagging].to_f}    
+              :auto_tagging => options[:auto_tagging] && options[:auto_tagging].to_f,
+              :upload_preset => options[:upload_preset],
+              :phash => Cloudinary::Utils.as_safe_bool(options[:phash])}    
     params    
   end
+  
+  def self.unsigned_upload(file, upload_preset, options={})
+    upload(file, options.merge(:unsigned => true, :upload_preset => upload_preset))
+  end
    
   def self.upload(file, options={})
     call_api("upload", options) do    
@@ -258,8 +268,10 @@ class Cloudinary::Uploader
     params, non_signable = yield
     non_signable ||= []
     
-    params[:signature] = Cloudinary::Utils.api_sign_request(params.reject{|k,v| non_signable.include?(k)}, api_secret)
-    params[:api_key] = api_key
+    unless options[:unsigned]
+      params[:signature] = Cloudinary::Utils.api_sign_request(params.reject{|k,v| non_signable.include?(k)}, api_secret)
+      params[:api_key] = api_key
+    end
 
     result = nil
     

data/lib/cloudinary/utils.rb

@@ -186,7 +186,7 @@ class Cloudinary::Utils
   def self.sign_request(params, options={})
     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 = params.reject{|k, v| v.blank?}
+    params = params.reject{|k, v| self.class.safe_blank?(v)}
     params[:signature] = Cloudinary::Utils.api_sign_request(params, api_secret)
     params[:api_key] = api_key
     params
@@ -328,4 +328,8 @@ class Cloudinary::Utils
     when FalseClass then 0
     end
   end
+  
+  def self.safe_blank?(value)
+    value.nil? || value == "" || value == []
+  end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.70"
+  VERSION = "1.0.71"
 end

data/spec/api_spec.rb

@@ -13,6 +13,10 @@ describe Cloudinary::Api do
     @api.delete_transformation("api_test_transformation") rescue nil
     @api.delete_transformation("api_test_transformation2") rescue nil
     @api.delete_transformation("api_test_transformation3") rescue nil
+    @api.delete_upload_preset("api_test_upload_preset") rescue nil
+    @api.delete_upload_preset("api_test_upload_preset2") rescue nil
+    @api.delete_upload_preset("api_test_upload_preset3") rescue nil
+    @api.delete_upload_preset("api_test_upload_preset4") rescue nil
   end
   
   it "should allow listing resource_types" do
@@ -65,6 +69,15 @@ describe Cloudinary::Api do
     resources.map{|resource| resource["context"]}.should include({"custom" => {"key" => "value"}})
   end
   
+  it "should allow listing resources by start date", :start_at => true do
+    sleep(2)
+    start_at = Time.now.to_s
+    sleep(2)
+    response = Cloudinary::Uploader.upload("spec/logo.png")
+    resources = @api.resources(:type=>"upload", :start_at=>start_at, :direction => "asc")["resources"]
+    resources.map{|resource| resource["public_id"]}.should == [response["public_id"]]
+  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"]
@@ -191,6 +204,47 @@ describe Cloudinary::Api do
     lambda{@api.transformation("c_scale,w_100")}.should raise_error(Cloudinary::Api::NotFound)
   end
   
+  it "should allow creating and listing upload_presets", :upload_preset => true do
+    @api.create_upload_preset(:name => "api_test_upload_preset", :folder => "folder")
+    @api.create_upload_preset(:name => "api_test_upload_preset2", :folder => "folder2")
+    @api.create_upload_preset(:name => "api_test_upload_preset3", :folder => "folder3")
+    @api.upload_presets["presets"].first(3).map{|p| p["name"]}.should == ["api_test_upload_preset3", "api_test_upload_preset2", "api_test_upload_preset"]
+    @api.delete_upload_preset("api_test_upload_preset")
+    @api.delete_upload_preset("api_test_upload_preset2")
+    @api.delete_upload_preset("api_test_upload_preset3")
+  end
+  
+  it "should allow getting a single upload_preset", :upload_preset => true do
+    result = @api.create_upload_preset(:unsigned => true, :folder => "folder", :width => 100, :crop => :scale, :tags => ["a","b","c"], :context => {:a => "b", :c => "d"})
+    name = result["name"]
+    preset = @api.upload_preset(name)
+    preset["name"].should == name
+    preset["unsigned"].should == true
+    preset["settings"]["folder"].should == "folder"
+    preset["settings"]["transformation"].should == [{"width" => 100, "crop" => "scale"}]
+    preset["settings"]["context"].should == {"a" => "b", "c" => "d"}
+    preset["settings"]["tags"].should == ["a","b","c"]
+    @api.delete_upload_preset(name)
+  end
+  
+  it "should allow deleting upload_presets", :upload_preset => true do
+    @api.create_upload_preset(:name => "api_test_upload_preset4", :folder => "folder")
+    preset = @api.upload_preset("api_test_upload_preset4")
+    @api.delete_upload_preset("api_test_upload_preset4")
+    lambda{preset = @api.upload_preset("api_test_upload_preset4")}.should raise_error
+  end
+  
+  it "should allow updating upload_presets", :upload_preset => true do
+    name = @api.create_upload_preset(:folder => "folder")["name"]
+    preset = @api.upload_preset(name)
+    @api.update_upload_preset(name, preset["settings"].merge(:colors => true, :unsigned => true, :disallow_public_id => true))
+    preset = @api.upload_preset(name)
+    preset["name"].should == name
+    preset["unsigned"].should == true
+    preset["settings"].should == {"folder" => "folder", "colors" => true, "disallow_public_id" => true}
+    @api.delete_upload_preset(name)
+  end
+  
   # this test must be last because it deletes (potentially) all dependent transformations which some tests rely on. Excluded by default.
   it "should allow deleting all resources", :delete_all=>true do
     Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test5", :eager=>[:width=>101,:crop=>:scale])
@@ -211,15 +265,10 @@ describe Cloudinary::Api do
     api_result["moderation"][0]["status"].should == "approved"
     api_result["moderation"][0]["kind"].should == "manual"
   end
-  
-  it "should support requesting ocr info" do
-    result = Cloudinary::Uploader.upload("spec/logo.png")
-    lambda{Cloudinary::Api.update(result["public_id"], {:ocr => :illegal})}.should raise_error(Cloudinary::Api::BadRequest, /^Illegal value/)
-  end
-  
+    
   it "should support requesting raw conversion" do
     result = Cloudinary::Uploader.upload("spec/docx.docx", :resource_type => :raw)
-    lambda{Cloudinary::Api.update(result["public_id"], {:resource_type => :raw, :raw_convert => :illegal})}.should raise_error(Cloudinary::Api::BadRequest, /^Illegal value/)
+    lambda{Cloudinary::Api.update(result["public_id"], {:resource_type => :raw, :raw_convert => :illegal})}.should raise_error(Cloudinary::Api::BadRequest, /^Illegal value|not a valid/)
   end
   
   it "should support requesting categorization" do
@@ -232,7 +281,7 @@ describe Cloudinary::Api do
     lambda{Cloudinary::Api.update(result["public_id"], {:detection => :illegal})}.should raise_error(Cloudinary::Api::BadRequest, /^Illegal value/)
   end
   
-  it "should support requesting ocr info" do
+  it "should support requesting auto_tagging" do
     result = Cloudinary::Uploader.upload("spec/logo.png")
     lambda{Cloudinary::Api.update(result["public_id"], {:auto_tagging => 0.5})}.should raise_error(Cloudinary::Api::BadRequest, /^Must use/)
   end

data/spec/uploader_spec.rb

@@ -113,21 +113,17 @@ describe Cloudinary::Uploader do
     result["moderation"][0]["status"].should == "pending"
     result["moderation"][0]["kind"].should == "manual"
   end
-  
-  it "should support requesting ocr info" do
-    lambda{Cloudinary::Uploader.upload("spec/logo.png", {:ocr => :illegal})}.should raise_error(CloudinaryException, /Illegal value/)
-  end
-  
+    
   it "should support requesting raw conversion" do
-    lambda{Cloudinary::Uploader.upload("spec/docx.docx", {:resource_type => :raw, :raw_convert => :illegal})}.should raise_error(CloudinaryException, /Illegal value/)
+    lambda{Cloudinary::Uploader.upload("spec/docx.docx", {:resource_type => :raw, :raw_convert => :illegal})}.should raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting categorization" do
-    lambda{Cloudinary::Uploader.upload("spec/logo.png", {:categorization => :illegal})}.should raise_error(CloudinaryException, /Illegal value/)
+    lambda{Cloudinary::Uploader.upload("spec/logo.png", {:categorization => :illegal})}.should raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting detection" do
-    lambda{Cloudinary::Uploader.upload("spec/logo.png", {:detection => :illegal})}.should raise_error(CloudinaryException, /Illegal value/)
+    lambda{Cloudinary::Uploader.upload("spec/logo.png", {:detection => :illegal})}.should raise_error(CloudinaryException, /Illegal value|not a valid/)
   end
   
   it "should support requesting auto_tagging" do
@@ -138,4 +134,11 @@ describe Cloudinary::Uploader do
     result = Cloudinary::Uploader.upload_large("spec/logo.png")
     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"])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.70
+  version: 1.0.71
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client