errata 1.0.3 → 1.1.0

data/.gitignore

@@ -1,7 +1,8 @@
 *.sw?
 .DS_Store
 coverage
-rdoc
+doc
 pkg
 Gemfile.lock
 *.gem
+.yardoc

data/CHANGELOG

@@ -0,0 +1,14 @@
+1.1.0 / 2012-05-03
+
+* Breaking changes
+
+  * Errata#options is no longer available for introspection. Use Errata#lazy_load_table_options and Errata#responder if that helps.
+
+* Enhancements
+
+  * Tested on MRI 1.8, MRI 1.9, and JRuby 1.6.7+
+  * Modernize Rakefile and test helper
+  * Got rid of autoload and made thread-safe in general
+  * Convert to minitest
+  * Strictly correct lazy-loading
+  * Added warnings for deprecated usage styles.

data/Gemfile

@@ -1,4 +1,12 @@
-source "http://rubygems.org"
+source :rubygems
 
-# Specify your gem's dependencies in errata.gemspec
 gemspec
+
+# development dependencies
+gem 'minitest'
+gem 'minitest-reporters'
+gem 'rake'
+gem 'yard'
+unless RUBY_VERSION >= '1.9'
+  gem 'fastercsv'
+end

data/README.md

@@ -0,0 +1,181 @@
+# errata
+
+Correct strings based on remote errata files.
+
+# Example
+
+Every errata has a table structure based on the [IETF RFC Editor's "How to Report Errata"](http://www.rfc-editor.org/how_to_report.html).
+
+<table>
+  <tr>
+    <th>date</th>
+    <th>name</th>
+    <th>email</th>
+    <th>type</th>
+    <th>section</th>
+    <th>action</th>
+    <th>x</th>
+    <th>y</th>
+    <th>condition</th>
+    <th>notes</th>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>meta</td>
+    <td>Intended use</td>
+    <td></td>
+    <td>http://example.com/original-data-with-errors.xls</td>
+    <td></td>
+    <td></td>
+    <td>A hypothetical document that uses non-ISO country names</td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/ANTIGUA &amp; BARBUDA/</td>
+    <td>ANTIGUA AND BARBUDA</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/BOLIVIA/</td>
+    <td>BOLIVIA, PLURINATIONAL STATE OF</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/BOSNIA &amp; HERZEGOVINA/</td>
+    <td>BOSNIA AND HERZEGOVINA</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/BRITISH VIRGIN ISLANDS/</td>
+    <td>VIRGIN ISLANDS, BRITISH</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/COTE D'IVOIRE/</td>
+    <td>CÔTE D'IVOIRE</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/DEM\. PEOPLE'S REP\. OF KOREA/</td>
+    <td>KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/DEM\. REP\. OF THE CONGO/</td>
+    <td>CONGO, THE DEMOCRATIC REPUBLIC OF THE</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/HONG KONG SAR/</td>
+    <td>HONG KONG</td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2011-03-22</td>
+    <td>Ian Hough</td>
+    <td>ian@brighterplanet.com</td>
+    <td>technical</td>
+    <td>Country Name</td>
+    <td>replace</td>
+    <td>/IRAN \(ISLAMIC REPUBLIC OF\)/</td>
+    <td>IRAN, ISLAMIC REPUBLIC OF</td>
+    <td></td>
+    <td></td>
+  </tr>
+</table>
+
+Which would be saved as a CSV:
+
+    date,name,email,type,section,action,x,y,condition,notes
+    2011-03-22,Ian Hough,ian@brighterplanet.com,meta,Intended use,,http://example.com/original-data-with-errors.xls,,A hypothetical document that uses non-ISO country names
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/ANTIGUA & BARBUDA/,ANTIGUA AND BARBUDA,,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/BOLIVIA/,"BOLIVIA, PLURINATIONAL STATE OF",,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/BOSNIA & HERZEGOVINA/,BOSNIA AND HERZEGOVINA,,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/BRITISH VIRGIN ISLANDS/,"VIRGIN ISLANDS, BRITISH",,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/COTE D'IVOIRE/,CÔTE D'IVOIRE,,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/DEM\.  PEOPLE'S REP\. OF KOREA/,"KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF",,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/DEM\. REP\. OF THE CONGO/,"CONGO, THE DEMOCRATIC REPUBLIC OF THE",,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/HONG KONG SAR/,HONG KONG,,
+    2011-03-22,Ian Hough,ian@brighterplanet.com,technical,Country Name,replace,/IRAN \(ISLAMIC REPUBLIC OF\)/,"IRAN, ISLAMIC REPUBLIC OF",,
+
+And then used
+
+    errata = Errata.new(:url => 'http://example.com/errata.csv')
+    original = RemoteTable.new(:url => 'http://example.com/original-data-with-errors.xls')
+    original.each do |row|
+      errata.correct! row # destructively correct each row
+    end
+
+## UTF-8
+
+Assumes all input strings are UTF-8. Otherwise there can be problems with Ruby 1.9 and Regexp::FIXEDENCODING. Specifically, ASCII-8BIT regexps might be applied to UTF-8 strings (or vice-versa), resulting in Encoding::CompatibilityError.
+
+## Real-life usage
+
+Used by [data_miner](http://github.com/seamusabshere/data_miner)
+
+## Authors
+
+* Seamus Abshere <seamus@abshere.net>
+* Andy Rossmeissl <andy@rossmeissl.net>
+
+## Copyright
+
+Copyright (c) 2011 Brighter Planet. See LICENSE for details.

data/Rakefile

@@ -1,25 +1,17 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  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
-   puts "Rdoc is not available"
+require 'yard'
+YARD::Rake::YardocTask.new do |y|
+  y.options << '--no-private'
 end
 
 task :default => :test

data/errata.gemspec

@@ -1,11 +1,9 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "errata/version"
+require File.expand_path("../lib/errata/version", __FILE__)
 
 Gem::Specification.new do |s|
   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"
@@ -22,6 +20,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>=2.3.4'
   s.add_dependency 'remote_table', '>=1.1.7'
   s.add_dependency 'to_regexp', '>= 0.0.2'
-  s.add_development_dependency 'test-unit'
-  s.add_development_dependency 'shoulda'
 end

data/lib/errata.rb

@@ -1,33 +1,47 @@
+require 'thread'
+
 require 'active_support'
 require 'active_support/version'
-%w{
-  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
+if ::ActiveSupport::VERSION::MAJOR >= 3
+  require 'active_support/core_ext'
+end
 require 'remote_table'
 
+require 'errata/erratum'
+
 class Errata
-  autoload :Erratum, 'errata/erratum'
-  
-  ERRATUM_TYPES = %w{delete replace simplify transform truncate reject}
+  CORRECTIONS = %w{delete replace simplify transform truncate reject}
+
+  attr_reader :lazy_load_table_options
+  attr_reader :lazy_load_responder_class_name
 
-  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 = options.dup
-    @options.stringify_keys!
-  end
-  
-  def responder
-    options['responder'].is_a?(::String) ? options['responder'].constantize.new : options['responder']
+    options = options.symbolize_keys
+
+    responder = options.delete :responder
+    raise "[errata] :responder is required" unless responder
+    if responder.is_a?(::String)
+      @lazy_load_responder_mutex = ::Mutex.new
+      @lazy_load_responder_class_name = responder
+    else
+      ::Kernel.warn %{[errata] Passing an object as :responder is deprecated. It's recommended to pass a class name instead, which will be constantized and instantiated with no arguments.}
+      @responder = responder
+    end
+
+    if table = options.delete(:table)
+      ::Kernel.warn %{[errata] Passing :table is deprecated. It's recommended to pass table options instead.}
+      @table = table
+    else
+      @lazy_load_table_options = options
+    end
+
+    @set_rejections_and_corrections_mutex = ::Mutex.new
   end
-  
+    
   def rejects?(row)
     rejections.any? { |erratum| erratum.targets?(row) }
   end
@@ -36,21 +50,53 @@ class Errata
     corrections.each { |erratum| erratum.correct!(row) }
     nil
   end
-  
-  def errata
-    @errata ||= (options['table'] ? options['table'] : ::RemoteTable.new(options.except('responder'))).inject([]) do |memo, erratum_description|
-      if ERRATUM_TYPES.include? erratum_description['action']
-        memo.push "::Errata::Erratum::#{erratum_description['action'].camelcase}".constantize.new self, erratum_description
+
+  def responder
+    @responder || @lazy_load_responder_mutex.synchronize do
+      @responder ||= lazy_load_responder_class_name.constantize.new
+    end
+  end
+
+  private
+
+  def set_rejections_and_corrections!
+    return if @set_rejections_and_corrections == true
+    @set_rejections_and_corrections_mutex.synchronize do
+      return if @set_rejections_and_corrections == true
+
+      if @table
+        table = @table
+        @table = nil # won't need this again
+      else
+        table = ::RemoteTable.new lazy_load_table_options
+      end
+
+      rejections = []
+      corrections = []
+
+      table.each do |erratum_initializer|
+        erratum_initializer = erratum_initializer.symbolize_keys
+        action = erratum_initializer[:action].downcase
+        if action == 'reject'
+          rejections << Erratum::Reject.new(responder, erratum_initializer)
+        elsif CORRECTIONS.include?(action)
+          corrections << Erratum.const_get(action.camelcase).new(responder, erratum_initializer)
+        end
       end
-      memo
+
+      @rejections = rejections
+      @corrections = corrections
+      @set_rejections_and_corrections = true
     end
   end
   
   def rejections
-    errata.select { |erratum| erratum.is_a? ::Errata::Erratum::Reject }
+    set_rejections_and_corrections!
+    @rejections
   end
   
   def corrections
-    errata.select { |erratum| not erratum.is_a? ::Errata::Erratum::Reject }
+    set_rejections_and_corrections!
+    @corrections
   end
 end

data/lib/errata/erratum.rb

@@ -1,36 +1,50 @@
 require 'to_regexp'
 
+require 'errata/erratum/delete'
+require 'errata/erratum/reject'
+require 'errata/erratum/replace'
+require 'errata/erratum/simplify'
+require 'errata/erratum/transform'
+require 'errata/erratum/truncate'
+
 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
+    SEMICOLON_DELIMITER = /\s*;\s*/
+    SPECIAL_ABBR = /\Aabbr\((.*)\)\z/
+    REJECT_ACTIONS = %w{reject truncate}
+
+    attr_reader :responder
+    attr_reader :section
+    attr_reader :matching_methods
+    attr_reader :matching_expression
     
-    def section
-      options['section']
+    def initialize(responder, options = {})
+      @responder = responder
+      @section = options[:section]
+      @matching_methods = options[:condition].split(SEMICOLON_DELIMITER).map do |method_id|
+        method_id.strip.gsub(/\W/, '_').downcase + '?'
+      end
+      @matching_expression = if options[:x].blank?
+        nil
+      elsif (options[:x].start_with?('/') or options[:x].start_with?('%r{')) and as_regexp = options[:x].as_regexp
+        ::Regexp.new(*as_regexp)
+      elsif SPECIAL_ABBR.match options[:x]
+        @abbr_query = true
+        abbr = $1.split(/(\w\??)/).reject { |a| a == '' }.join('\.?\s?') + '\.?([^\w\.]|\z)'
+        expr = '(\A|\s)' + abbr
+        ::Regexp.new expr, true
+      elsif REJECT_ACTIONS.include? options[:action]
+        expr = '\A\s*' + ::Regexp.escape(options[:x])
+        ::Regexp.new expr, true
+      else
+        options[:x]
+      end
     end
-    
-    def responder
-      errata.responder
+
+    def abbr?
+      @abbr_query == true
     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
@@ -48,25 +62,5 @@ class Errata
     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?('/') or options['x'].start_with?('%r{')) and as_regexp = options['x'].as_regexp
-        ::Regexp.new(*as_regexp)
-      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/erratum/delete.rb

@@ -1,9 +1,16 @@
 class Errata
   class Erratum
     class Delete < Erratum
-      def backfill
+      attr_reader :backfill
+
+      def initialize(responder, options = {})
+        super
         # otherwise abbr(X) will kill the characters before and after the match
-        @backfill ||= /\Aabbr\((.*)\)\z/.match(options['x']) ? '\1\2' : ''
+        @backfill = if abbr?
+          '\1\2'
+        else
+          ''
+        end
       end
             
       def correct!(row)

data/lib/errata/erratum/replace.rb

@@ -1,8 +1,15 @@
 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
+      attr_reader :correction
+
+      def initialize(responder, options = {})
+        super
+        @correction = if abbr?
+          '\1' + options[:y].to_s + '\2'
+        else
+          options[:y].to_s
+        end
       end
 
       def correct!(row)

data/lib/errata/erratum/simplify.rb

@@ -1,8 +1,11 @@
 class Errata
   class Erratum
     class Simplify < Erratum
-      def second_section
-        options['x']
+      attr_reader :second_section
+
+      def initialize(responder, options = {})
+        super
+        @second_section = options[:x]
       end
 
       def targets?(row)
@@ -15,6 +18,8 @@ class Errata
         end
       end
       
+      private
+
       def special_matcher(row)
         /[\s\(\[\'\"]*#{::Regexp.escape(row[second_section])}[\s\)\]\'\"]*/
       end

data/lib/errata/erratum/transform.rb

@@ -3,11 +3,14 @@ class Errata
     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']
+      attr_reader :string_method
+
+      def initialize(responder, options = {})
+        super
+        @string_method = options[:y]
+        raise %{[errata] Method "#{@string_method}" not allowed} unless ALLOWED_METHODS.include? @string_method
       end
-      
+
       def correct!(row)
         if targets? row
           row[section].gsub!(matching_expression) { |match| match.send string_method }

data/lib/errata/erratum/truncate.rb

@@ -1,8 +1,11 @@
 class Errata
   class Erratum
     class Truncate < Erratum
-      def necessary_and_sufficient_prefix
-        options['x']
+      attr_reader :necessary_and_sufficient_prefix
+
+      def initialize(responder, options = {})
+        super
+        @necessary_and_sufficient_prefix = options[:x]
       end
 
       def correct!(row)

data/lib/errata/version.rb

@@ -1,3 +1,3 @@
 class Errata
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/test/helper.rb

@@ -1,14 +1,18 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
+
+if Bundler.definition.specs['ruby-debug19'].first or Bundler.definition.specs['ruby-debug'].first
+  require 'ruby-debug'
+end
+
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'minitest/reporters'
+MiniTest::Unit.runner = MiniTest::SuiteRunner.new
+MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
+
 unless RUBY_VERSION >= '1.9'
-  gem 'fastercsv'
   require 'fastercsv'
 end
-Bundler.setup
-require 'test/unit'
-require 'shoulda'
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'errata'
-class Test::Unit::TestCase
-end

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

@@ -1,5 +1,3 @@
-require 'helper'
-
 class AutomobileVariantGuru
   def transmission_is_blank?(row)
     row['transmission'].blank?
@@ -53,42 +51,3 @@ class AutomobileVariantGuru
     row.slice('CAR LINE', 'carline name', 'carline_name').any? { |k, v| v =~ /BENTLEY/i }
   end
 end
-
-class TestOldSyntax < Test::Unit::TestCase
-  def setup
-    @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)
-    assert_equal 'Alfa Romeo', alfa['carline_mfr_name']
-  end
-  
-  should "reject rows" do
-    assert @e.rejects?('carline_mfr_name' => 'AURORA CARS')
-  end
-  
-  should "lazily constantize and initialize responder" do
-    e = Errata.new :table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg'),
-                   :responder => 'AutomobileVariantGuru'
-    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
-    e.correct!(alfa)
-    assert_equal 'Alfa Romeo', alfa['carline_mfr_name']
-  end
-  
-  should "pass options to RemoteTable if no :table is specified" do
-    e = Errata.new :url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg',
-                   :responder => AutomobileVariantGuru.new
-    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
-    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

data/test/test_errata.rb

@@ -0,0 +1,25 @@
+require 'helper'
+require 'models'
+
+describe Errata do
+  before do
+    @e = Errata.new :url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg',
+                    :responder => 'AutomobileVariantGuru'
+  end
+    
+  it "corrects rows" do
+    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
+    @e.correct!(alfa)
+    alfa['carline_mfr_name'].must_equal 'Alfa Romeo'
+  end
+  
+  it "rejects rows" do
+    @e.rejects?('carline_mfr_name' => 'AURORA CARS').must_equal true
+  end
+    
+  it "tries multiple conditions" do
+    bentley = { 'carline_mfr_name' => 'ROLLS-ROYCE BENTLEY', "carline name" => 'Super Bentley' }
+    @e.correct!(bentley)
+    bentley['carline_mfr_name'].must_equal 'Bentley'
+  end
+end

data/test/test_old_style.rb

@@ -0,0 +1,41 @@
+require 'helper'
+require 'models'
+
+describe 'old-style Errata usage' do
+  before do
+    @e = Errata.new :table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg'),
+                    :responder => AutomobileVariantGuru.new
+  end
+    
+  it "corrects rows" do
+    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
+    @e.correct!(alfa)
+    alfa['carline_mfr_name'].must_equal 'Alfa Romeo'
+  end
+  
+  it "rejects rows" do
+    @e.rejects?('carline_mfr_name' => 'AURORA CARS').must_equal true
+  end
+  
+  it "lazily constantizes and initializes responder" do
+    e = Errata.new :table => RemoteTable.new(:url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg'),
+                   :responder => 'AutomobileVariantGuru'
+    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
+    e.correct!(alfa)
+    alfa['carline_mfr_name'].must_equal 'Alfa Romeo'
+  end
+  
+  it "passes options to RemoteTable if no :table is specified" do
+    e = Errata.new :url => 'http://spreadsheets.google.com/pub?key=t9WkYT39zjrStx7ruCFrZJg',
+                   :responder => AutomobileVariantGuru.new
+    alfa = { "carline_mfr_name"=>"ALFA ROMEO" }
+    e.correct!(alfa)
+    alfa['carline_mfr_name'].must_equal 'Alfa Romeo'
+  end
+  
+  it "tries multiple conditions" do
+    bentley = { 'carline_mfr_name' => 'ROLLS-ROYCE BENTLEY', "carline name" => 'Super Bentley' }
+    @e.correct!(bentley)
+    bentley['carline_mfr_name'].must_equal 'Bentley'
+  end
+end

metadata

@@ -1,114 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: errata
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: remote_table
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+- !ruby/object:Gem::Dependency
+  name: remote_table
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 1
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: to_regexp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+- !ruby/object:Gem::Dependency
+  name: to_regexp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !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: shoulda
-  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
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Correct strings based on remote errata files.
-email: 
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
+- CHANGELOG
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - errata.gemspec
 - lib/errata.rb
@@ -121,40 +85,36 @@ files:
 - lib/errata/erratum/truncate.rb
 - lib/errata/version.rb
 - test/helper.rb
-- test/test_old_syntax.rb
+- test/models.rb
+- test/test_errata.rb
+- test/test_old_style.rb
 homepage: https://github.com/seamusabshere/errata
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: errata
-rubygems_version: 1.7.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Correct strings based on remote errata files
-test_files: 
+test_files:
 - test/helper.rb
-- test/test_old_syntax.rb
+- test/models.rb
+- test/test_errata.rb
+- test/test_old_style.rb
+has_rdoc: 

data/README.rdoc

@@ -1,35 +0,0 @@
-=errata
-
-Correct strings based on remote errata files.
-
-==UTF-8
-
-Assumes all input strings are UTF-8. Otherwise there can be problems with Ruby 1.9 and Regexp::FIXEDENCODING. Specifically, ASCII-8BIT regexps might be applied to UTF-8 strings (or vice-versa), resulting in Encoding::CompatibilityError.
-
-==Real-life usage
-
-Used by data_miner (http://github.com/seamusabshere/data_miner)
-
-==Example
-
-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
-
-Now you will have
-
-  rover['manufacturer_name']    #=> 'Rover'         (used to be 'foobar Austin Rover foobar')
-  mercedes['manufacturer_name'] #=> 'Mercedes-Benz' (used to be 'MERCEDES')
-
-==Authors
-
-* Seamus Abshere <seamus@abshere.net>
-* Andy Rossmeissl <andy@rossmeissl.net>
-
-==Copyright
-
-Copyright (c) 2011 Brighter Planet. See LICENSE for details.