remote_table 1.2.3 → 1.2.4

data/lib/remote_table.rb

@@ -13,6 +13,7 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ::ActiveSupport::VERSION::MAJOR == 3
+require 'hash_digest'
 
 class Hash
   attr_accessor :row_hash
@@ -30,12 +31,11 @@ class RemoteTable
 
   # singletons
   autoload :Executor, 'remote_table/executor'
-  autoload :Hasher, 'remote_table/hasher'
   
   # Legacy
   class Transform
     def self.row_hash(row)
-      ::RemoteTable.hasher.hash row
+      ::HashDigest.hexdigest row
     end
   end
 
@@ -73,8 +73,8 @@ class RemoteTable
     else
       mark_download!
       retval = format.each do |row|
-        row.row_hash = ::RemoteTable.hasher.hash row
         transformer.transform(row).each do |virtual_row|
+          virtual_row.row_hash = ::HashDigest.hexdigest row
           if properties.errata
             next if properties.errata.rejects? virtual_row
             properties.errata.correct! virtual_row
@@ -121,11 +121,6 @@ class RemoteTable
     Executor.instance
   end
   
-  # Used internally to create unique hashes of rows.
-  def self.hasher
-    Hasher.instance
-  end
-  
   # Used internally to access to a downloaded copy of the file
   def local_file
     @local_file ||= LocalFile.new self

data/lib/remote_table/format.rb

@@ -37,8 +37,7 @@ class RemoteTable
     end
 
     def assume_utf8(str)
-      return if str.nil?
-      if ::RUBY_VERSION >= '1.9'
+      if str.is_a?(::String) and ::RUBY_VERSION >= '1.9'
         str.encode! t.properties.external_encoding
       else
         str

data/lib/remote_table/local_file.rb

@@ -58,6 +58,9 @@ class RemoteTable
         ::FileUtils.cp t.properties.uri.path, @path
       else
         # sabshere 1/20/11 FIXME: ::RemoteTable.config.curl_bin_path or smth
+        # sabshere 7/20/11 make web requests move more slowly so you don't get accused of DOS
+        sleep t.properties.delay_between_requests if t.properties.delay_between_requests
+        $stderr.puts "[remote_table] Downloading #{t.properties.uri.to_s}"
         ::RemoteTable.executor.backtick_with_reporting %{
           curl
           --silent

data/lib/remote_table/properties.rb

@@ -14,6 +14,10 @@ class RemoteTable
       current_options.update options
     end
     
+    def delay_between_requests
+      current_options['delay_between_requests'] || (::ENV.has_key?('REMOTE_TABLE_DELAY_BETWEEN_REQUESTS') ? ::ENV['REMOTE_TABLE_DELAY_BETWEEN_REQUESTS'].to_i : nil)
+    end
+    
     # The parsed URI of the file to get.
     def uri
       return @uri if @uri.is_a?(::URI)

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/remote_table.gemspec

@@ -19,26 +19,23 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency 'activesupport', '>=2.3.4'
-  s.add_dependency 'roo', '~>1.9'
-  s.add_dependency 'fixed_width-multibyte' # TODO replace with fixed_width once timon gets off vacation
-  s.add_dependency 'i18n' # activesupport?
-  s.add_dependency 'builder' # roo?
-  s.add_dependency 'zip' # roo
-  s.add_dependency 'nokogiri', '>=1.4.1' # roo
-  s.add_dependency 'spreadsheet' #roo
-  s.add_dependency 'google-spreadsheet-ruby' #roo
-  s.add_dependency 'escape', '>=0.0.4'
-  s.add_dependency 'posix-spawn'
-  s.add_dependency 'ensure-encoding'
-  s.add_dependency 'fastercsv', '>=1.5.0'
+  s.add_runtime_dependency 'activesupport', '>=2.3.4'
+  s.add_runtime_dependency 'roo', '~>1.9'
+  s.add_runtime_dependency 'fixed_width-multibyte' # TODO replace with fixed_width once timon gets off vacation
+  s.add_runtime_dependency 'i18n' # activesupport?
+  s.add_runtime_dependency 'builder' # roo?
+  s.add_runtime_dependency 'zip' # roo
+  s.add_runtime_dependency 'nokogiri', '>=1.4.1' # roo
+  s.add_runtime_dependency 'spreadsheet' #roo
+  s.add_runtime_dependency 'google-spreadsheet-ruby' #roo
+  s.add_runtime_dependency 'escape', '>=0.0.4'
+  s.add_runtime_dependency 'posix-spawn'
+  s.add_runtime_dependency 'ensure-encoding'
+  s.add_runtime_dependency 'fastercsv', '>=1.5.0'
+  s.add_runtime_dependency 'hash_digest'
 
   s.add_development_dependency 'errata', '>=0.2.0'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'shoulda'
-  if RUBY_VERSION >= '1.9'
-    s.add_development_dependency 'ruby-debug19'
-  else
-    s.add_development_dependency 'ruby-debug'
-  end
+  s.add_development_dependency 'rake'
 end

data/test/helper.rb

@@ -3,7 +3,6 @@ require 'bundler'
 Bundler.setup
 require 'test/unit'
 require 'shoulda'
-require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_old_transform.rb

@@ -40,5 +40,6 @@ class TestOldTransform < Test::Unit::TestCase
            :transform => { :class => NaturalGasParser })
     assert_equal 'Country', t[0]['locatable_type']
     assert_equal 'US', t[0]['locatable_id']
+    assert(t[0].row_hash.present?)
   end
 end

metadata

@@ -1,216 +1,223 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remote_table
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.4
   prerelease: 
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-21 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164990540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: roo
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2164990540
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: &2164990040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.9"
+      - !ruby/object:Gem::Version
+        version: '1.9'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fixed_width-multibyte
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2164990040
+- !ruby/object:Gem::Dependency
+  name: fixed_width-multibyte
+  requirement: &2164989660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2164989660
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2164989200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2164989200
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &2164988780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: zip
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2164988780
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: &2164988360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2164988360
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2164987860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: spreadsheet
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2164987860
+- !ruby/object:Gem::Dependency
+  name: spreadsheet
+  requirement: &2164987440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: google-spreadsheet-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2164987440
+- !ruby/object:Gem::Dependency
+  name: google-spreadsheet-ruby
+  requirement: &2164986980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: escape
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2164986980
+- !ruby/object:Gem::Dependency
+  name: escape
+  requirement: &2164986480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: posix-spawn
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2164986480
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: &2164986060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ensure-encoding
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2164986060
+- !ruby/object:Gem::Dependency
+  name: ensure-encoding
+  requirement: &2164985600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2164985600
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: &2164985100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: errata
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2164985100
+- !ruby/object:Gem::Dependency
+  name: hash_digest
+  requirement: &2164984680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2164984680
+- !ruby/object:Gem::Dependency
+  name: errata
+  requirement: &2164984140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *2164984140
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &2165000080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *2165000080
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2164999620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: *2164999620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2164999200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id017
-description: Gives you a standard way to parse various formats and treat them as an array of hashes.
-email: 
+  prerelease: false
+  version_requirements: *2164999200
+description: Gives you a standard way to parse various formats and treat them as an
+  array of hashes.
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitattributes
 - .gitignore
@@ -231,7 +238,6 @@ files:
 - lib/remote_table/format/mixins/textual.rb
 - lib/remote_table/format/open_office.rb
 - lib/remote_table/format/xml.rb
-- lib/remote_table/hasher.rb
 - lib/remote_table/local_file.rb
 - lib/remote_table/properties.rb
 - lib/remote_table/transformer.rb
@@ -257,35 +263,31 @@ files:
 - test/test_old_syntax.rb
 - test/test_old_transform.rb
 - test/test_remote_table.rb
-has_rdoc: true
 homepage: https://github.com/seamusabshere/remote_table
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: remotetable
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Open local or remote XLSX, XLS, ODS, CSV and fixed-width files.
-test_files: 
+test_files:
 - test/helper.rb
 - test/support/list-en1-semic-3.neooffice.binary.ods
 - test/support/list-en1-semic-3.neooffice.iso-8859-1.csv

data/lib/remote_table/hasher.rb

@@ -1,29 +0,0 @@
-require 'singleton'
-require 'digest/md5'
-require 'active_support'
-require 'active_support/version'
-%w{
-  active_support/core_ext/hash/keys
-  active_support/core_ext/object/to_query
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ::ActiveSupport::VERSION::MAJOR == 3
-class RemoteTable
-  class Hasher
-    include ::Singleton
-    def hash(row)
-      str = if row.is_a?(::Array)
-        tmp_ary = []
-        row.each_with_index do |v, i|
-          tmp_ary.push v.to_query(i.to_s)
-        end
-        tmp_ary
-      else
-        row.stringify_keys.keys.sort.map do |k|
-          row[k].to_query k
-        end
-      end.join('&')
-      ::Digest::MD5.hexdigest str
-    end
-  end
-end