cloudinary 1.0.67 → 1.0.68

data/CHANGELOG

@@ -1,3 +1,8 @@
+= Version 1.0.68 - 2014-02-16
+  * Support for uploading large raw files.
+  * Correct support for image_tag and image_path override.
+  * Add direction support to Admin API listings.
+
 = Version 1.0.67 - 2014-01-09
   * Support specifying face coordinates in upload API.
   * Support specifying context (currently alt and caption) in upload API and returning context in API.  

data/lib/cloudinary/api.rb

@@ -36,20 +36,20 @@ class Cloudinary::Api
     type = options[:type]
     uri = "resources/#{resource_type}"
     uri += "/#{type}" if !type.blank?
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context), options)    
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags, :context, :direction), options)    
   end
   
   def self.resources_by_tag(tag, options={})
     resource_type = options[:resource_type] || "image"
     uri = "resources/#{resource_type}/tags/#{tag}"
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context), options)    
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :tags, :context, :direction), options)    
   end
   
   def self.resources_by_ids(public_ids, options={})
     resource_type = options[:resource_type] || "image"
     type = options[:type] || "upload"
     uri = "resources/#{resource_type}/#{type}"
-    call_api(:get, uri, only(options, :tags, :context).merge(public_ids: public_ids), options)
+    call_api(:get, uri, only(options, :tags, :context).merge(:public_ids => public_ids), options)
   end
   
   def self.resource(public_id, options={})

data/lib/cloudinary/engine.rb

@@ -1,2 +1,2 @@
-class Cloudinary::Engine < Rails::Engine 
+class Cloudinary::Engine < Rails::Engine
 end

data/lib/cloudinary/helper.rb

@@ -1,9 +1,5 @@
 require 'digest/md5'
 module CloudinaryHelper
-  include ActionView::Helpers::AssetTagHelper  
-  alias :original_image_tag :image_tag
-  alias :original_image_path :image_path
-      
   # Stand-in for Rails image_tag helper that accepts various options for transformations.
   #
   # source:: the public ID, possibly with a file type extension.  If there is no extension, the 
@@ -34,32 +30,24 @@ module CloudinaryHelper
     options[:size] = options.delete(:html_size) if options.include?(:html_size)
     options[:border] = options.delete(:html_border) if options.include?(:html_border)
 
-    original_image_tag(source, options)
+    image_tag_without_cloudinary(source, options)
   end
 
   # Works similarly to cl_image_tag, however just generates the URL of the image
   def cl_image_path(source, options = {})
     options = options.clone
     url = cloudinary_url_internal(source, options)
-    original_image_path(url)    
+    image_path_without_cloudinary(url)    
   end
     
-  def image_tag(*args)
-    if Cloudinary.config.enhance_image_tag
-      source, options = args
-      cl_image_tag(source, {:type=>:asset}.merge(options || {}))
-    else
-      original_image_tag(*args)
-    end
+  def image_tag_with_cloudinary(*args)
+    source, options = args
+    cl_image_tag(source, {:type=>:asset}.merge(options || {}))
   end
 
-  def image_path(*args)
-    if Cloudinary.config.enhance_image_tag
-      source, options = args
-      cl_image_path(source, {:type=>:asset}.merge(options || {}))
-    else
-      original_image_path(*args)
-    end
+  def image_path_with_cloudinary(*args)
+    source, options = args
+    cl_image_path(source, {:type=>:asset}.merge(options || {}))
   end
 
   def fetch_image_tag(profile, options = {})    
@@ -206,6 +194,15 @@ module CloudinaryHelper
   
   def self.included(base)
     ActionView::Helpers::FormBuilder.send(:include, Cloudinary::FormBuilder)
+    base.class_eval do
+      if defined?(Rails) && !Rails.version.start_with?("2") && Cloudinary.config.enhance_image_tag
+        alias_method_chain :image_tag, :cloudinary
+        alias_method_chain :image_path, :cloudinary
+      else
+        alias_method :image_tag_without_cloudinary, :image_tag
+        alias_method :image_path_without_cloudinary, :image_path
+      end
+    end
   end
   
   private
@@ -259,7 +256,10 @@ if defined? ActionView::Helpers::AssetUrlHelper
   end
 end
 
-ActionView::Base.send :include, CloudinaryHelper
+if defined?(Rails) && Rails.version.start_with?("2")
+  ActionView::Base.send :include, ActionView::Helpers::AssetTagHelper
+  ActionView::Base.send :include, CloudinaryHelper
+end
 
 begin
   require 'sass-rails'

data/lib/cloudinary/railtie.rb

@@ -2,4 +2,7 @@ class Cloudinary::Railtie < Rails::Railtie
   rake_tasks do
     Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
   end  
+  config.after_initialize do |app|
+    ActionView::Base.send :include, CloudinaryHelper
+  end
 end

data/lib/cloudinary/uploader.rb

@@ -59,6 +59,44 @@ class Cloudinary::Uploader
     end              
   end
 
+  # Upload large raw files. Note that public_id should include an extension for best results.
+  def self.upload_large(file, public_id, options={})
+    if file.is_a?(Pathname) || !file.respond_to?(:read)
+      file = File.open(file, "rb")
+    end
+    upload = upload_id = nil
+    index = 1
+    while !file.eof?
+      buffer = file.read(20_000_000)
+      upload = upload_large_part(Cloudinary::Blob.new(buffer), public_id, options.merge(:upload_id=>upload_id, :part_number=>index, :final=>file.eof?))
+      upload_id = upload["upload_id"]      
+      index += 1
+    end
+    upload
+  end
+    
+
+  # Upload large raw files. Note that public_id should include an extension for best results.
+  def self.upload_large_part(file, public_id, options={})
+    call_api("upload_large", options.merge(:resource_type=>:raw)) do    
+      params = {
+        :timestamp=>Time.now.to_i,
+        :type=>options[:type],
+        :public_id=> public_id,
+        :backup=>options[:backup],
+        :final=>options[:final],
+        :part_number=>options[:part_number],
+        :upload_id=>options[:upload_id]
+      }
+      if file.is_a?(Pathname) || !file.respond_to?(:read)
+        params[:file] = File.open(file, "rb")
+      else
+        params[:file] = file
+      end
+      [params, [:file]]
+    end              
+  end
+
   def self.destroy(public_id, options={})
     call_api("destroy", options) do    
       {

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.67"
+  VERSION = "1.0.68"
 end

data/spec/api_spec.rb

@@ -64,6 +64,19 @@ describe Cloudinary::Api do
     resources.map{|resource| resource["tags"]}.should include(["api_test_tag"])
     resources.map{|resource| resource["context"]}.should include({"custom" => {"key" => "value"}})
   end
+  
+  it "should allow listing resources in both directions" do
+    asc_resources = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => "asc")["resources"]
+    desc_resources = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => "desc")["resources"]
+    # NOTE: this assumes the full list fits in a page which is the case unless resources with 'api_test' prefix were
+    # uploaded to the account against which this test runs
+    asc_resources.reverse.should == desc_resources
+    asc_resources_alt = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => 1)["resources"]
+    desc_resources_alt = @api.resources(:type=>"upload", :prefix=>"api_test", :direction => -1)["resources"]
+    asc_resources_alt.reverse.should == desc_resources_alt
+    asc_resources.should == asc_resources_alt
+    lambda{@api.resources(:type=>"upload", :prefix=>"api_test", :direction => "anythingelse")["resources"]}.should raise_error(Cloudinary::Api::BadRequest)
+  end
 
   it "should allow get resource metadata" do
     resource = @api.resource("api_test")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.67
+  version: 1.0.68
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client