cloudinary 1.0.52 → 1.0.53

data/lib/cloudinary/utils.rb

@@ -156,7 +156,7 @@ class Cloudinary::Utils
       resource_type = "iu"
       type = nil
     end
-    version ||= 1 if source.include?("/") and type != :fetch && !source.match(/^v[0-9]+/)
+    version ||= 1 if source.include?("/") and !source.match(/^v[0-9]+/) and !source.match(/^https?:\//)
     source = prefix + "/" + [resource_type, 
      type, transformation, version ? "v#{version}" : nil,
      source].reject(&:blank?).join("/").gsub(%r(([^:])//), '\1/')
@@ -176,7 +176,8 @@ class Cloudinary::Utils
       :timestamp=>Time.now.to_i, 
       :public_id=>public_id, 
       :format=>format, 
-      :type=>options[:type], 
+      :type=>options[:type],
+      :attachment=>options[:attachment], 
       :expires_at=>options[:expires_at] && options[:expires_at].to_i
     }.reject{|k, v| v.blank?}
     cloudinary_params[:signature] = Cloudinary::Utils.api_sign_request(cloudinary_params, api_secret)

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.52"
+  VERSION = "1.0.53"
 end

data/spec/uploader_spec.rb

@@ -4,7 +4,7 @@ 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
+  it "should successfully upload file" do
     result = Cloudinary::Uploader.upload("spec/logo.png")    
     result["width"].should == 241
     result["height"].should == 51
@@ -12,7 +12,7 @@ describe Cloudinary::Uploader do
     result["signature"].should == expected_signature
   end
 
-  it "should successfully upload file by url " do
+  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
@@ -20,36 +20,40 @@ describe Cloudinary::Uploader do
     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
+  it "should successfully rename a file" do
+    result = Cloudinary::Uploader.upload("spec/logo.png")
+    Cloudinary::Uploader.rename(result["public_id"], result["public_id"]+"2")
+    Cloudinary::Api.resource(result["public_id"]+"2").should_not be_nil
+
+    result2 = Cloudinary::Uploader.upload("spec/favicon.ico")
+    lambda{Cloudinary::Uploader.rename(result2["public_id"], result["public_id"]+"2")}.should raise_error
+    Cloudinary::Uploader.rename(result2["public_id"], result["public_id"]+"2", :overwrite=>true)
+
+    Cloudinary::Api.resource(result["public_id"]+"2")["format"].should == "ico"
   end
-  
-  it "should support explicit " do
+
+  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
+  it "should support eager" do
     Cloudinary::Uploader.upload("spec/logo.png", :eager=>[{:crop=>"scale", :width=>"2.0"}])
   end
 
-  it "should support headers " do
+  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
+  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
+  it "should correctly handle tags" do
     result = Cloudinary::Uploader.upload("spec/logo.png")
     Cloudinary::Uploader.add_tag("tag1", result["public_id"])
     Cloudinary::Uploader.add_tag("tag2", result["public_id"])

data/spec/utils_spec.rb

@@ -225,6 +225,13 @@ describe Cloudinary::Utils do
     result.should == "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db" 
   end 
 
+  it "should should escape http urls" do
+    options = {:type=>:youtube}
+    result = Cloudinary::Utils.cloudinary_url("http://www.youtube.com/watch?v=d9NF2edxy-M", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy%2DM" 
+  end 
+
   it "should support background" do
     options = {:background=>"red"}
     result = Cloudinary::Utils.cloudinary_url("test", options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.52
+  version: 1.0.53
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -100,6 +100,7 @@ files:
 - lib/cloudinary/version.rb
 - lib/tasks/cloudinary.rake
 - spec/api_spec.rb
+- spec/favicon.ico
 - spec/logo.png
 - spec/spec_helper.rb
 - spec/uploader_spec.rb
@@ -141,6 +142,7 @@ specification_version: 3
 summary: Client library for easily using the Cloudinary service
 test_files:
 - spec/api_spec.rb
+- spec/favicon.ico
 - spec/logo.png
 - spec/spec_helper.rb
 - spec/uploader_spec.rb