upton 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9de3851524b4f26a558ad8400edf24d6bc39b49
-  data.tar.gz: 3183dc8c0f75a659722354e3b58f72ce1b55661d
+  metadata.gz: 46903360868525008977cd6ed14f99aa48508f2e
+  data.tar.gz: 5003dd6031339e8aa19fb429fdd10e78cd8c2608
 SHA512:
-  metadata.gz: 8372d26f5f55208c657331b8778d22da42a61d437625b73bda5e85d757c6eb255ef128f47ced6bd2cc7a1cb65b3616cd7d4b93d3c443499786b0e1bef8c8cca6
-  data.tar.gz: b3e6c479b6b03e82dab3164cab8d27b88b7fa935e7e9d58317df6a11c7af3d419c65b7205133a3240f78e8cadc31d096fabd6ee57610ba5d552fbcea21d52e4a
+  metadata.gz: b1bcd61e00617300959f076b1b78ee9136096a405158b8504f77903120a1d6fb7164870f577590f699c727c5d3be62969646c7e1f046ede9d3e27bd1f5a594f5
+  data.tar.gz: 56cea905090eaededa2295eef89a9b7142870771a097745e404cb667fc95bffaebac782ce7f497087ace6256755c2c8dbab77e8513b79c0f8b9bda4eb900cdfe

data/lib/upton.rb

@@ -35,7 +35,7 @@ module Upton
     EMPTY_STRING = ''
 
     attr_accessor :verbose, :debug, :index_debug, :sleep_time_between_requests, :stash_folder, :url_array,
-      :paginated, :pagination_param, :pagination_max_pages
+      :paginated, :pagination_param, :pagination_max_pages, :readable_filenames
 
     ##
     # This is the main user-facing method for a basic scraper.
@@ -212,11 +212,12 @@ module Upton
         :cache => stash,
         :verbose => @verbose
       }
+      if @readable_filenames
+        global_options[:readable_filenames] = true
+      end
       if @stash_folder
-        global_options.merge!({
-            :cache_location => @stash_folder,
-            :readable_filenames => true
-        })
+        global_options[:readable_filenames] = true
+        global_options[:cache_location] = @stash_folder
       end
       resp_and_cache = Downloader.new(url, global_options.merge(options)).get
       if resp_and_cache[:from_resource]

data/lib/upton/downloader.rb

@@ -20,6 +20,7 @@ module Upton
     attr_reader :uri, :cache_location, :verbose
     def initialize(uri, options = {})
       @uri = uri
+      @options = options
       @cache = options.fetch(:cache) { true }
       @cache_location = File.absolute_path(options[:cache_location] || "#{Dir.tmpdir}/upton")
       @verbose = options[:verbose] || false
@@ -78,7 +79,7 @@ module Upton
       unless cached_file_exists?
         if @verbose
           if @readable_stash_filenames
-            puts "Writing #{uri} data to the cache at #{cached_file}" 
+            puts "Writing #{uri} data to the cache at #{cached_file}"
           else
             puts "Writing #{uri} data to the cache"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upton
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Jeremy B. Merrill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,8 +137,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Don't re-write web scrapers every time. Upton gives you a scraper template
-  that's easy to use for debugging and doesn't hammer servers by default
-email: jeremy.merrill@propublica.org
+  that's easy to use for debugging and doesn't hammer servers by default.
+email: jeremybmerrill@jeremybmerrill.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -146,15 +146,15 @@ files:
 - lib/upton.rb
 - lib/upton/utils.rb
 - lib/upton/downloader.rb
-- spec/data/propublica_search_page_2.html
-- spec/data/webinar.html
+- spec/data/discussion.html
+- spec/data/easttimor.html
 - spec/data/propublica-relative.html
 - spec/data/propublica.html
+- spec/data/propublica_search.html
+- spec/data/propublica_search_page_2.html
 - spec/data/prosecutor.html
 - spec/data/sixfacts.html
-- spec/data/discussion.html
-- spec/data/easttimor.html
-- spec/data/propublica_search.html
+- spec/data/webinar.html
 - spec/upton_spec.rb
 - spec/spec_helper.rb
 - spec/upton_downloader_spec.rb
@@ -178,20 +178,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple web-scraping framework
 test_files:
-- spec/data/propublica_search_page_2.html
-- spec/data/webinar.html
+- spec/data/discussion.html
+- spec/data/easttimor.html
 - spec/data/propublica-relative.html
 - spec/data/propublica.html
+- spec/data/propublica_search.html
+- spec/data/propublica_search_page_2.html
 - spec/data/prosecutor.html
 - spec/data/sixfacts.html
-- spec/data/discussion.html
-- spec/data/easttimor.html
-- spec/data/propublica_search.html
+- spec/data/webinar.html
 - spec/upton_spec.rb
 - spec/spec_helper.rb
 - spec/upton_downloader_spec.rb