cloudinary 1.0.17 → 1.0.18

data/lib/cloudinary/carrier_wave.rb

@@ -24,7 +24,7 @@ module Cloudinary::CarrierWave
       @file = CloudinaryFile.new(identifier, self)
       @public_id = @stored_public_id = @file.public_id
       @stored_version = @file.version
-      self.original_filename = @file.filename
+      self.original_filename = sanitize(@file.filename)
     end
   end  
            
@@ -76,6 +76,12 @@ module Cloudinary::CarrierWave
     # Do nothing
   end
   
+  SANITIZE_REGEXP = CarrierWave::SanitizedFile.respond_to?(:sanitize_regexp) ? CarrierWave::SanitizedFile.sanitize_regexp : /[^a-zA-Z0-9\.\-\+_]/
+  def sanitize(filename)
+    return nil if filename.nil?
+    filename.gsub(SANITIZE_REGEXP, '_')
+  end
+  
   # Should removed files be removed from Cloudinary as well. Can be overridden.
   def delete_remote?
     true

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -10,7 +10,7 @@ module Cloudinary::CarrierWave
       @file = PreloadedCloudinaryFile.new(new_file)
       @stored_version = @file.version
       @public_id = @stored_public_id = @file.public_id
-      self.original_filename = @file.original_filename
+      self.original_filename = sanitize(@file.original_filename)
       @cache_id = "unused" # must not be blank 
     else
       super
@@ -23,7 +23,7 @@ module Cloudinary::CarrierWave
       @file = PreloadedCloudinaryFile.new(new_file)
       @stored_version = @file.version
       @public_id = @stored_public_id = @file.public_id
-      self.original_filename = @file.original_filename
+      self.original_filename = sanitize(@file.original_filename)
       @cache_id = "unused" # must not be blank 
     else
       super

data/lib/cloudinary/utils.rb

@@ -143,7 +143,7 @@ class Cloudinary::Utils
   end
 
   def self.signed_preloaded_image(result)
-    "#{result["resource_type"]}/upload/v#{result["version"]}/#{[result["public_id"], result["format"]].join(".")}##{result["signature"]}"
+    "#{result["resource_type"]}/upload/v#{result["version"]}/#{[result["public_id"], result["format"]].reject(&:blank?).join(".")}##{result["signature"]}"
   end
   
   @@json_decode = false

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.17"
+  VERSION = "1.0.18"
 end

data/spec/utils_spec.rb

@@ -166,4 +166,23 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/fetch/http://blah.com/hello%3Fa%3Db" 
   end 
+
+  it "should support background" do
+    options = {:background=>"red"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/b_red/test" 
+    options = {:background=>"#112233"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/b_rgb:112233/test" 
+  end
+  
+  it "should support default_image" do
+    options = {:default_image=>"default"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/d_default/test" 
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: cloudinary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-28 00:00:00 +03:00
+date: 2012-05-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - assets/js/jquery.fileupload.js
 - assets/js/jquery.iframe-transport.js
 - assets/js/jquery.ui.widget.js
+- assets/test/SpecRunner.html
 has_rdoc: true
 homepage: http://cloudinary.com
 licenses: []