ghaki-match 2011.12.04.1 → 2011.12.04.2

data/lib/ghaki/match/parser/base.rb

@@ -5,10 +5,10 @@ module Parser #:nodoc:
 # Matches against paired regular expressions and returned values.
 class Base
 
-  attr_accessor :lookups, :default_value
+  attr_accessor :match_lookup, :default_value
 
-  def initialize pairs={}, opts={}
-    @lookups = pairs
+  def initialize opts={}
+    @match_lookup = opts[:match_lookup] || {}
     @default_value = opts[:default_value]
     add_words( opts[:match_words] ) if opts.has_key?(:match_words)
   end
@@ -25,7 +25,7 @@ class Base
   def add_words pairs
     pairs.each_pair do |val,keyz|
       keyz.each do |key|
-        @lookups[ %r{\b#{key}\b}i ] = val
+        @match_lookup[ %r{\A#{key}\z}i ] = val
       end
     end
   end
@@ -33,7 +33,7 @@ class Base
   # Matches lines against regexp keys returning paired value.
   # - Yields on not found or returns default value.
   def match_lines lines, opts={}
-    @lookups.each_pair do |rx_curr,ret_val|
+    @match_lookup.each_pair do |rx_curr,ret_val|
       lines.each do |text|
         return ret_val if text =~ rx_curr
       end
@@ -50,7 +50,7 @@ class Base
   # Matches string against regexp keys returning paired value.
   # - Yields on not found or returns default value.
   def match_text text, opts={}
-    @lookups.each_pair do |rx_curr,ret_val|
+    @match_lookup.each_pair do |rx_curr,ret_val|
       return ret_val if text =~ rx_curr
     end
     if block_given?

data/lib/ghaki/match/parser/boolean.rb

@@ -17,7 +17,7 @@ class Boolean < Base
     @boolean_lookup || []
   end
 
-  def initialize opts={}; super( {}, opts )
+  def initialize opts={}; super opts
     opts_boolean opts
   end
 

data/spec/ghaki/match/parser/base_spec.rb

@@ -2,40 +2,74 @@ require 'ghaki/match/parser/base'
 
 module Ghaki module Match module Parser module Base_Testing
 describe Base do
-  FIND_KEY = 'FOUND'
-  FIND_VAL = 'RETURNED'
-  GOOD_TEXT = 'SHOULD BE FOUND BY PARSER'
+  EXACT_KEY  = 'FOUND'
+  EXACT_VAL  = 'EXACT-RETURNED'
+  EXACT_TEXT = 'FounD'
+  EXACT_FAIL = 'THIS FOUND NOW'
+  EXACT_WORDS = { EXACT_VAL => [EXACT_KEY] }
+
+  BOUND_KEY = 'HERE'
+  BOUND_VAL = 'BOUND-RETURNED'
+  BOUND_TEXT = 'LOOK HERE NOW'
+  BOUND_LOOKUP = { %r{\b#{BOUND_KEY}\b}i => BOUND_VAL }
+
   MISS_TEXT = 'INVALID'
   MISS_DEF = 'PASS_BACK'
 
-  subject do
-    Base.new({
-      %r{\b#{FIND_KEY}\b} => FIND_VAL,
-    })
-  end
-
   describe '#initialize' do
+
+    context 'using no options' do
+      it 'has empty match lookups' do
+        Base.new.match_lookup.should be_empty
+      end
+    end
+
+    context 'using option :match_lookup' do
+      it 'accepts' do
+        @subj = Base.new( :match_lookup => BOUND_LOOKUP )
+        @subj.match_lookup.should_not be_empty
+        @subj.match_text(BOUND_TEXT).should == BOUND_VAL
+      end
+    end
+
     context 'using option :match_words' do
       it 'accepts' do
-        @subj = Base.new( :match_words => { FIND_VAL => [FIND_KEY] } )
-        subject.match_text(GOOD_TEXT).should == FIND_VAL
+        @subj = Base.new( :match_words => EXACT_WORDS )
+        @subj.match_lookup.should_not be_empty
+        @subj.match_text(EXACT_TEXT).should == EXACT_VAL
       end
     end
+
   end
 
+  subject { Base.new }
+
+  it { should respond_to :match_lookup  }
+  it { should respond_to :match_lookup= }
+  it { should respond_to :default_value  }
+  it { should respond_to :default_value= }
+
   describe '#add_words' do
-    subject { Base.new }
-    it 'generates match pairs' do
-      subject.add_words FIND_VAL => [FIND_KEY]
-      subject.match_text(GOOD_TEXT).should == FIND_VAL
+    before(:each) do
+      subject.add_words EXACT_VAL => [EXACT_KEY]
+    end
+    it 'matches against exact text' do
+      subject.match_text(EXACT_TEXT).should == EXACT_VAL
+    end
+    it 'does not match against boundary' do
+      subject.match_text(EXACT_FAIL).should be_nil
     end
   end
 
   describe '#match_text' do
 
+    before(:each) do
+      subject.match_lookup = BOUND_LOOKUP
+    end
+
     context 'when matched' do
       it 'passes specified value' do
-        subject.match_text(GOOD_TEXT).should == FIND_VAL
+        subject.match_text(BOUND_TEXT).should == BOUND_VAL
       end
     end
 
@@ -66,9 +100,13 @@ describe Base do
 
   describe '#match_lines' do
 
+    before(:each) do
+      subject.match_lookup = BOUND_LOOKUP
+    end
+
     context 'when matched' do
       it 'should match' do
-        subject.match_lines([GOOD_TEXT]).should == FIND_VAL
+        subject.match_lines([BOUND_TEXT]).should == BOUND_VAL
       end
     end
 

data/spec/ghaki/match/parser/boolean_spec.rb

@@ -4,9 +4,13 @@ module Ghaki module Match module Parser module Boolean_Testing
 describe Boolean do
 
   FIELDS_EXP = ['EXPECTED']
+  FIELD_HAVE = FIELDS_EXP.first
   EXTRA_KEY = 'ZAP'
-  EXTRA_TEXT = 'ZIP ZAP ZOOM'
+  EXTRA_TEXT = EXTRA_KEY.downcase
 
+  subject { Boolean.new }
+
+  it { should be_kind_of(Parser::Base) }
   it { should respond_to :boolean_lookup }
   it { should respond_to :boolean_lookup= }
   
@@ -26,11 +30,11 @@ describe Boolean do
     context 'using option :skip_boolean_defaults' do
       it 'ignores defaults when specified' do
         @subj = Boolean.new( :skip_boolean_defaults => true )
-        @subj.lookups.should be_empty
+        @subj.match_lookup.should be_empty
       end
       it 'imports defaults when missing' do
         @subj = Boolean.new
-        @subj.lookups.should_not be_empty
+        @subj.match_lookup.should_not be_empty
       end
     end
 
@@ -52,8 +56,6 @@ describe Boolean do
 
   describe '#parse_value' do
 
-    subject { Boolean.new }
-
     context 'when unmatched' do
       let(:text) { 'INVALID' }
       it 'passes through original value' do
@@ -90,7 +92,7 @@ describe Boolean do
 
     context 'with present field' do
 
-      let(:field) { FIELDS_EXP.first }
+      let(:field) { FIELD_HAVE }
 
       context 'when unmatched' do
         let(:text) { 'NOT_FOUND' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghaki-match
 version: !ruby/object:Gem::Version
-  version: 2011.12.04.1
+  version: 2011.12.04.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ghaki-bool
-  requirement: &82877040 !ruby/object:Gem::Requirement
+  requirement: &79907590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2011.11.29.1
   type: :runtime
   prerelease: false
-  version_requirements: *82877040
+  version_requirements: *79907590
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82876800 !ruby/object:Gem::Requirement
+  requirement: &79907320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *82876800
+  version_requirements: *79907320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82876570 !ruby/object:Gem::Requirement
+  requirement: &79907030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.9.4
   type: :development
   prerelease: false
-  version_requirements: *82876570
+  version_requirements: *79907030
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &82876330 !ruby/object:Gem::Requirement
+  requirement: &79906760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *82876330
+  version_requirements: *79906760
 description: Collection of helpers for regular expression helpers.
 email: gerald@kalafut.org
 executables: []