errata 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/errata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{errata}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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-05-06}
+  s.date = %q{2010-05-26}
   s.description = %q{Correct strings based on remote errata files}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [

data/lib/errata.rb

@@ -50,11 +50,7 @@ class Errata
     corrections.each { |erratum| erratum.correct!(row) }
     nil
   end
-  
-  def implied_matching_methods
-    (rejections + corrections).map { |erratum| erratum.matching_method }.compact.uniq
-  end
-  
+    
   def rejections
     @_rejections ||= table.rows.map { |hash| hash.symbolize_keys!; ::Errata::Erratum::Reject.new(self, hash) if hash[:action] == 'reject' }.compact
   end

data/lib/erratum/simplify.rb

@@ -13,7 +13,7 @@ class Errata
       end
       
       def targets?(row)
-        !row[column].blank? and !row[second_column].blank? and method_matches?(row) and matching_expression(row).match(row[column])
+        !row[column].blank? and !row[second_column].blank? and conditions_match?(row) and matching_expression(row).match(row[column])
       end
       
       def correct!(row)

data/lib/erratum.rb

@@ -1,21 +1,27 @@
 class Errata
   class Erratum
-    attr_accessor :errata, :column, :matching_method
+    attr_accessor :errata, :column, :options
     delegate :responder, :to => :errata
     
     def initialize(errata, options = {})
       raise "you can't set this from outside" if options[:prefix].present?
       @errata = errata
       @column = options[:section]
-      @matching_method = "#{options[:condition].gsub(/[^a-z0-9]/i, '_').downcase}?".to_sym if options[:condition].present?
+      @options = options
+    end
+    
+    def matching_methods
+      @_matching_methods ||= options[:condition].split(/\s+;\s+/).map do |method_id|
+        "#{method_id.strip.gsub(/[^a-z0-9]/i, '_').downcase}?"
+      end
     end
     
     def inspect
-      "<#{self.class.name}:#{object_id} responder=#{responder.to_s} column=#{column} matching_method=#{matching_method}"
+      "<#{self.class.name}:#{object_id} responder=#{responder.to_s} column=#{column} matching_methods=#{matching_methods.inspect}"
     end
     
     def targets?(row)
-      !!(method_matches?(row) and expression_matches?(row))
+      !!(conditions_match?(row) and expression_matches?(row))
     end
     
     def correct!(row, &block)
@@ -45,9 +51,8 @@ class Errata
       end
     end
     
-    def method_matches?(row)
-      return true if matching_method.nil?
-      responder.send(matching_method, row)
+    def conditions_match?(row)
+      matching_methods.all? { |method_id| responder.send method_id, row }
     end
     
     def set_matching_expression(options = {})

data/test/errata_test.rb

@@ -33,10 +33,6 @@ class AutomobileVariantGuru
     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_bentley?(row)
     row.slice('MFR', 'Manufacturer', 'carline_mfr_name').any? { |k, v| v.upcase == 'BENTLEY' }
   end
@@ -89,4 +85,10 @@ class ErrataTest < Test::Unit::TestCase
     e.correct!(alfa)
     assert_equal 'Alfa Romeo', alfa['carline_mfr_name']
   end
+  
+  should "try multiple conditions" do
+    bentley = { 'carline_mfr_name' => 'ROLLS-ROYCE BENTLEY', "carline name" => 'Super Bentley' }
+    @e.correct!(bentley)
+    assert_equal 'Bentley', bentley['carline_mfr_name']
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -04:00
+date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency