downspout 0.2.6 → 0.2.7

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

data/lib/downspout/downloader.rb

@@ -132,12 +132,18 @@ module Downspout
       $logger.debug("downspout | downloader | download! | #{self.basename} downloaded? : #{downloaded} ")
       @finished_at = Time.now
 
-      new_name = generate_file_name      
+      new_name = generate_file_name
+
       if (tf && new_name && !(@basename == new_name)) then
         # rename file more appropriately
         $logger.debug("downspout | downloader | download! | Renaming #{@basename} to #{new_name} ...")
         new_path = File.join( File.dirname( tf.path ), new_name)
-        FileUtils.mv( tf.path, new_path )
+        begin
+          FileUtils.mv( tf.path, new_path ) 
+        rescue Exception => e
+          $logger.error("downspout | downloader | download! | Exception while renaming #{@basename} : #{e}")
+          raise e
+        end
         @path = new_path
       end
 
@@ -317,7 +323,11 @@ module Downspout
       return result
     end
 
+
+    # Extracts filename from Content-Disposition Header per RFC 2183
+    # "http://tools.ietf.org/html/rfc2183"
     def file_name_from_content_disposition
+    
       file_name = nil
 
       cd_key = response_headers.keys.select{|k| k =~ /content-disposition/i }.first
@@ -326,7 +336,7 @@ module Downspout
         disposition = @response_headers[cd_key]
         if disposition then
           # example : Content-Disposition: attachment; filename="iPad_User_Guide.pdf"
-          file_name = disposition.match("filename=\"?([^\"]+)\"?")[1]
+          file_name = disposition.match("filename=\"?([^;\"]+)\"?")[1]
         end
       end
 

data/test/unit/downloader_test.rb

@@ -236,6 +236,11 @@ class DownloaderTest < Test::Unit::TestCase
       assert_equal "0123456789_X.pdf", @dlx.send("generate_file_name")
     end
 
+    should "extract the expected file name (followed by size)" do
+      @dlx.response_headers["Content-Disposition"].gsub!("0123456789_X.pdf", "2c2afa1c-1b47-422e-bf2d-9848373381bc.pdf;size=5524642")
+      assert_equal "2c2afa1c-1b47-422e-bf2d-9848373381bc.pdf", @dlx.send("generate_file_name")
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: downspout
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Phi.Sanders
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency