lib/cloudinary/uploader.rb in cloudinary-1.0.72 vs lib/cloudinary/uploader.rb in cloudinary-1.0.73

@@ -17,14 +17,14 @@
   def self.build_upload_params(options)
     #symbolize keys
     options = options.clone
     options.keys.each{|key| options[key.to_sym] = options.delete(key) if key.is_a?(String)}
     
-    params = {:timestamp=>Time.now.to_i,
+    params = {:timestamp=>(options[:timestamp] || Time.now.to_i),
               :transformation => Cloudinary::Utils.generate_transformation_string(options.clone),
-              :public_id=> options[:public_id],
-              :callback=> options[:callback],
+              :public_id=>options[:public_id],
+              :callback=>options[:callback],
               :format=>options[:format],
               :type=>options[:type],
               :backup=>Cloudinary::Utils.as_safe_bool(options[:backup]),
               :faces=>Cloudinary::Utils.as_safe_bool(options[:faces]),
               :exif=>Cloudinary::Utils.as_safe_bool(options[:exif]),
@@ -106,11 +106,11 @@
 
   # Upload large raw files. Note that public_id should include an extension for best results.
   def self.upload_large_part(file, options={})
     call_api("upload_large", options.merge(:resource_type=>:raw)) do    
       params = {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=>options[:public_id],
         :backup=>options[:backup],
         :final=>options[:final],
         :part_number=>options[:part_number],
@@ -126,22 +126,22 @@
   end
 
   def self.destroy(public_id, options={})
     call_api("destroy", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=> public_id,
         :invalidate=>options[:invalidate],
       }
     end              
   end
 
   def self.rename(from_public_id, to_public_id, options={})
     call_api("rename", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :overwrite=>options[:overwrite],
         :from_public_id=>from_public_id,
         :to_public_id=>to_public_id,
       }
@@ -159,11 +159,11 @@
   end
 
   def self.explicit(public_id, options={})
     call_api("explicit", options) do    
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :type=>options[:type],
         :public_id=> public_id,
         :callback=> options[:callback],
         :eager=>build_eager(options[:eager]),
         :headers=>build_custom_headers(options[:headers]),
@@ -185,11 +185,11 @@
   def self.generate_sprite(tag, options={})
     version_store = options.delete(:version_store)
     
     result = call_api("sprite", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :async=>options[:async],
         :notification_url=>options[:notification_url],
         :transformation => Cloudinary::Utils.generate_transformation_string(options.merge(:fetch_format=>options[:format]))        
       }    
@@ -205,11 +205,11 @@
   end
 
   def self.multi(tag, options={})
     call_api("multi", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :format=>options[:format],
         :async=>options[:async],
         :notification_url=>options[:notification_url],
         :transformation => Cloudinary::Utils.generate_transformation_string(options.clone)        
@@ -218,11 +218,11 @@
   end
   
   def self.explode(public_id, options={})    
     call_api("explode", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :public_id=>public_id,
         :type=>options[:type],
         :format=>options[:format],
         :notification_url=>options[:notification_url],
         :transformation => Cloudinary::Utils.generate_transformation_string(options.clone)        
@@ -248,11 +248,11 @@
   private
   
   def self.call_tags_api(tag, command, public_ids = [], options = {})
     return call_api("tags", options) do
       {
-        :timestamp=>Time.now.to_i,
+        :timestamp=>(options[:timestamp] || Time.now.to_i),
         :tag=>tag,
         :public_ids => Cloudinary::Utils.build_array(public_ids),
         :command => command,
         :type => options[:type]
       }    
@@ -260,16 +260,16 @@
   end
      
   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(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 ||= []
     
     unless options[:unsigned]
+      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[:signature] = Cloudinary::Utils.api_sign_request(params.reject{|k,v| non_signable.include?(k)}, api_secret)
       params[:api_key] = api_key
     end
 
     result = nil