errata 0.2.4 → 1.0.1

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in errata.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Brighter Planet
+Copyright (c) 2011 Brighter Planet
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -8,13 +8,13 @@ Used by data_miner (http://github.com/seamusabshere/data_miner)
 
 ==Example
 
-Taken from <tt>#{GEMDIR}/test/errata_test.rb</tt>:
+Taken from <tt>#{GEMDIR}/test/test_old_syntax.rb</tt>:
 
   errata = Errata.new(:url => 'http://static.brighterplanet.com/science/data/transport/automobiles/make_fleet_years/errata.csv')
   rover = { 'manufacturer_name' => 'foobar Austin Rover foobar' }
   mercedes = { 'manufacturer_name' => 'MERCEDES' }
-  errata.correct!(mercedes)
-  errata.correct!(rover)
+  errata.correct! mercedes
+  errata.correct! rover
 
 Now you will have
 
@@ -28,4 +28,4 @@ Now you will have
 
 ==Copyright
 
-Copyright (c) 2009 Brighter Planet. See LICENSE for details.
+Copyright (c) 2011 Brighter Planet. See LICENSE for details.

data/Rakefile

@@ -1,66 +1,23 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "errata"
-    gem.summary = %Q{Correct strings based on remote errata files}
-    gem.description = %Q{Correct strings based on remote errata files}
-    gem.email = "seamus@abshere.net"
-    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.31'
-    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'
-    # gem.rubyforge_project = "errata"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
+require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
 begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
+  require 'rake/rdoctask'
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = 'rdoc'
+    rdoc.title = 'errata'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README*')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   end
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-
-
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "errata #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+   puts "Rdoc is not available"
 end

data/errata.gemspec

@@ -1,64 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "errata/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{errata}
-  s.version = "0.2.4"
+  s.name        = "errata"
+  s.version     = Errata::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Seamus Abshere", "Andy Rossmeissl"]
+  s.email       = ["seamus@abshere.net"]
+  s.homepage    = "https://github.com/seamusabshere/errata"
+  s.summary     = "Correct strings based on remote errata files"
+  s.description = %q{Correct strings based on remote errata files.}
 
-  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-09-30}
-  s.description = %q{Correct strings based on remote errata files}
-  s.email = %q{seamus@abshere.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "errata.gemspec",
-     "lib/errata.rb",
-     "lib/erratum.rb",
-     "lib/erratum/delete.rb",
-     "lib/erratum/reject.rb",
-     "lib/erratum/replace.rb",
-     "lib/erratum/simplify.rb",
-     "lib/erratum/transform.rb",
-     "lib/erratum/truncate.rb",
-     "test/errata_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/seamusabshere/errata}
-  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Correct strings based on remote errata files}
-  s.test_files = [
-    "test/errata_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "errata"
 
-    if Gem::Version.new(Gem::VERSION) >= 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.31"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<remote_table>, [">= 0.2.31"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<remote_table>, [">= 0.2.31"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency 'activesupport', '>=2.3.4'
+  s.add_dependency 'remote_table', '~>1'
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'ruby-debug'
 end
-

data/lib/errata/erratum/delete.rb

@@ -0,0 +1,16 @@
+class Errata
+  class Erratum
+    class Delete < Erratum
+      def backfill
+        # otherwise abbr(X) will kill the characters before and after the match
+        @backfill ||= /\Aabbr\((.*)\)\z/.match(options['x']) ? '\1\2' : ''
+      end
+            
+      def correct!(row)
+        super(row) do
+          row[section].gsub! matching_expression, backfill
+        end
+      end
+    end
+  end
+end

data/lib/errata/erratum/reject.rb

@@ -0,0 +1,9 @@
+class Errata
+  class Erratum
+    class Reject < Erratum
+      def correct!
+        raise "rejections don't correct"
+      end
+    end
+  end
+end

data/lib/errata/erratum/replace.rb

@@ -0,0 +1,19 @@
+class Errata
+  class Erratum
+    class Replace < Erratum
+      def correction
+        @correction ||= /\Aabbr\((.*)\)\z/.match(options['x']) ? '\1' + options['y'].to_s + '\2' : options['y'].to_s
+      end
+
+      def correct!(row)
+        super(row) do
+          if matching_expression.blank?
+            row[section] = correction.dup
+          else
+            row[section].gsub! matching_expression, correction
+          end
+        end
+      end
+    end
+  end
+end

data/lib/errata/erratum/simplify.rb

@@ -0,0 +1,23 @@
+class Errata
+  class Erratum
+    class Simplify < Erratum
+      def second_section
+        options['x']
+      end
+
+      def targets?(row)
+        !row[section].blank? and !row[second_section].blank? and conditions_match?(row) and special_matcher(row).match(row[section])
+      end
+      
+      def correct!(row)
+        super(row) do
+          row[section].gsub! special_matcher(row), ''
+        end
+      end
+      
+      def special_matcher(row)
+        /[\s\(\[\'\"]*#{::Regexp.escape(row[second_section])}[\s\)\]\'\"]*/
+      end
+    end
+  end
+end

data/lib/errata/erratum/transform.rb

@@ -0,0 +1,18 @@
+class Errata
+  class Erratum
+    class Transform < Erratum
+      ALLOWED_METHODS = %w{upcase downcase}
+
+      def string_method
+        raise %{string method "#{options['y']}" not allowed} unless ALLOWED_METHODS.include? options['y']
+        options['y']
+      end
+      
+      def correct!(row)
+        super(row) do
+          row[section].gsub!(matching_expression) { |match| match.send string_method }
+        end
+      end
+    end
+  end
+end

data/lib/errata/erratum/truncate.rb

@@ -0,0 +1,15 @@
+class Errata
+  class Erratum
+    class Truncate < Erratum
+      def necessary_and_sufficient_prefix
+        options['x']
+      end
+
+      def correct!(row)
+        super(row) do
+          row[section] = necessary_and_sufficient_prefix.dup
+        end
+      end
+    end
+  end
+end

data/lib/errata/erratum.rb

@@ -0,0 +1,83 @@
+class Errata
+  class Erratum
+    autoload :Delete, 'errata/erratum/delete'
+    autoload :Reject, 'errata/erratum/reject'
+    autoload :Replace, 'errata/erratum/replace'
+    autoload :Simplify, 'errata/erratum/simplify'
+    autoload :Transform, 'errata/erratum/transform'
+    autoload :Truncate, 'errata/erratum/truncate'
+    
+    attr_reader :errata
+    attr_reader :options
+    
+    def initialize(errata, options = {})
+      @errata = errata
+      @options = options.dup
+    end
+    
+    def section
+      options['section']
+    end
+    
+    def responder
+      errata.responder
+    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 targets?(row)
+      !!(conditions_match?(row) and expression_matches?(row))
+    end
+    
+    def correct!(row, &blk)
+      return :skipped unless targets? row
+      yield if block_given?
+      :corrected
+    end
+
+    def expression_matches?(row)
+      return true if matching_expression.blank? or section.blank?
+      if matching_expression.is_a? ::Regexp
+        matching_expression.match row[section].to_s
+      else
+        row[section].to_s.include? matching_expression
+      end
+    end
+    
+    def conditions_match?(row)
+      matching_methods.all? { |method_id| responder.send method_id, row }
+    end
+        
+    def matching_expression
+      return @_matching_expression[0] if @_matching_expression.is_a? ::Array
+      @_matching_expression = []
+      @_matching_expression[0] = if options['x'].blank?
+        nil
+      elsif options['x'].start_with? '/'
+        if options['x'].end_with? 'i'
+          ci = true
+          expr = options['x'].chop
+        else
+          ci = false
+          expr = options['x'].dup
+        end
+        expr.gsub! /\A\/|\/\z/, ''
+        ::Regexp.new expr, ci
+      elsif /\Aabbr\((.*)\)\z/.match options['x']
+        abbr = $1.split(/(\w\??)/).reject { |a| a == '' }.join('\.?\s?') + '\.?([^\w\.]|\z)'
+        expr = '(\A|\s)' + abbr
+        ::Regexp.new expr, true
+      elsif %w{reject truncate}.include? options['action']
+        expr = '\A\s*' + ::Regexp.escape(options['x'])
+        ::Regexp.new expr, true
+      else
+        options['x']
+      end
+      @_matching_expression[0]
+    end
+  end
+end

data/lib/errata/version.rb

@@ -0,0 +1,3 @@
+class Errata
+  VERSION = '1.0.1'
+end

data/lib/errata.rb

@@ -1,45 +1,31 @@
 require 'active_support'
 require 'active_support/version'
 %w{
-  active_support/core_ext/module/delegation
   active_support/core_ext/hash/keys
   active_support/core_ext/hash/slice
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
-end if ActiveSupport::VERSION::MAJOR == 3
+end if ::ActiveSupport::VERSION::MAJOR == 3
 require 'remote_table'
-require 'erratum'
-require 'erratum/delete'
-require 'erratum/reject'
-require 'erratum/replace'
-require 'erratum/simplify'
-require 'erratum/transform'
-require 'erratum/truncate'
 
 class Errata
-  ERRATUM_TYPES = %w{delete replace simplify transform truncate}
+  autoload :Erratum, 'errata/erratum'
+  
+  ERRATUM_TYPES = %w{delete replace simplify transform truncate reject}
 
   attr_reader :options
   
   # Arguments
-  # * <tt>:responder</tt> (required) - normally you pass this something like Guru.new, which should respond to questions like #is_a_bentley?. If you pass a string, it will be lazily constantized and a new object initialized from it; for example, 'Guru' will lead to 'Guru'.constantize.new.
-  # * <tt>:table</tt> - takes something that acts like a RemoteTable
-  # If and only if you don't pass <tt>:table</tt>, all other options will be passed to a new RemoteTable (for example, <tt>:url</tt>, etc.)
+  # * <tt>'responder'</tt> (required) - normally you pass this something like Guru.new, which should respond to questions like #is_a_bentley?. If you pass a string, it will be lazily constantized and a new object initialized from it; for example, 'Guru' will lead to 'Guru'.constantize.new.
+  # * <tt>'table'</tt> - takes something that acts like a RemoteTable
+  # If and only if you don't pass <tt>'table'</tt>, all other options will be passed to a new RemoteTable (for example, <tt>'url'</tt>, etc.)
   def initialize(options = {})
-    options.symbolize_keys!
-    @options = options
-  end
-  
-  def table
-    @_table ||= if options[:table].present?
-      options[:table]
-    else
-      RemoteTable.new options.except(:responder)
-    end
+    @options = options.dup
+    @options.stringify_keys!
   end
   
   def responder
-    @_responder ||= (options[:responder].is_a?(String) ? options[:responder].constantize.new : options[:responder])
+    options['responder'].is_a?(::String) ? options['responder'].constantize.new : options['responder']
   end
   
   def rejects?(row)
@@ -50,12 +36,19 @@ class Errata
     corrections.each { |erratum| erratum.correct!(row) }
     nil
   end
-    
+  
+  def errata
+    @errata ||= (options['table'] ? options['table'] : ::RemoteTable.new(options.except('responder'))).map do |erratum_description|
+      next unless ERRATUM_TYPES.include? erratum_description['action']
+      "::Errata::Erratum::#{erratum_description['action'].camelcase}".constantize.new self, erratum_description
+    end.compact
+  end
+  
   def rejections
-    @_rejections ||= table.rows.map { |hash| hash.symbolize_keys!; ::Errata::Erratum::Reject.new(self, hash) if hash[:action] == 'reject' }.compact
+    errata.select { |erratum| erratum.is_a? ::Errata::Erratum::Reject }
   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
+    errata.select { |erratum| not erratum.is_a? ::Errata::Erratum::Reject }
   end
 end

data/test/{test_helper.rb → helper.rb}

@@ -1,10 +1,17 @@
 require 'rubygems'
+require 'bundler'
+unless RUBY_VERSION >= '1.9'
+  gem 'fastercsv'
+  require 'fastercsv'
+end
+Bundler.setup
 require 'test/unit'
 require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+unless RUBY_VERSION >= '1.9'
+  require 'ruby-debug'
+end
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'errata'))
-
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'errata'
 class Test::Unit::TestCase
 end

data/test/{errata_test.rb → test_old_syntax.rb}

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'helper'
 
 class AutomobileVariantGuru
   def transmission_is_blank?(row)
@@ -54,7 +54,7 @@ class AutomobileVariantGuru
   end
 end
 
-class ErrataTest < Test::Unit::TestCase
+class TestOldSyntax < Test::Unit::TestCase
   def setup
     @e = Errata.new :table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg'),
                     :responder => AutomobileVariantGuru.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: errata
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 21
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -05:00
+date: 2011-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,52 +41,91 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 1
         segments: 
-        - 0
-        - 2
-        - 31
-        version: 0.2.31
+        - 1
+        version: "1"
   type: :runtime
   version_requirements: *id002
-description: Correct strings based on remote errata files
-email: seamus@abshere.net
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+description: Correct strings based on remote errata files.
+email: 
+- seamus@abshere.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - errata.gemspec
 - lib/errata.rb
-- lib/erratum.rb
-- lib/erratum/delete.rb
-- lib/erratum/reject.rb
-- lib/erratum/replace.rb
-- lib/erratum/simplify.rb
-- lib/erratum/transform.rb
-- lib/erratum/truncate.rb
-- test/errata_test.rb
-- test/test_helper.rb
+- lib/errata/erratum.rb
+- lib/errata/erratum/delete.rb
+- lib/errata/erratum/reject.rb
+- lib/errata/erratum/replace.rb
+- lib/errata/erratum/simplify.rb
+- lib/errata/erratum/transform.rb
+- lib/errata/erratum/truncate.rb
+- lib/errata/version.rb
+- test/helper.rb
+- test/test_old_syntax.rb
 has_rdoc: true
-homepage: http://github.com/seamusabshere/errata
+homepage: https://github.com/seamusabshere/errata
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-- --line-numbers
-- --inline-source
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,11 +148,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: errata
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Correct strings based on remote errata files
 test_files: 
-- test/errata_test.rb
-- test/test_helper.rb
+- test/helper.rb
+- test/test_old_syntax.rb

data/VERSION

@@ -1 +0,0 @@
-0.2.4

data/lib/erratum/delete.rb

@@ -1,24 +0,0 @@
-class Errata
-  class Erratum
-    class Delete < Erratum
-      attr_accessor :matching_expression, :backfill
-      
-      def initialize(errata, options = {})
-        super
-        set_matching_expression(options)
-        # otherwise abbr(X) will kill the characters before and after the match
-        @backfill = /\Aabbr\((.*)\)\z/.match(options[:x]) ? '\1\2' : ''
-      end
-      
-      def inspect
-        super + " matching_expression=#{matching_expression}>"
-      end
-      
-      def correct!(row)
-        super(row) do
-          row[column].gsub!(matching_expression, backfill)
-        end
-      end
-    end
-  end
-end

data/lib/erratum/reject.rb

@@ -1,20 +0,0 @@
-class Errata
-  class Erratum
-    class Reject < Erratum
-      attr_accessor :matching_expression
-      
-      def initialize(errata, options = {})
-        super
-        set_matching_expression(options.merge(:prefix => true))
-      end
-      
-      def inspect
-        super + " matching_expression=#{matching_expression}"
-      end
-      
-      def correct!
-        raise "rejections don't correct"
-      end
-    end
-  end
-end

data/lib/erratum/replace.rb

@@ -1,27 +0,0 @@
-class Errata
-  class Erratum
-    class Replace < Erratum
-      attr_accessor :matching_expression, :correction
-      
-      def initialize(errata, options = {})
-        super
-        set_matching_expression(options)
-        @correction = /\Aabbr\((.*)\)\z/.match(options[:x]) ? '\1' + options[:y].to_s + '\2' : options[:y].to_s
-      end
-      
-      def inspect
-        super + " matching_expression=#{matching_expression} correction=#{correction}>"
-      end
-      
-      def correct!(row)
-        super(row) do
-          if matching_expression.blank?
-            row[column] = correction
-          else
-            row[column].gsub!(matching_expression, correction)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/erratum/simplify.rb

@@ -1,31 +0,0 @@
-class Errata
-  class Erratum
-    class Simplify < Erratum
-      attr_accessor :second_column
-      
-      def initialize(errata, options = {})
-        super
-        @second_column = options[:x]
-      end
-
-      def inspect
-        super + " second_column=#{second_column}>"
-      end
-      
-      def targets?(row)
-        !row[column].blank? and !row[second_column].blank? and conditions_match?(row) and matching_expression(row).match(row[column])
-      end
-      
-      def correct!(row)
-        super(row) do
-          row[column].gsub!(matching_expression(row), '')
-        end
-      end
-      
-      def matching_expression(row)
-        @_matching_expressions ||= {}
-        @_matching_expressions[row[second_column]] ||= /[\s\(\[\'\"]*#{Regexp.escape(row[second_column])}[\s\)\]\'\"]*/
-      end
-    end
-  end
-end

data/lib/erratum/transform.rb

@@ -1,25 +0,0 @@
-class Errata
-  class Erratum
-    class Transform < Erratum
-      ALLOWED_METHODS = %w{upcase downcase}
-      attr_accessor :matching_expression, :string_method
-      
-      def initialize(errata, options = {})
-        super
-        set_matching_expression(options)
-        @string_method = options[:y]
-        raise "string method (#{@string_method}) needs to be in (#{ALLOWED_METHODS.join(', ')})" unless ALLOWED_METHODS.include?(@string_method)
-      end
-      
-      def inspect
-        super + " matching_expression=#{matching_expression} string_method=#{string_method}>"
-      end
-      
-      def correct!(row)
-        super(row) do
-          row[column].gsub!(matching_expression) { |match| match.send(string_method) }
-        end
-      end
-    end
-  end
-end

data/lib/erratum/truncate.rb

@@ -1,24 +0,0 @@
-class Errata
-  class Erratum
-    class Truncate < Erratum
-      attr_accessor :matching_expression, :necessary_and_sufficient_prefix
-      
-      def initialize(errata, options = {})
-        super
-        @necessary_and_sufficient_prefix = options[:x]
-        raise "necessary_and_sufficient_prefix cannot be blank" if @necessary_and_sufficient_prefix.blank?
-        set_matching_expression(options.merge(:prefix => true))
-      end
-
-      def inspect
-        super + " matching_expression=#{matching_expression} necessary_and_sufficient_prefix=#{necessary_and_sufficient_prefix}>"
-      end
-      
-      def correct!(row)
-        super(row) do
-          row[column] = necessary_and_sufficient_prefix
-        end
-      end
-    end
-  end
-end

data/lib/erratum.rb

@@ -1,78 +0,0 @@
-class Errata
-  class Erratum
-    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]
-      @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_methods=#{matching_methods.inspect}"
-    end
-    
-    def targets?(row)
-      !!(conditions_match?(row) and expression_matches?(row))
-    end
-    
-    def correct!(row, &block)
-      return :skipped unless targets?(row)
-      # old_value = row[column].to_s.dup
-      yield if block_given?
-      # unless name.demodulize.underscore == 'truncate' or name.demodulize.underscore == 'simplify'
-      #   puts "-" * 64
-      #   puts inspect
-      #   puts row.inspect
-      #   if row[column] != old_value
-      #     puts "#{old_value} -> #{row[column]}"
-      #   else
-      #     puts "no change"
-      #   end
-      #   puts
-      # end
-      :corrected
-    end
-
-    def expression_matches?(row)
-      return true if matching_expression.blank? or column.blank?
-      if matching_expression.is_a?(Regexp)
-        matching_expression.match(row[column].to_s)
-      else
-        row[column].to_s.include?(matching_expression)
-      end
-    end
-    
-    def conditions_match?(row)
-      matching_methods.all? { |method_id| responder.send method_id, row }
-    end
-    
-    def set_matching_expression(options = {})
-      if options[:x].blank?
-        @matching_expression = nil
-      elsif options[:x].start_with?('/')
-        if options[:x].end_with?('i')
-          ci = true
-          options[:x] = options[:x].chop
-        else
-          ci = false
-        end
-        @matching_expression = Regexp.new(options[:x].gsub(/\A\/|\/\z/, ''), ci)
-      elsif /\Aabbr\((.*)\)\z/.match(options[:x])
-        @matching_expression = Regexp.new('(\A|\s)' + $1.split(/(\w\??)/).reject { |a| a == '' }.join('\.?\s?') + '\.?([^\w\.]|\z)', true)
-      elsif options[:prefix] == true
-        @matching_expression = Regexp.new('\A\s*' + Regexp.escape(options[:x]), true)
-      else
-        @matching_expression = options[:x]
-      end
-    end
-  end
-end