cloudinary 1.0.48 → 1.0.49

data/lib/cloudinary/carrier_wave.rb

@@ -79,6 +79,19 @@ module Cloudinary::CarrierWave
     @public_id ||= self.public_id 
     @public_id ||= @stored_public_id
     @public_id ||= Cloudinary::Utils.random_public_id
+  end
+  
+  def rename(to_public_id)
+    raise "rename cannot be used if the public_id method is overridden" if self.public_id
+    resource_type = Cloudinary::Utils.resource_type_for_format(self.filename || self.format)
+    from_public_id = self.my_public_id
+    @public_id = @stored_public_id = to_public_id
+    if resource_type == 'raw'
+      from_public_id = [from_public_id, self.format].join(".") 
+      to_public_id = [to_public_id, self.format].join(".")
+    end
+    Cloudinary::Uploader.rename(from_public_id, to_public_id, :type=>self.storage_type, :resource_type=>resource_type)
+    storage.store_cloudinary_version(@stored_version)
   end  
 
   def recreate_versions!

data/lib/cloudinary/uploader.rb

@@ -21,18 +21,18 @@ class Cloudinary::Uploader
               :callback=> options[:callback],
               :format=>options[:format],
               :type=>options[:type],
-              :backup=>options[:backup],
-              :faces=>options[:faces],
-              :exif=>options[:exif],
-              :colors=>options[:colors],
-              :image_metadata=>options[:image_metadata],
-              :invalidate=>options[:invalidate],
+              :backup=>Cloudinary::Utils.as_safe_bool(options[:backup]),
+              :faces=>Cloudinary::Utils.as_safe_bool(options[:faces]),
+              :exif=>Cloudinary::Utils.as_safe_bool(options[:exif]),
+              :colors=>Cloudinary::Utils.as_safe_bool(options[:colors]),
+              :image_metadata=>Cloudinary::Utils.as_safe_bool(options[:image_metadata]),
+              :invalidate=>Cloudinary::Utils.as_safe_bool(options[:invalidate]),
               :eager=>build_eager(options[:eager]),
               :headers=>build_custom_headers(options[:headers]),
-              :use_filename=>options[:use_filename],
+              :use_filename=>Cloudinary::Utils.as_safe_bool(options[:use_filename]),
               :notification_url=>options[:notification_url],
               :eager_notification_url=>options[:eager_notification_url],
-              :eager_async=>options[:eager_async],
+              :eager_async=>Cloudinary::Utils.as_safe_bool(options[:eager_async]),
               :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
     params    
   end
@@ -60,6 +60,17 @@ class Cloudinary::Uploader
     end              
   end
 
+  def self.rename(from_public_id, to_public_id, options={})
+    call_api("rename", options) do    
+      {
+        :timestamp=>Time.now.to_i,
+        :type=>options[:type],
+        :from_public_id=>from_public_id,
+        :to_public_id=>to_public_id,
+      }
+    end              
+  end
+
   def self.exists?(public_id, options={})
     cloudinary_url = Cloudinary::Utils.cloudinary_url(public_id, options)
     begin

data/lib/cloudinary/utils.rb

@@ -272,4 +272,25 @@ class Cloudinary::Utils
     return options.delete(option_name) if options.include?(option_name)
     return Cloudinary.config.send(option_name) || default_value    
   end
+  
+  def self.as_bool(value)
+    case value
+    when nil then nil
+    when String then value.downcase == "true" || value == "1"
+    when TrueClass then true
+    when FalseClass then false
+    when Fixnum then value != 0
+    when Symbol then value == :true
+    else
+      raise "Invalid boolean value #{value} of type #{value.class}"
+    end
+  end
+  
+  def self.as_safe_bool(value)
+    case as_bool(value)
+    when nil then nil
+    when TrueClass then 1
+    when FalseClass then 0
+    end
+  end
 end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.48"
+  VERSION = "1.0.49"
 end

data/spec/uploader_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'cloudinary'
+
+describe Cloudinary::Uploader do
+  break puts("Please setup environment for api test to run") if Cloudinary.config.api_secret.blank?
+
+  it "should successfully upload file " do
+    result = Cloudinary::Uploader.upload("spec/logo.png")    
+    result["width"].should == 241
+    result["height"].should == 51
+    expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>result["public_id"], :version=>result["version"]}, Cloudinary.config.api_secret)
+    result["signature"].should == expected_signature
+  end
+
+  it "should successfully upload file by url " do
+    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/logo.png")
+    result["width"].should == 241
+    result["height"].should == 51
+    expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>result["public_id"], :version=>result["version"]}, Cloudinary.config.api_secret)
+    result["signature"].should == expected_signature
+  end
+  
+  it "should successfully upload file by unicode url " do
+    result = Cloudinary::Uploader.upload("http://cloudinary.com/images/logo.png")
+    result["width"].should == 241
+    result["height"].should == 51
+    expected_signature = Cloudinary::Utils.api_sign_request({:public_id=>result["public_id"], :version=>result["version"]}, Cloudinary.config.api_secret)
+    result["signature"].should == expected_signature
+  end
+  
+  it "should support explicit " do
+    result = Cloudinary::Uploader.explicit("cloudinary", :type=>"twitter_name", :eager=>[{:crop=>"scale", :width=>"2.0"}])
+    url = Cloudinary::Utils.cloudinary_url("cloudinary", :type=>"twitter_name", :crop=>"scale", :width=>"2.0", :format=>"png", :version=>result["version"])
+    result["eager"][0]["url"].should == url
+  end
+  
+  it "should support eager " do
+    Cloudinary::Uploader.upload("spec/logo.png", :eager=>[{:crop=>"scale", :width=>"2.0"}])
+  end
+
+  it "should support headers " do
+    Cloudinary::Uploader.upload("spec/logo.png", :headers=>["Link: 1"])
+    Cloudinary::Uploader.upload("spec/logo.png", :headers=>{"Link" => "1"})
+  end
+
+  it "should successfully generate text image " do
+    result = Cloudinary::Uploader.text("hello world")
+    result["width"].should > 1
+    result["height"].should > 1
+  end
+
+  it "should successfully upload file " do
+    result = Cloudinary::Uploader.upload("spec/logo.png")
+    Cloudinary::Uploader.add_tag("tag1", result["public_id"])
+    Cloudinary::Uploader.add_tag("tag2", result["public_id"])
+    Cloudinary::Api.resource(result["public_id"])["tags"].should == ["tag1", "tag2"]
+    Cloudinary::Uploader.remove_tag("tag1", result["public_id"])
+    Cloudinary::Api.resource(result["public_id"])["tags"].should == ["tag2"]
+    Cloudinary::Uploader.replace_tag("tag3", result["public_id"])
+    Cloudinary::Api.resource(result["public_id"])["tags"].should == ["tag3"]
+  end  
+end

data/spec/utils_spec.rb

@@ -378,4 +378,16 @@ describe Cloudinary::Utils do
     Cloudinary::Uploader.build_upload_params(options)[:transformation].should == "c_scale,w_100"
     options.length.should == 2
   end
+
+  it "build_upload_params canonize booleans" do
+    options = {:backup=>true, :use_filename=>false, :colors=>"true", :exif=>"false", :colors=>:true, 
+               :image_metadata=>:false, :invalidate=>1, :eager_async=>"1"}
+    params = Cloudinary::Uploader.build_upload_params(options)
+    Cloudinary::Api.only(params, *options.keys).should == {
+      :backup=>1, :use_filename=>0, :colors=>1, :exif=>0, :colors=>1, 
+               :image_metadata=>0, :invalidate=>1, :eager_async=>1
+    }
+    Cloudinary::Uploader.build_upload_params(:backup=>nil)[:backup].should be_nil
+    Cloudinary::Uploader.build_upload_params({})[:backup].should be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.48
+  version: 1.0.49
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -102,6 +102,7 @@ files:
 - spec/api_spec.rb
 - spec/logo.png
 - spec/spec_helper.rb
+- spec/uploader_spec.rb
 - spec/utils_spec.rb
 - vendor/assets/javascripts/cloudinary/canvas-to-blob.min.js
 - vendor/assets/javascripts/cloudinary/index.js
@@ -142,4 +143,5 @@ test_files:
 - spec/api_spec.rb
 - spec/logo.png
 - spec/spec_helper.rb
+- spec/uploader_spec.rb
 - spec/utils_spec.rb