test/errata_test.rb in errata-0.1.9 vs test/errata_test.rb in errata-0.2.0

@@ -1,69 +1,68 @@
 require 'test_helper'
 
-class AutomobileVariant
-  class << self
-    def transmission_is_blank?(row)
-      row['transmission'].blank?
-    end
+class AutomobileVariantGuru
+  def transmission_is_blank?(row)
+    row['transmission'].blank?
+  end
 
-    def is_a_2007_gmc_or_chevrolet?(row)
-      row['year'] == 2007 and %w(GMC CHEVROLET).include? row['MFR'].upcase
-    end
+  def is_a_2007_gmc_or_chevrolet?(row)
+    row['year'] == 2007 and %w(GMC CHEVROLET).include? row['MFR'].upcase
+  end
 
-    def is_a_porsche?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'PORSCHE' }
-    end
+  def is_a_porsche?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'PORSCHE' }
+  end
 
-    def is_not_a_porsche?(row)
-      !is_a_porsche? row
-    end
+  def is_not_a_porsche?(row)
+    !is_a_porsche? row
+  end
 
-    def is_a_mercedes_benz?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v =~ /MERCEDES/i }
-    end
+  def is_a_mercedes_benz?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v =~ /MERCEDES/i }
+  end
 
-    def is_a_lexus?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'LEXUS' }
-    end
+  def is_a_lexus?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'LEXUS' }
+  end
 
-    def is_a_bmw?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'BMW' }
-    end
+  def is_a_bmw?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'BMW' }
+  end
 
-    def is_a_ford?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'FORD' }
-    end
+  def is_a_ford?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'FORD' }
+  end
 
-    def is_a_rolls_royce_and_model_contains_bentley?(row)
-      is_a_rolls_royce?(row) and model_contains_bentley?(row)
-    end
+  def is_a_rolls_royce_and_model_contains_bentley?(row)
+    is_a_rolls_royce?(row) and model_contains_bentley?(row)
+  end
 
-    def is_a_bentley?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'BENTLEY' }
-    end
+  def is_a_bentley?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'BENTLEY' }
+  end
 
-    def is_a_rolls_royce?(row)
-      row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v =~ /ROLLS/i }
-    end
+  def is_a_rolls_royce?(row)
+    row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v =~ /ROLLS/i }
+  end
 
-    def is_a_turbo_brooklands?(row)
-      row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /TURBO R\/RL BKLDS/i }
-    end
+  def is_a_turbo_brooklands?(row)
+    row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /TURBO R\/RL BKLDS/i }
+  end
 
-    def model_contains_maybach?(row)
-      row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /MAYBACH/i }
-    end
-    
-    def model_contains_bentley?(row)
-      row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /BENTLEY/i }
-    end
+  def model_contains_maybach?(row)
+    row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /MAYBACH/i }
   end
+  
+  def model_contains_bentley?(row)
+    row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /BENTLEY/i }
+  end
 end
 
 class ErrataTest < Test::Unit::TestCase
   def setup
-    @e = Errata.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg', :klass => AutomobileVariant)
+    @e = Errata.new :table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg'),
+                    :responder => AutomobileVariantGuru.new
   end
     
   should "correct rows" do
     alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
     @e.correct!(alfa)