scrub 0.1.0 → 0.1.1

data/Rakefile

@@ -1,3 +1,8 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -11,3 +16,10 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
+
+Rake::TestTask.new do |t|
+  t.libs = %w(test)
+  t.pattern = 'test/**/*_test.rb'
+end
+
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/scrubber.rb

@@ -13,14 +13,22 @@ class Scrubber
     while(line = lines.shift)
       line.strip!
       @config.matchers.each do |matcher, prok|
-        prok.call(line) if line =~ matcher
+        if match = line.match(matcher)
+          prok.call(line, *match.captures)
+        end
       end
       @config.between_matchers.each do |matcher, options|
         if line =~ matcher
           end_matcher, prok, conditions = options
           next_line = nil
           while(next_line = lines.shift) && (next_line !~ end_matcher)
-            prok.call(next_line) if next_line =~ conditions[:when]
+            if conditions[:when]
+              if match = next_line.match(conditions[:when])
+                prok.call(next_line, *match.captures) 
+              end
+            else
+              prok.call(next_line) 
+            end
           end
         end
       end

data/scrub.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrub}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Mongeau"]
@@ -19,13 +19,21 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/scrub.rb",
      "lib/scrubber.rb",
-     "scrub.gemspec"
+     "scrub.gemspec",
+     "test/fixtures/file1.txt",
+     "test/fixtures/file2.txt",
+     "test/scrubber_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/toastyapps/scrub}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Scrub files with ease and elbow grease}
+  s.test_files = [
+    "test/scrubber_test.rb",
+     "test/test_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/fixtures/file1.txt

@@ -0,0 +1,2 @@
+a,b,c
+1,2,3

data/test/fixtures/file2.txt

@@ -0,0 +1,5 @@
+---
+a,b,c
+1,2,3
+---
+d,e,f

data/test/scrubber_test.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+
+class ScrubberTest < Test::Unit::TestCase
+  def test_when
+    scrubber = Scrubber.new do |scrubber|
+      scrubber.when(/\d,\d,\d/) do |line|
+        assert_equal '1,2,3', line.strip
+      end
+    end
+    scrubber.scrub(File.read("fixtures/file1.txt"))
+  end
+  
+  def test_when_with_var
+    scrubber = Scrubber.new do |scrubber|
+      scrubber.when(/([a-z]),[a-z],[a-z]/) do |line, var|
+        assert_equal 'a,b,c', line.strip
+        assert_equal 'a', var
+      end
+    end
+    scrubber.scrub(File.read("fixtures/file1.txt"))
+  end
+  
+  def test_between
+    matches = ['a,b,c','1,2,3']
+    scrubber = Scrubber.new do |scrubber|
+      scrubber.between(/---/, /---/) do |line|
+        assert_equal matches.shift, line.strip
+      end
+    end
+    scrubber.scrub(File.read("fixtures/file2.txt"))
+  end
+  
+  def test_between_with_when
+    scrubber = Scrubber.new do |scrubber|
+      scrubber.between(/---/, /---/, :when => /\d,\d,\d/) do |line|
+        assert_equal '1,2,3', line.strip
+      end
+    end
+    scrubber.scrub(File.read("fixtures/file2.txt"))
+  end
+  
+  def test_between_with_when_and_var
+    matches = ['a,b,c','1,2,3']
+    var_matches = ['a', '1']
+    scrubber = Scrubber.new do |scrubber|
+      scrubber.between(/---/, /---/, :when => /(\w),\w,\w/) do |line, var|
+        assert_equal matches.shift, line.strip
+        assert_equal var_matches.shift, var
+      end
+    end
+    scrubber.scrub(File.read("fixtures/file2.txt"))
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+ 
+require 'test/unit'
+require 'scrub'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scrub
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Matthew Mongeau
@@ -29,6 +29,10 @@ files:
 - lib/scrub.rb
 - lib/scrubber.rb
 - scrub.gemspec
+- test/fixtures/file1.txt
+- test/fixtures/file2.txt
+- test/scrubber_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/toastyapps/scrub
 licenses: []
@@ -57,5 +61,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Scrub files with ease and elbow grease
-test_files: []
-
+test_files: 
+- test/scrubber_test.rb
+- test/test_helper.rb