remote_table 1.0.3 → 1.1.0

data/CHANGELOG

@@ -1,4 +1,8 @@
+1.1.0
+* Fixed difference in row hashes between Ruby 1.8 and 1.9
+* Properly required fastercsv depending on Ruby version
 1.0.0
+* Using bundler and gemspec instead of jeweler
 * Refactored to follow more Ruby conventions
 * Suggesting new syntax that looks more like an Enumerable... t[5] instead of t.rows[5]
 * Switching to string option keys (but old syntax is supported)

data/README.rdoc

@@ -28,8 +28,6 @@ See the test file and also data_miner examples of custom parsers.
 
 * The new parser syntax (aka transformer) hasn't been defined yet... only the old-style syntax is available
 * We currently call curl (and a lot of other utilities) using a shell. Is there a safer way to do this?
-* Row hashes may come out differently for Ruby 1.8 and Ruby 1.9, which ruins the whole purpose.
-* Since <tt>Enumerable</tt> provides <tt>#to_a</tt>, I'm not sure if it's caching the row loading.
 
 ==Authors
 

data/lib/remote_table.rb

@@ -9,9 +9,6 @@ require 'active_support/version'
   require active_support_3_requirement
 end if ::ActiveSupport::VERSION::MAJOR == 3
 
-# sabshere 1/25/11 sometimes people call Slither from add_hints! (deprecated)
-autoload :Slither, ::Gem.required_location('slither', 'slither.rb')
-
 class RemoteTable
   autoload :Format, 'remote_table/format'
   autoload :Properties, 'remote_table/properties'

data/lib/remote_table/format.rb

@@ -1,7 +1,5 @@
 class RemoteTable  
   class Format
-    class Unknown < StandardError; end
-    
     autoload :Excel, 'remote_table/format/excel'
     autoload :Excelx, 'remote_table/format/excelx'
     autoload :Delimited, 'remote_table/format/delimited'

data/lib/remote_table/hasher.rb

@@ -1,25 +1,23 @@
 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)
-      normalized_hash = if RUBY_VERSION >= '1.9'
-        row.keys.sort.inject(::Hash.new) do |memo, k|
-          normalized_k = k.to_s.toutf8
-          normalized_v = row[k].respond_to?(:to_s) ? row[k].to_s.toutf8 : row[k]
-          memo[normalized_k] = normalized_v
-          memo
-        end
-      else
-        ::Hash.new.replace(row)
-      end
-      # sabshere 1/21/11 may currently break across versions of ruby
-      # ruby-1.8.7-p174 > Marshal.dump({'a' => '1'})
-      #  => "\004\b{\006\"\006a\"\0061" 
-      # ruby-1.9.2-p0 > Marshal.dump({'a' => '1'})
-      # => "\x04\b{\x06I\"\x06a\x06:\x06ETI\"\x061\x06;\x00T"
-      ::Digest::MD5.hexdigest ::Marshal.dump(normalized_hash)
+      row = row.dup
+      row.stringify_keys!
+      str = row.keys.sort.map do |k|
+        row[k].to_query k
+      end.join('&')
+      ::Digest::MD5.hexdigest str
     end
   end
 end

data/lib/remote_table/local_file.rb

@@ -34,8 +34,9 @@ class RemoteTable
         # sabshere 1/20/11 FIXME: ::RemoteTable.config.curl_bin_path or smth
         ::RemoteTable.executor.backtick_with_reporting %{
           curl
-          --header "Expect: "
+          --silent
           --location
+          --header "Expect: "
           #{"--data #{::Escape.shell_single_word t.properties.form_data}" if t.properties.form_data.present?}
           --output #{::Escape.shell_single_word @path}
           #{::Escape.shell_single_word t.properties.uri.to_s}

data/lib/remote_table/properties.rb

@@ -192,7 +192,6 @@ class RemoteTable
       else
         ::File.extname t.local_file.path
       end
-      return Format::Delimited if clue.blank?
       case clue.downcase
       when /xlsx/, /excelx/
         Format::Excelx
@@ -206,11 +205,8 @@ class RemoteTable
         Format::FixedWidth
       when /htm/
         Format::HTML
-      when /txt/, /dat/
-        # legacy
-        Format::Delimited
       else
-        raise Format::Unknown, clue
+        Format::Delimited
       end
     end
   end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/remote_table.gemspec

@@ -20,8 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'activesupport', '>=2.3.4'
-  # sabshere 9/30/10 depending on fastercsv when using ruby 1.9.2 results in exiting with error
-  # s.add_dependency 'fastercsv', '>=1.5.0'
   s.add_dependency 'roo', '~>1.9'
   s.add_dependency 'slither', '>=0.99.4'
   s.add_dependency 'i18n' # activesupport?
@@ -31,8 +29,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'spreadsheet' #roo
   s.add_dependency 'google-spreadsheet-ruby' #roo
   s.add_dependency 'escape', '>=0.0.4'
+  unless RUBY_VERSION >= '1.9'
+    s.add_dependency 'fastercsv', '>=1.5.0'
+  end
+
   s.add_development_dependency 'errata', '>=0.2.0'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'shoulda'
-  s.add_development_dependency 'ruby-debug'
+  if RUBY_VERSION >= '1.9'
+    s.add_development_dependency 'ruby-debug19'
+  else
+    s.add_development_dependency 'ruby-debug'
+  end
 end

data/test/helper.rb

@@ -1,16 +1,9 @@
 require 'rubygems'
 require 'bundler'
-unless RUBY_VERSION >= '1.9'
-  gem 'fastercsv'
-  require 'fastercsv'
-end
 Bundler.setup
 require 'test/unit'
 require 'shoulda'
 require 'ruby-debug'
-# require 'ruby-debug'
-# require 'errata'
-# require 'active_support/all'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_remote_table.rb

@@ -8,7 +8,7 @@ class TestRemoteTable < Test::Unit::TestCase
   
   should "add a row hash to every row" do
     t = RemoteTable.new(:url => 'www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx')
-    assert_equal "59d68cfc1cd6b32f5b333d6f0e4bea6d", t[5]['row_hash']
+    assert_equal "06d8a738551c17735e2731e25c8d0461", t[5]['row_hash']
   end
   
   should "open a google doc" do
@@ -18,10 +18,6 @@ class TestRemoteTable < Test::Unit::TestCase
   
   should "return an ordered hash" do
     t = RemoteTable.new 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw'
-    if RUBY_VERSION >= '1.9'
-      assert_equal ::Hash, t[0].class
-    else
-      assert_equal ::ActiveSupport::OrderedHash, t[0].class
-    end
+    assert_equal ::ActiveSupport::OrderedHash, t[0].class
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -169,9 +169,25 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: errata
+  name: fastercsv
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: errata
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,11 +199,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: test-unit
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -197,11 +213,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -211,11 +227,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -225,7 +241,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 description: Gives you a standard way to parse various formats and treat them as an array of hashes.
 email: 
 - seamus@abshere.net