remote_table 0.2.19 → 0.2.20

data/Rakefile

@@ -15,6 +15,7 @@ begin
     gem.add_dependency 'activesupport', '>=2.3.4'
     gem.add_dependency 'slither', '>=0.99.3'
     gem.add_dependency 'nokogiri', '>=1.4.1'
+    gem.add_development_dependency 'errata', '>=0.2.0'
     gem.require_path = "lib"
     gem.rdoc_options << '--line-numbers' << '--inline-source'
     gem.requirements << 'curl'

data/VERSION

@@ -1 +1 @@
-0.2.19
+0.2.20

data/lib/remote_table.rb

@@ -1,5 +1,4 @@
 require 'digest/md5'
-require 'iconv'
 require 'uri'
 require 'tmpdir'
 require 'active_support'

data/lib/remote_table/transform.rb

@@ -1,6 +1,7 @@
 class RemoteTable
   class Transform
     attr_accessor :select, :reject, :transform_class, :transform_options, :transform, :raw_table
+    attr_accessor :errata
     
     def initialize(bus)
       if transform_params = bus.delete(:transform)
@@ -11,8 +12,10 @@ class RemoteTable
       end
       @select = bus[:select]
       @reject = bus[:reject]
+      @errata = bus[:errata]
     end
     
+    # the null transformation
     def apply(raw_table)
       self.raw_table = raw_table
       self
@@ -30,6 +33,10 @@ class RemoteTable
         row['row_hash'] = self.class.row_hash(row)
         virtual_rows = transform ? transform.apply(row) : row # allow transform.apply(row) to return multiple rows
         Array.wrap(virtual_rows).each do |virtual_row|
+          if errata
+            next if errata.rejects? virtual_row
+            errata.correct! virtual_row
+          end
           next if select and !select.call(virtual_row)
           next if reject and reject.call(virtual_row)
           yield virtual_row

data/remote_table.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remote_table}
-  s.version = "0.2.19"
+  s.version = "0.2.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-05-05}
   s.description = %q{Remotely open and parse Excel XLS, ODS, CSV and fixed-width tables.}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -61,12 +61,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<slither>, [">= 0.99.3"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_development_dependency(%q<errata>, [">= 0.2.0"])
     else
       s.add_dependency(%q<roo>, ["= 1.3.11"])
       s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<slither>, [">= 0.99.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_dependency(%q<errata>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<roo>, ["= 1.3.11"])
@@ -74,6 +76,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<slither>, [">= 0.99.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+    s.add_dependency(%q<errata>, [">= 0.2.0"])
   end
 end
 

data/test/remote_table_test.rb

@@ -36,6 +36,36 @@ class FuelOilParser
   end
 end
 
+class AircraftGuru
+  def is_not_attributed_to_aerospatiale?(row)
+    not row['Manufacturer'] =~ /AEROSPATIALE/i
+  end
+  
+  def is_not_attributed_to_cessna?(row)
+    not row['Manufacturer'] =~ /CESSNA/i
+  end
+  
+  def is_not_attributed_to_learjet?(row)
+    not row['Manufacturer'] =~ /LEAR/i
+  end
+  
+  def is_not_attributed_to_dehavilland?(row)
+    not row['Manufacturer'] =~ /DE ?HAVILLAND/i
+  end
+  
+  def is_not_attributed_to_mcdonnell_douglas?(row)
+    not row['Manufacturer'] =~ /MCDONNELL DOUGLAS/i
+  end
+  
+  def is_not_a_dc_plane?(row)
+    not row['Model'] =~ /DC/i
+  end
+  
+  def is_a_crj_900?(row)
+    row['Designator'].downcase == 'crj9'
+  end
+end
+
 class RemoteTableTest < Test::Unit::TestCase
   def setup
     @test2_rows_with_blanks = [
@@ -97,7 +127,24 @@ class RemoteTableTest < Test::Unit::TestCase
     end
   end
   
+  if ENV['ALL'] == 'true' or ENV['NEW'] == 'true'
+  end
+  
   if ENV['ALL'] == 'true' or ENV['FAST'] == 'true'
+    should "be able to apply errata files" do
+      t = RemoteTable.new :url => "http://www.faa.gov/air_traffic/publications/atpubs/CNT/5-2-G.htm",
+                          :encoding => 'US-ASCII',
+                          :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'),
+                                                :responder => AircraftGuru.new)
+      g1 = t.rows.detect { |row| row['Model'] =~ /Gulfstream I/ }
+      assert g1
+      assert_equal 'GRUMMAN', g1['Manufacturer']
+      assert_equal 'G159 Gulfstream I (TC4 Academe, VC4)', g1['Model']
+    end
+    
+    # this will die with an error about libcurl if your curl doesn't support ssl
     should "connect using HTTPS if available" do
       t = RemoteTable.new(:url => 'https://spreadsheets.google.com/pub?key=t5HM1KbaRngmTUbntg8JwPA')
       assert_equal 'Gulf Coast',     t.rows.first['PAD district name']

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 require 'ruby-debug'
+require 'errata'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,20 @@ dependencies:
         version: 1.4.1
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: errata
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :development
+  version_requirements: *id006
 description: Remotely open and parse Excel XLS, ODS, CSV and fixed-width tables.
 email: seamus@abshere.net
 executables: []