cloudinary 1.0.54 → 1.0.55

data/cloudinary.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "cloudinary"
 
-  s.files         = `git ls-files`.split("\n") + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
+  s.files         = (`git ls-files`.split("\n") - `git ls-files samples`.split("\n")) + Dir.glob("vendor/assets/javascripts/*/*") + Dir.glob("vendor/assets/html/*")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/lib/cloudinary/carrier_wave/process.rb

@@ -132,6 +132,8 @@ module Cloudinary::CarrierWave
     if format_processor 
       # Explicit format is given
       format = Array(format_processor[1]).first 
+    elsif self.transformation.include?(:format)
+      format = self.transformation[:format]
     elsif self.version_name.present? 
       # No local format. The reset should be handled by main uploader
       uploader = self.model.send(self.mounted_as)

data/lib/cloudinary/helper.rb

@@ -144,6 +144,16 @@ module CloudinaryHelper
 
   def cloudinary_url(source, options = {})
     options[:ssl_detected] = request.ssl? if defined?(request) && request && request.respond_to?(:ssl?)
+    if defined?(CarrierWave::Uploader::Base) && source.is_a?(CarrierWave::Uploader::Base)      
+      if source.version_name.present?
+        options[:transformation] = Cloudinary::Utils.build_array(source.transformation) + Cloudinary::Utils.build_array(options[:transformation]) 
+      end         
+      options.reverse_merge!(      
+        :resource_type => Cloudinary::Utils.resource_type_for_format(source.filename || source.format),
+        :type => source.storage_type,
+        :format => source.format)
+      source = source.full_public_id      
+    end
     Cloudinary::Utils.cloudinary_url(source, options)
   end  
 

data/lib/cloudinary/preloaded_file.rb

@@ -1,5 +1,5 @@
 class Cloudinary::PreloadedFile
-  PRELOADED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^\/]+)#([^\/]+)$/
+  PRELOADED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^#]+)#([^\/]+)$/
 
   attr_reader :filename, :version, :public_id, :signature, :resource_type, :type
   def initialize(file_info)

data/lib/cloudinary/uploader.rb

@@ -200,7 +200,7 @@ class Cloudinary::Uploader
     
     RestClient::Request.execute(:method => :post, :url => api_url, :payload => params.reject{|k, v| v.nil? || v==""}, :timeout=>60) do
       |response, request, tmpresult|
-      raise CloudinaryException, "Server returned unexpected status code - #{response.code} - #{response.body}" if ![200,400,500].include?(response.code)
+      raise CloudinaryException, "Server returned unexpected status code - #{response.code} - #{response.body}" if ![200,400,401,403,404,500].include?(response.code)
       begin
         result = Cloudinary::Utils.json_decode(response.body)
       rescue => e

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.54"
+  VERSION = "1.0.55"
 end

data/spec/utils_spec.rb

@@ -11,6 +11,8 @@ describe Cloudinary::Utils do
       config.secure = false
       config.cname = nil
       config.cdn_subdomains = false
+      config.api_key = "1234"
+      config.api_secret = "1234"
     end
   end
   
@@ -414,4 +416,10 @@ describe Cloudinary::Utils do
     result = Cloudinary::Utils.cloudinary_url("test", :shorten=>true)
     result.should == "http://res.cloudinary.com/test123/iu/test"         
   end
+  
+  it "should allow to use folders in PreloadedFile" do
+    signature = Cloudinary::Utils.api_sign_request({:public_id=>"folder/file", :version=>"1234"}, Cloudinary.config.api_secret)
+    preloaded = Cloudinary::PreloadedFile.new("image/upload/v1234/folder/file.jpg#" + signature)
+    preloaded.should be_valid
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.54
+  version: 1.0.55
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client