rested 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rested/base.rb

@@ -13,7 +13,9 @@ module Rested
             if self.user and self.pass then
                 @client.set_auth(self.base_url, self.user, self.pass)
             end
-            @client.debug_dev = STDOUT if Rested.debug
+            if not Rested.debug.nil?
+                @client.debug_dev = (Rested.debug.respond_to?("<<") ? Rested.debug : STDOUT)
+            end
             @client
         end
 

data/lib/rested/debug.rb

@@ -3,7 +3,7 @@ module Rested
     @debug = false
     
     def self.debug(val=nil)
-        return @debug unless val
+        return @debug if val.nil?
         if val == true || val == 1 || val.nil? then
             @debug = STDOUT
         else

data/lib/rested/entity.rb

@@ -211,15 +211,27 @@ module Rested
       self.class.before_filters.each do |f| 
         f.call(self) 
       end 
+      
       uri = self.endpoint
       uri += "/#{self.id_val}" unless new?
+      
       params = to_h() if not params
       params.delete(self.id_field) if new?
-      unless self.files.empty?
+      
+      if not self.files.empty?
         params.merge!(self.files)
         @files = {}
       end
-      ret = self.post(uri, params)
+      params = preserve_filenames(params)
+      
+      begin      
+        ret = self.post(uri, params)
+        cleanup_temp_files(params)
+      rescue => ex
+        cleanup_temp_files(params)
+        raise ex
+      end
+      
       if new? then
         self.id_val = self.class.new(ret.values.first).id_val
       end
@@ -243,5 +255,32 @@ module Rested
     def delimited_fields
       @delimited_fields ||= self.class.delimited_fields
     end
+    
+    
+    
+    private
+    
+    # simple trick to force httpclient to pass the real filename
+    # we simply rename our temp file to its original in a unique directory
+    def preserve_filenames(params)
+      params.each { |k,v|
+        if v.kind_of? Tempfile and v.respond_to? "original_filename" then
+          FileUtils.mkdir_p(v.path + "-origfile")
+          FileUtils.mv(v.path, v.path + "-origfile/" + v.original_filename)
+          params[k] = File.new(v.path + "-origfile/" + v.original_filename)
+        end
+      }
+      params
+    end
+    
+    # cleanup temp files created above
+    def cleanup_temp_files(params)
+      params.each { |k,v|
+        if v.kind_of? File
+          FileUtils.rm_rf([v.path, File.dirname(v.path)])
+        end
+      }
+    end
+    
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Chetan Sarva
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency