downer 0.3.1 → 0.3.2

data/downer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{downer}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Miller"]
-  s.date = %q{2010-08-08}
+  s.date = %q{2010-08-09}
   s.default_executable = %q{downer}
   s.description = %q{Downer is a tool used to download a list of urls from a website thorugh HTTP.}
   s.email = %q{nate@natemiller.org}

data/lib/downer.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'net/http'
+require 'cgi'
 require 'nokogiri'
 require 'optparse'
 require 'open-uri'

data/lib/downer/download_item.rb

@@ -10,15 +10,15 @@ module Downer
     
     def initialize(url, destination)
       @url, @destination = sanitize_url(url), destination
-      @uri = URI.parse(url)
+      @uri = URI.parse(@url)      
     end
     
     # Returns the name which this file will be saved as
     def get_save_filename
-      file_name = @uri.to_s
+      file_name = CGI.unescape(@uri.to_s)
       file_name = file_name.gsub(/https?:\/\//,'').split('/').last
-      file_name = file_name.gsub('%5B', '[')
-      file_name = file_name.gsub('%5D', ']')
+      #file_name = file_name.gsub('%5B', '[')
+      #file_name = file_name.gsub('%5D', ']')
       file_name
       # TODO : refine to auto append file extentions based on content type
     end
@@ -52,12 +52,12 @@ module Downer
         fout.puts @content
       end
       
-      def sanitize_url(unsafe_url)
-        url = unsafe_url
-        url.gsub!('[', '%5B')
-        url.gsub!(']', '%5D')
-        url.gsub!(',', '%2C')
-        url
+      def sanitize_url(url)
+        unsafe_url = String.new(url)
+        scheme = unsafe_url.slice!(/(https?|ftp|smb):\/\//)
+        parts = unsafe_url.split('/')
+        parts.map! { |part| CGI::escape(part).gsub('+', '%20') }
+        scheme + parts.join('/')
       end
     end
 end

data/lib/downer/download_worker.rb

@@ -20,7 +20,7 @@ module Downer
       end
       
       @items.each { |item| try_download_item(item) }
-      successful_downloads
+      @successful_downloads
     end
     
     private
@@ -39,4 +39,4 @@ module Downer
         end
       end
   end
-end
+end

data/spec/downer/download_item_spec.rb

@@ -16,6 +16,10 @@ module Downer
         item.get_save_filename.should == 'mapsAndAtlases2.png'
       end
       
+      it "should successfully encode invalid chars into ASCII equivalents" do
+        item = DownloadItem.new('http://www.urbaninfluence.com/My File_Name With White space.png', '/tmp')
+        item.url.should == 'http://www.urbaninfluence.com/My%20File_Name%20With%20White%20space.png'
+      end
 
       it "should restore bad url tokens into valid ascii characters" do
         item = DownloadItem.new('http://www.urbaninfluence.com/my[place].html', '/tmp')

data/version.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :build: 
 :minor: 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: downer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nate Miller
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-09 00:00:00 -07:00
 default_executable: downer
 dependencies: 
 - !ruby/object:Gem::Dependency