remote_table 1.0.1 → 1.0.2

data/lib/remote_table/properties.rb

@@ -168,9 +168,14 @@ class RemoteTable
       t.options['reject']
     end
     
-    # An Errata object (see the Errata gem at http://github.com/seamusabshere/errata) to be used on every row.
+    # A hash of options to create a new Errata instance (see the Errata gem at http://github.com/seamusabshere/errata) to be used on every row.
     def errata
-      t.options['errata']
+      return unless t.options.has_key? 'errata'
+      @errata ||= if t.options['errata'].is_a? ::Hash
+        ::Errata.new t.options['errata']
+      else
+        t.options['errata']
+      end
     end
     
     # Get the format in the form of RemoteTable::Format::Excel, etc.
@@ -201,6 +206,9 @@ class RemoteTable
         Format::FixedWidth
       when /htm/
         Format::HTML
+      when /txt/, /dat/
+        # legacy
+        Format::Delimited
       else
         raise Format::Unknown, clue
       end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/test_errata.rb

@@ -31,16 +31,29 @@ class AircraftGuru
 end
 
 class TestErrata < Test::Unit::TestCase
-  should "be able to apply errata files" do
+  should "be able to apply Errata instances directly" do
     t = RemoteTable.new :url => "http://www.faa.gov/air_traffic/publications/atpubs/CNT/5-2-G.htm",
                         :encoding => 'windows-1252',
                         :row_xpath => '//table/tr[2]/td/table/tr',
                         :column_xpath => 'td',
-                        :errata => Errata.new(:table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw'),
+                        :errata => Errata.new(:url => 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw',
                                               :responder => AircraftGuru.new)
     g1 = t.rows.detect { |row| row['Model'] =~ /Gulfstream I/ }
     assert g1
     assert_equal 'GULFSTREAM AEROSPACE', g1['Manufacturer']
     assert_equal 'Gulfstream I', g1['Model']
   end
+  
+  should "be able to apply erratas given a hash of options" do
+    t = RemoteTable.new :url => "http://www.faa.gov/air_traffic/publications/atpubs/CNT/5-2-G.htm",
+                        :encoding => 'windows-1252',
+                        :row_xpath => '//table/tr[2]/td/table/tr',
+                        :column_xpath => 'td',
+                        :errata => { :url => 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw',
+                                     :responder => AircraftGuru.new }
+    g1 = t.rows.detect { |row| row['Model'] =~ /Gulfstream I/ }
+    assert g1
+    assert_equal 'GULFSTREAM AEROSPACE', g1['Manufacturer']
+    assert_equal 'Gulfstream I', g1['Model']
+  end
 end

data/test/test_remote_table.rb

@@ -10,4 +10,18 @@ class TestRemoteTable < Test::Unit::TestCase
     t = RemoteTable.new(:url => 'www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx')
     assert_equal "59d68cfc1cd6b32f5b333d6f0e4bea6d", t[5]['row_hash']
   end
+  
+  should "open a google doc" do
+    t = RemoteTable.new 'http://spreadsheets.google.com/pub?key=tObVAGyqOkCBtGid0tJUZrw'
+    assert_equal 'Seamus Abshere', t[0]['name']
+  end
+  
+  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
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Seamus Abshere