errata 1.0.1 → 1.0.2

data/README.rdoc

@@ -2,6 +2,10 @@
 
 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)

data/Rakefile

@@ -21,3 +21,5 @@ begin
 rescue LoadError
    puts "Rdoc is not available"
 end
+
+task :default => :test

data/errata.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   s.add_dependency 'activesupport', '>=2.3.4'
-  s.add_dependency 'remote_table', '~>1'
+  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'
-  s.add_development_dependency 'ruby-debug'
 end

data/lib/errata.rb

@@ -38,10 +38,12 @@ class Errata
   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
+    @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
+      end
+      memo
+    end
   end
   
   def rejections

data/lib/errata/erratum.rb

@@ -1,3 +1,5 @@
+require 'to_regexp'
+
 class Errata
   class Erratum
     autoload :Delete, 'errata/erratum/delete'
@@ -33,12 +35,6 @@ class Errata
       !!(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
@@ -53,20 +49,14 @@ class Errata
     end
         
     def matching_expression
-      return @_matching_expression[0] if @_matching_expression.is_a? ::Array
-      @_matching_expression = []
-      @_matching_expression[0] = if options['x'].blank?
+      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
+      elsif (options['x'].start_with?('/') and options['x'].end_with?('/')) or options['x'].start_with?('%r{')
+        if as_regexp = options['x'].as_regexp
+          ::Regexp.new(*as_regexp)
         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
@@ -77,7 +67,7 @@ class Errata
       else
         options['x']
       end
-      @_matching_expression[0]
+      @matching_expression[0]
     end
   end
 end

data/lib/errata/erratum/delete.rb

@@ -7,7 +7,7 @@ class Errata
       end
             
       def correct!(row)
-        super(row) do
+        if targets? row
           row[section].gsub! matching_expression, backfill
         end
       end

data/lib/errata/erratum/reject.rb

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

data/lib/errata/erratum/replace.rb

@@ -6,7 +6,7 @@ class Errata
       end
 
       def correct!(row)
-        super(row) do
+        if targets? row
           if matching_expression.blank?
             row[section] = correction.dup
           else

data/lib/errata/erratum/simplify.rb

@@ -10,7 +10,7 @@ class Errata
       end
       
       def correct!(row)
-        super(row) do
+        if targets? row
           row[section].gsub! special_matcher(row), ''
         end
       end

data/lib/errata/erratum/transform.rb

@@ -9,7 +9,7 @@ class Errata
       end
       
       def correct!(row)
-        super(row) do
+        if targets? row
           row[section].gsub!(matching_expression) { |match| match.send string_method }
         end
       end

data/lib/errata/erratum/truncate.rb

@@ -6,7 +6,7 @@ class Errata
       end
 
       def correct!(row)
-        super(row) do
+        if targets? row
           row[section] = necessary_and_sufficient_prefix.dup
         end
       end

data/lib/errata/version.rb

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

data/test/helper.rb

@@ -7,9 +7,6 @@ end
 Bundler.setup
 require 'test/unit'
 require 'shoulda'
-unless RUBY_VERSION >= '1.9'
-  require 'ruby-debug'
-end
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'errata'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: errata
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -06:00
-default_executable: 
+date: 2011-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -41,30 +40,34 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 29
         segments: 
         - 1
-        version: "1"
+        - 1
+        - 7
+        version: 1.1.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: test-unit
+  name: to_regexp
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: test-unit
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: shoulda
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -119,7 +122,6 @@ files:
 - lib/errata/version.rb
 - test/helper.rb
 - test/test_old_syntax.rb
-has_rdoc: true
 homepage: https://github.com/seamusabshere/errata
 licenses: []
 
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: errata
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Correct strings based on remote errata files