errata 0.1.9 → 0.2.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/seamusabshere/errata"
     gem.authors = ["Seamus Abshere", "Andy Rossmeissl"]
     gem.add_dependency 'activesupport', '>=2.3.4'
-    gem.add_dependency 'remote_table', '>=0.2.7'
+    gem.add_development_dependency 'remote_table', '>=0.2.19'
     gem.require_path = "lib"
     gem.files.include %w(lib/erratum) unless gem.files.empty? # seems to fail once it's in the wild
     gem.rdoc_options << '--line-numbers' << '--inline-source'

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/errata.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{errata}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]
@@ -52,14 +52,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<remote_table>, [">= 0.2.7"])
+      s.add_development_dependency(%q<remote_table>, [">= 0.2.19"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<remote_table>, [">= 0.2.7"])
+      s.add_dependency(%q<remote_table>, [">= 0.2.19"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<remote_table>, [">= 0.2.7"])
+    s.add_dependency(%q<remote_table>, [">= 0.2.19"])
   end
 end
 

data/lib/errata.rb

@@ -7,7 +7,6 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'remote_table'
 require 'erratum'
 require 'erratum/delete'
 require 'erratum/reject'
@@ -19,11 +18,12 @@ require 'erratum/truncate'
 class Errata
   ERRATUM_TYPES = %w{delete replace simplify transform truncate}
 
-  attr_reader :klass
+  attr_reader :responder
+  attr_reader :table
   
   def initialize(options = {})
-    @klass = options[:klass]
-    @_table = RemoteTable.new(:url => options[:url])
+    @responder = options[:responder]
+    @table = options[:table]
   end
   
   def rejects?(row)
@@ -40,10 +40,10 @@ class Errata
   end
   
   def rejections
-    @_rejections ||= @_table.rows.map { |hash| hash.symbolize_keys!; ::Errata::Erratum::Reject.new(self, hash) if hash[:action] == 'reject' }.compact
+    @_rejections ||= table.rows.map { |hash| hash.symbolize_keys!; ::Errata::Erratum::Reject.new(self, hash) if hash[:action] == 'reject' }.compact
   end
   
   def corrections
-    @_corrections ||= @_table.rows.map { |hash| hash.symbolize_keys!; "::Errata::Erratum::#{hash[:action].camelcase}".constantize.new(self, hash) if ERRATUM_TYPES.include?(hash[:action]) }.compact
+    @_corrections ||= table.rows.map { |hash| hash.symbolize_keys!; "::Errata::Erratum::#{hash[:action].camelcase}".constantize.new(self, hash) if ERRATUM_TYPES.include?(hash[:action]) }.compact
   end
 end

data/lib/erratum.rb

@@ -1,7 +1,7 @@
 class Errata
   class Erratum
     attr_accessor :errata, :column, :matching_method
-    delegate :klass, :to => :errata
+    delegate :responder, :to => :errata
     
     def initialize(errata, options = {})
       raise "you can't set this from outside" if options[:prefix].present?
@@ -11,7 +11,7 @@ class Errata
     end
     
     def inspect
-      "<#{self.class.name}:#{object_id} klass=#{klass.name} column=#{column} matching_method=#{matching_method}"
+      "<#{self.class.name}:#{object_id} responder=#{responder.to_s} column=#{column} matching_method=#{matching_method}"
     end
     
     def targets?(row)
@@ -47,7 +47,7 @@ class Errata
     
     def method_matches?(row)
       return true if matching_method.nil?
-      klass.send(matching_method, row)
+      responder.send(matching_method, row)
     end
     
     def set_matching_expression(options = {})

data/test/errata_test.rb

@@ -1,68 +1,67 @@
 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

data/test/test_helper.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -42,9 +42,9 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 7
-        version: 0.2.7
-  type: :runtime
+        - 19
+        version: 0.2.19
+  type: :development
   version_requirements: *id002
 description: Correct strings based on remote errata files
 email: seamus@abshere.net