cloudinary 1.0.62 → 1.0.63

data/lib/cloudinary/uploader.rb

@@ -35,6 +35,7 @@ class Cloudinary::Uploader
               :eager_notification_url=>options[:eager_notification_url],
               :eager_async=>Cloudinary::Utils.as_safe_bool(options[:eager_async]),
               :proxy=>options[:proxy],
+              :folder=>options[:folder],
               :tags=>options[:tags] && Cloudinary::Utils.build_array(options[:tags]).join(",")}    
     params    
   end

data/lib/cloudinary/utils.rb

@@ -1,6 +1,7 @@
 # Copyright Cloudinary
 require 'digest/sha1'
 require 'zlib'
+require 'uri'
 require 'aws_cf_signer'
 
 class Cloudinary::Utils
@@ -133,8 +134,9 @@ class Cloudinary::Utils
 
     if source.match(%r(^https?:/)i)
       source = smart_escape(source)
-    elsif !format.blank? 
-      source = "#{source}.#{format}"
+    else
+      source = smart_escape(URI.decode(source)) 
+      source = "#{source}.#{format}" if !format.blank?
     end
 
     if cloud_name.start_with?("/") # For development
@@ -227,9 +229,9 @@ class Cloudinary::Utils
   
   # Based on CGI::unescape. In addition does not escape / : 
   def self.smart_escape(string)
-    string.gsub(/([^ a-zA-Z0-9_.-\/:]+)/) do
+    string.gsub(/([^a-zA-Z0-9_.\-\/:]+)/) do
       '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-    end.tr(' ', '+')
+    end
   end
   
   def self.random_public_id

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.62"
+  VERSION = "1.0.63"
 end

data/spec/utils_spec.rb

@@ -235,7 +235,7 @@ describe Cloudinary::Utils 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" 
+    result.should == "http://res.cloudinary.com/test123/image/youtube/http://www.youtube.com/watch%3Fv%3Dd9NF2edxy-M" 
   end 
 
   it "should support background" do
@@ -426,4 +426,17 @@ describe Cloudinary::Utils do
     preloaded = Cloudinary::PreloadedFile.new("image/upload/v1234/folder/file.jpg#" + signature)
     preloaded.should be_valid
   end
+  
+  it "should escape public_ids" do
+    [
+      ["a b", "a%20b"],
+      ["a+b", "a%2Bb"],
+      ["a%20b", "a%20b"],
+      ["a-b", "a-b"],
+      ["a??b", "a%3F%3Fb"]
+    ].each do
+      |source, target|
+      Cloudinary::Utils.cloudinary_url(source).should == "http://res.cloudinary.com/test123/image/upload/#{target}"   
+    end      
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.62
+  version: 1.0.63
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client