downspout 0.2.3 → 0.2.4

data/Rakefile

@@ -51,3 +51,18 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
+
+namespace :basic do
+  desc "Basic Steps to take when updating this gem via GemCutter"
+  task :steps do
+    puts "rake version:bump:patch"
+    puts "rake gemspec"
+    puts ">>> write code <<<"
+    puts "rake test"
+    puts "rake build"
+    puts "gem install pkg/downspout-{version}.gem"
+    puts ">>> manual tests <<<"
+    puts "git commit"
+    puts "gem push pkg/downspout-{version}.gem"
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/downspout/config.rb

@@ -52,7 +52,7 @@ module Downspout
     end
 
     def self.use_curb?
-      @@curb_enabled
+      @@curb_enabled unless !(self.curb_available?)
     end
 
     def self.enable_curb!

data/lib/downspout/downloader.rb

@@ -131,16 +131,14 @@ module Downspout
 
       $logger.debug("downspout | downloader | download! | #{self.basename} downloaded? : #{downloaded} ")
       @finished_at = Time.now
-      
-      if (tf && @basename == 'file.downspout') then
+
+      new_name = generate_file_name      
+      if (tf && new_name && !(@basename == new_name)) then
         # rename file more appropriately
-        new_name = generate_file_name
-        if !(new_name.nil?) then
-          $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 )
-          @path = new_path
-        end
+        $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 )
+        @path = new_path
       end
 
       $logger.debug("downspout | downloader | download! | Started: #{@started_at.utc}, Finished: #{@finished_at.utc}, Duration: #{duration}")
@@ -328,17 +326,30 @@ module Downspout
     end
 
     def generate_file_name
-      file_type = @response_headers['Content-Type'] if use_curb?
-      file_type = @response_headers['Content-Type'] if use_net_http?
+
+      cd_key = response_headers.keys.select{|k| k =~ /content-disposition/i }.first
+      # example : Content-Disposition: attachment; filename="iPad_User_Guide.pdf"
+      if cd_key then
+        disposition = @response_headers[cd_key]
+        if disposition then
+          file_name = disposition.match("filename=\"(.+)\"")[1]
+          return file_name unless (file_name.nil? || file_name.empty?)
+        end
+      end
+
+      ct_key = response_headers.keys.select{|k| k =~ /content-type/i }.first
+      return nil unless ct_key
+
+      file_type = @response_headers[ct_key]
       return nil unless file_type
 
-      return "default.html" if file_type =~ /text\/html/
       # TODO : smarter file name generation
+      return "#{@basename || 'default'}.html" if file_type =~ /html/
+      return "#{@basename || 'default'}.pdf" if file_type =~ /pdf/
 
       return nil
     end
     
   end
-
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: downspout
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Phi.Sanders