cloudinary 1.0.64 → 1.0.65

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGM4YmEyMGE3NWMyZjliNWJiYzI1OWZhYjU5ZTYxYTk2ZWMzZDMxMg==
+  data.tar.gz: !binary |-
+    OGNhYmI2ZDM3ZWM5NjZhMjJjNDlkY2E0MzkzOTJkZTJkOWNhNmZiNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjAyMDk1OTNkNWVmMGFkODkxZDYxNjIxNzRmNThiY2FiNmQ0MjhhMzIwNmMx
+    MmViOGJmMGZkN2Q5ZmFlYmFjZjk4OGY3ZmY1MzU2Mjk5MDQ3ZTBkMmM0YmUz
+    YjYzYjc3ZThlNDVhZDQ1N2VhZTU3OGJiMjczNmI4ZmYwYzc3NTg=
+  data.tar.gz: !binary |-
+    NjExMzBkZGMxMDFmNGI3Y2QzOWI0YTJhMTRhMzE3MWQ3ZWJmZmY0MDBiYjAx
+    NTM5ZDYxYzQ0MzZmOTU4MzhjZWMwYjI3ODMwNzc4NDg1ODBkMzkzNjM2OGFk
+    MWQ2Y2MyZDI4ODAyOWZlNzQwMzUzNjZkYjE5NmM4NTYzMDhlMjU=

data/CHANGELOG

@@ -1,3 +1,10 @@
+= Version 1.0.65 - 2013-11-04
+  * Support for unique_filename upload parameter
+  * Support the color parameter
+  * Support for uploading Pathname
+  * Support for stored files
+  * Updated Cloudinary's jQuery plugin to v1.0.11: Support color parameter
+
 = Version 1.0.64 - 2013-10-17
   * Extracted upload_tag_params and upload_url from image_upload_tag. Extracted common code to sign_request.
   * Updated Cloudinary's jQuery plugin to v1.0.10: Binding jQuery file upload events.

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -4,10 +4,13 @@
 # Where signature is the cloduinary API signature on the public_id and version.
 module Cloudinary::CarrierWave
   PRELOADED_CLOUDINARY_PATH = Cloudinary::PreloadedFile::PRELOADED_CLOUDINARY_PATH
+  STORED_CLOUDINARY_PATH = /^([^\/]+)\/([^\/]+)\/v(\d+)\/([^#]+)$/
+  SHORT_STORED_CLOUDINARY_PATH = /^v(\d+)\/([^#]+)$/
 
   def cache!(new_file)
-    if new_file.is_a?(String) && new_file.match(PRELOADED_CLOUDINARY_PATH)
-      @file = PreloadedCloudinaryFile.new(new_file)
+    file = Cloudinary::CarrierWave::createRawOrPreloaded(new_file)
+    if file
+      @file = file
       @stored_version = @file.version
       @public_id = @stored_public_id = @file.public_id
       self.original_filename = sanitize(@file.original_filename)
@@ -19,8 +22,9 @@ module Cloudinary::CarrierWave
   end
 
   def retrieve_from_cache!(new_file)
-    if new_file.is_a?(String) && new_file.match(PRELOADED_CLOUDINARY_PATH)
-      @file = PreloadedCloudinaryFile.new(new_file)
+    file = Cloudinary::CarrierWave::createRawOrPreloaded(new_file)
+    if file
+      @file = file
       @stored_version = @file.version
       @public_id = @stored_public_id = @file.public_id
       self.original_filename = sanitize(@file.original_filename)
@@ -32,7 +36,7 @@ module Cloudinary::CarrierWave
   end
   
   def cache_name
-    return @file.is_a?(PreloadedCloudinaryFile) ? @file.to_s : super
+    return (@file.is_a?(PreloadedCloudinaryFile) || @file.is_a?(StoredFile)) ? @file.to_s : super
   end
   
   class PreloadedCloudinaryFile < Cloudinary::PreloadedFile
@@ -51,4 +55,39 @@ module Cloudinary::CarrierWave
       self.filename
     end
   end
+  
+  class StoredFile < Cloudinary::PreloadedFile
+    def initialize(file_info)
+      if file_info.match(STORED_CLOUDINARY_PATH)
+        @resource_type, @type, @version, @filename = file_info.scan(STORED_CLOUDINARY_PATH).first 
+      elsif file_info.match(SHORT_STORED_CLOUDINARY_PATH)
+        @version, @filename = file_info.scan(SHORT_STORED_CLOUDINARY_PATH).first
+      else
+        raise(ArgumentError, "File #{file_info} is illegal") 
+      end
+      @public_id, @format = Cloudinary::PreloadedFile.split_format(@filename)
+    end
+  
+    def valid?
+      true
+    end
+
+    def delete
+      # Do nothing. This is a virtual file.
+    end
+
+    def original_filename
+      self.filename
+    end
+    
+    def to_s
+      identifier
+    end
+  end
+  
+  def self.createRawOrPreloaded(file)
+    return file if file.is_a?(Cloudinary::CarrierWave::StoredFile)
+    return PreloadedCloudinaryFile.new(file) if file.is_a?(String) && file.match(PRELOADED_CLOUDINARY_PATH)
+    nil
+  end
 end

data/lib/cloudinary/carrier_wave/storage.rb

@@ -14,7 +14,7 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
           store_cloudinary_identifier(file.version, file.filename)
         end
         return
-      when Cloudinary::CarrierWave::CloudinaryFile
+      when Cloudinary::CarrierWave::CloudinaryFile, Cloudinary::CarrierWave::StoredFile
         return nil # Nothing to do
       when Cloudinary::CarrierWave::RemoteFile
         data = file.uri.to_s

data/lib/cloudinary/uploader.rb

@@ -30,6 +30,7 @@ class Cloudinary::Uploader
               :eager=>build_eager(options[:eager]),
               :headers=>build_custom_headers(options[:headers]),
               :use_filename=>Cloudinary::Utils.as_safe_bool(options[:use_filename]),
+              :unique_filename=>Cloudinary::Utils.as_safe_bool(options[:unique_filename]),
               :discard_original_filename=>Cloudinary::Utils.as_safe_bool(options[:discard_original_filename]),
               :notification_url=>options[:notification_url],
               :eager_notification_url=>options[:eager_notification_url],
@@ -43,7 +44,9 @@ class Cloudinary::Uploader
   def self.upload(file, options={})
     call_api("upload", options) do    
       params = build_upload_params(options)
-      if file.respond_to?(:read) || file =~ /^https?:|^s3:|^data:[^;]*;base64,([a-zA-Z0-9\/+\n=]+)$/
+      if file.is_a?(Pathname)
+        params[:file] = File.open(file, "rb")
+      elsif file.respond_to?(:read) || file =~ /^https?:|^s3:|^data:[^;]*;base64,([a-zA-Z0-9\/+\n=]+)$/
         params[:file] = file
       else 
         params[:file] = File.open(file, "rb")

data/lib/cloudinary/utils.rb

@@ -35,6 +35,9 @@ class Cloudinary::Utils
 
     background = options.delete(:background)
     background = background.sub(/^#/, 'rgb:') if background
+
+    color = options.delete(:color)
+    color = color.sub(/^#/, 'rgb:') if color
         
     base_transformations = build_array(options.delete(:transformation))
     if base_transformations.any?{|base_transformation| base_transformation.is_a?(Hash)}
@@ -59,7 +62,7 @@ class Cloudinary::Utils
     end
     flags = build_array(options.delete(:flags)).join(".")
     
-    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border, :fl=>flags}
+    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border, :fl=>flags, :co=>color}
     { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :cs=>:color_space, :o=>:opacity,
       :p=>:prefix, :l=>:overlay, :u=>:underlay, :f=>:fetch_format, :dn=>:density, :pg=>:page, :dl=>:delay
     }.each do

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.64"
+  VERSION = "1.0.65"
 end

data/spec/uploader_spec.rb

@@ -11,6 +11,11 @@ describe Cloudinary::Uploader do
     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 a file from pathname", :pathname => true do
+    result = Cloudinary::Uploader.upload(Pathname.new("spec/logo.png"))
+    result["width"].should == 241
+  end
 
   it "should successfully upload file by url" do
     result = Cloudinary::Uploader.upload("http://cloudinary.com/images/logo.png")
@@ -62,5 +67,12 @@ describe Cloudinary::Uploader do
     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
+  
+  it "should correctly handle unique_filename" do
+    result = Cloudinary::Uploader.upload("spec/logo.png", use_filename: true)
+    result["public_id"].should match(/logo_[a-zA-Z0-9]{6}/)
+    result = Cloudinary::Uploader.upload("spec/logo.png", use_filename: true, unique_filename: false)
+    result["public_id"].should  == "logo"
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.64
-  prerelease: 
+  version: 1.0.65
 platform: ruby
 authors:
 - Nadav Soferman
@@ -11,52 +10,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
+  name: rest-client
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws_cf_signer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
+  name: aws_cf_signer
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -121,27 +114,26 @@ files:
 homepage: http://cloudinary.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: cloudinary
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library for easily using the Cloudinary service
 test_files:
 - spec/api_spec.rb