cloudinary 1.0.41 → 1.0.42

data/lib/cloudinary.rb

@@ -4,6 +4,7 @@ require "pathname"
 require "yaml"
 require "uri"
 require "cloudinary/version"
+require "cloudinary/exceptions"
 require "cloudinary/utils"
 require "cloudinary/uploader"
 require "cloudinary/api"

data/lib/cloudinary/api.rb

@@ -1,5 +1,5 @@
 class Cloudinary::Api
-  class Error < StandardError; end
+  class Error < CloudinaryException; end
   class NotFound < Error; end
   class NotAllowed < Error; end
   class AlreadyExists < Error; end

data/lib/cloudinary/carrier_wave/preloaded.rb

@@ -38,7 +38,7 @@ module Cloudinary::CarrierWave
   class PreloadedCloudinaryFile < Cloudinary::PreloadedFile
     def initialize(file_info)
       super
-      raise "Cloudinary CarrierWave integration only supports uploaded images" if resource_type != "image" || type != "upload"
+      raise CloudinaryException, "Cloudinary CarrierWave integration only supports uploaded images" if resource_type != "image" || type != "upload"
       if !valid?
         raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.cloudinary_signature_error", :public_id=>public_id, :default=>"Invalid signature for #{public_id}")
       end

data/lib/cloudinary/carrier_wave/process.rb

@@ -51,7 +51,7 @@ module Cloudinary::CarrierWave
   end
 
   def set_or_yell(hash, attr, value)
-    raise "conflicting transformation on #{attr} #{value}!=#{hash[attr]}" if hash[attr] && hash[attr] != value
+    raise CloudinaryException, "conflicting transformation on #{attr} #{value}!=#{hash[attr]}" if hash[attr] && hash[attr] != value
     hash[attr] = value
   end
   
@@ -123,7 +123,7 @@ module Cloudinary::CarrierWave
 
   def tags
     @tags ||= self.all_processors.select{|processor| processor[0] == :tags}.map(&:second).first
-    raise "tags cannot be used in versions." if @tags.present? && self.version_name.present?
+    raise CloudinaryException, "tags cannot be used in versions." if @tags.present? && self.version_name.present?
     @tags
   end
   

data/lib/cloudinary/carrier_wave/storage.rb

@@ -36,7 +36,7 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       store_cloudinary_version(uploader.metadata["version"]) if uploader.metadata["version"]
       # Will throw an exception on error
     else
-      raise "nested versions are not allowed." if (uploader.class.version_names.length > 1)
+      raise CloudinaryException, "nested versions are not allowed." if (uploader.class.version_names.length > 1)
       # Do nothing - versions are not handled locally.
     end
     nil
@@ -57,7 +57,7 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       model_class.where(:_id=>uploader.model._id).update_all(column=>name)
       uploader.model.send :write_attribute, column, name
     else
-      raise "Only ActiveRecord and Mongoid are supported at the moment!"
+      raise CloudinaryException, "Only ActiveRecord and Mongoid are supported at the moment!"
     end
   end 
 end

data/lib/cloudinary/exceptions.rb

@@ -0,0 +1,2 @@
+class CloudinaryException < StandardError  
+end

data/lib/cloudinary/helper.rb

@@ -130,8 +130,8 @@ module CloudinaryHelper
     html_options = options.delete(:html) || {}
     cloudinary_upload_url = Cloudinary::Utils.cloudinary_api_url("upload", {:resource_type=>:auto}.merge(options))
     
-    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
-    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
 
     cloudinary_params = Cloudinary::Uploader.build_upload_params(options)
     cloudinary_params[:callback] = build_callback_url(options)

data/lib/cloudinary/migrator.rb

@@ -87,8 +87,8 @@ class Cloudinary::Migrator
   end
   
   def process(options={})    
-    raise "url not given and no retieve callback given" if options[:url].nil? && self.retrieve.nil?
-    raise "id not given and retieve or complete callback given" if options[:id].nil? && (!self.retrieve.nil? || !self.complete.nil?)
+    raise CloudinaryException, "url not given and no retieve callback given" if options[:url].nil? && self.retrieve.nil?
+    raise CloudinaryException, "id not given and retieve or complete callback given" if options[:id].nil? && (!self.retrieve.nil? || !self.complete.nil?)
 
     debug("Process: #{options.inspect}")
     start

data/lib/cloudinary/uploader.rb

@@ -22,6 +22,9 @@ class Cloudinary::Uploader
               :format=>options[:format],
               :type=>options[:type],
               :backup=>options[:backup],
+              :faces=>options[:faces],
+              :exif=>options[:exif],
+              :colors=>options[:colors],
               :invalidate=>options[:invalidate],
               :eager=>build_eager(options[:eager]),
               :headers=>build_custom_headers(options[:headers]),
@@ -137,8 +140,8 @@ class Cloudinary::Uploader
   def self.call_api(action, options)
     options = options.clone
     return_error = options.delete(:return_error)
-    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
-    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
 
     params, non_signable = yield
     non_signable ||= []
@@ -152,18 +155,18 @@ 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 "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,500].include?(response.code)
       begin
         result = Cloudinary::Utils.json_decode(response.body)
       rescue => e
         # Error is parsing json
-        raise "Error parsing server response (#{response.code}) - #{response.body}. Got - #{e}"
+        raise CloudinaryException, "Error parsing server response (#{response.code}) - #{response.body}. Got - #{e}"
       end
       if result["error"]
         if return_error
           result["error"]["http_code"] = response.code
         else
-          raise result["error"]["message"]
+          raise CloudinaryException, result["error"]["message"]
         end
       end        
     end

data/lib/cloudinary/utils.rb

@@ -88,7 +88,7 @@ class Cloudinary::Utils
     resource_type = options.delete(:resource_type) || "image"
     version = options.delete(:version)
     format = options.delete(:format)
-    cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise("Must supply cloud_name in tag or in configuration")    
+    cloud_name = options.delete(:cloud_name) || Cloudinary.config.cloud_name || raise(CloudinaryException, "Must supply cloud_name in tag or in configuration")    
     secure = options.delete(:secure)
     ssl_detected = options.delete(:ssl_detected)
     secure = ssl_detected || Cloudinary.config.secure if secure.nil?
@@ -133,7 +133,7 @@ class Cloudinary::Utils
     else
       if secure && secure_distribution.nil?
         if private_cdn
-          raise "secure_distribution not defined"
+          raise CloudinaryException, "secure_distribution not defined"
         else
           secure_distribution = SHARED_CDN 
         end
@@ -156,23 +156,29 @@ class Cloudinary::Utils
   
   def self.cloudinary_api_url(action = 'upload', options = {})
     cloudinary = options[:upload_prefix] || Cloudinary.config.upload_prefix || "https://api.cloudinary.com"
-    cloud_name = options[:cloud_name] || Cloudinary.config.cloud_name || raise("Must supply cloud_name")
+    cloud_name = options[:cloud_name] || Cloudinary.config.cloud_name || raise(CloudinaryException, "Must supply cloud_name")
     resource_type = options[:resource_type] || "image"
     return [cloudinary, "v1_1", cloud_name, resource_type, action].join("/")
   end
 
   def self.private_download_url(public_id, format, options = {})
-    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
-    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
-    cloudinary_params = {:timestamp=>Time.now.to_i, :public_id=>public_id, :format=>format, :type=>options[:type]}.reject{|k, v| v.blank?}
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
+    cloudinary_params = {
+      :timestamp=>Time.now.to_i, 
+      :public_id=>public_id, 
+      :format=>format, 
+      :type=>options[:type], 
+      :expires_at=>options[:expires_at] && options[:expires_at].to_i
+    }.reject{|k, v| v.blank?}
     cloudinary_params[:signature] = Cloudinary::Utils.api_sign_request(cloudinary_params, api_secret)
     cloudinary_params[:api_key] = api_key
     return Cloudinary::Utils.cloudinary_api_url("download", options) + "?" + cloudinary_params.to_query 
   end
 
   def self.zip_download_url(tag, options = {})
-    api_key = options[:api_key] || Cloudinary.config.api_key || raise("Must supply api_key")
-    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise("Must supply api_secret")
+    api_key = options[:api_key] || Cloudinary.config.api_key || raise(CloudinaryException, "Must supply api_key")
+    api_secret = options[:api_secret] || Cloudinary.config.api_secret || raise(CloudinaryException, "Must supply api_secret")
     cloudinary_params = {:timestamp=>Time.now.to_i, :tag=>tag, :transformation=>generate_transformation_string(options)}.reject{|k, v| v.blank?}
     cloudinary_params[:signature] = Cloudinary::Utils.api_sign_request(cloudinary_params, api_secret)
     cloudinary_params[:api_key] = api_key
@@ -180,9 +186,9 @@ class Cloudinary::Utils
   end
 
   def self.signed_download_url(public_id, options = {})
-    aws_private_key_path = options[:aws_private_key_path] || Cloudinary.config.aws_private_key_path || raise("Must supply aws_private_key_path")
-    aws_key_pair_id = options[:aws_key_pair_id] || Cloudinary.config.aws_key_pair_id || raise("Must supply aws_key_pair_id")
-    authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise("Must supply authenticated_distribution")
+    aws_private_key_path = options[:aws_private_key_path] || Cloudinary.config.aws_private_key_path || raise(CloudinaryException, "Must supply aws_private_key_path")
+    aws_key_pair_id = options[:aws_key_pair_id] || Cloudinary.config.aws_key_pair_id || raise(CloudinaryException, "Must supply aws_key_pair_id")
+    authenticated_distribution = options[:authenticated_distribution] || Cloudinary.config.authenticated_distribution || raise(CloudinaryException, "Must supply authenticated_distribution")
     @signers ||= Hash.new{|h,k| path, id = k; h[k] = AwsCfSigner.new(path, id)}
     signer = @signers[[aws_private_key_path, aws_key_pair_id]]
     url = Cloudinary::Utils.unsigned_download_url(public_id, {:type=>:authenticated}.merge(options).merge(:secure=>true, :secure_distribution=>authenticated_distribution, :private_cdn=>true))
@@ -233,7 +239,7 @@ class Cloudinary::Utils
         begin
           require 'active_support/json'
         rescue LoadError
-          raise "Please add the json gem or active_support to your Gemfile"            
+          raise LoadError, "Please add the json gem or active_support to your Gemfile"            
         end
       end
     end

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.41"
+  VERSION = "1.0.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -88,6 +88,7 @@ files:
 - lib/cloudinary/controller.rb
 - lib/cloudinary/downloader.rb
 - lib/cloudinary/engine.rb
+- lib/cloudinary/exceptions.rb
 - lib/cloudinary/helper.rb
 - lib/cloudinary/migrator.rb
 - lib/cloudinary/missing.rb