ghaki-match 2011.11.30.1 → 2011.12.04.1

data/lib/ghaki/match/mixin/auto_boolean.rb

@@ -12,19 +12,19 @@ module AutoBoolean
     @auto_boolean_matcher ||= Ghaki::Match::Parser::Boolean.new
   end
 
-  def auto_boolean_fields
-    auto_boolean_matcher.boolean_fields
+  def boolean_lookup
+    auto_boolean_matcher.boolean_lookup
   end
 
-  def auto_boolean_fields= val
-    auto_boolean_matcher.boolean_fields = val
+  def boolean_lookup= val
+    auto_boolean_matcher.boolean_lookup= val
   end
 
-  def auto_boolean_value val, opts={}, &block
+  def boolean_value val, opts={}, &block
     auto_boolean_matcher.parse_value( val, opts, &block )
   end
 
-  def auto_boolean_field key, val, opts={}, &block
+  def boolean_field key, val, opts={}, &block
     auto_boolean_matcher.parse_field( key, val, opts, &block )
   end
 

data/lib/ghaki/match/mixin/auto_rename.rb

@@ -7,15 +7,15 @@ module Mixin #:nodoc:
 module AutoRename
   extend Ghaki::Bool::Accessors
 
-  bool_accessor :auto_rename_to_token
-  attr_writer   :auto_rename_fields
+  bool_accessor :auto_tokenize
+  attr_writer   :field_renames
 
-  def auto_rename_fields
-    @auto_rename_fields || {}
+  def field_renames
+    @field_renames || {}
   end
 
   # Converts 'HTTP Compression' into :http_compression
-  def auto_field_name key
+  def format_field key
     key.downcase.gsub(%r{[^A-Z0-9]+}xoi,' ').strip.gsub(' ','_')
   end
 
@@ -29,11 +29,11 @@ module AutoRename
   # - if the rename table exists, and does NOT have an entry
   #   - return the string
 
-  def auto_rename_field dirty_key, opts={}
-    do_token = opts[:auto_rename_to_token]
-    do_token = self.auto_rename_to_token? if do_token.nil?
-    to_field = opts[:auto_rename_fields] || self.auto_rename_fields
-    clean_key = auto_field_name(dirty_key)
+  def rename_field dirty_key, opts={}
+    do_token = opts[:auto_tokenize]
+    do_token = self.auto_tokenize? if do_token.nil?
+    to_field = opts[:field_renames] || self.field_renames
+    clean_key = format_field(dirty_key)
     field_key = to_field[clean_key]
     field_key = do_token if field_key.nil? and (not do_token.nil?)
     case field_key

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

@@ -11,14 +11,18 @@ class Boolean < Base
     false => %w{ FALSE NO  OFF DISABLED },
   }
 
-  attr_accessor :boolean_fields
+  attr_writer :boolean_lookup
+
+  def boolean_lookup
+    @boolean_lookup || []
+  end
 
   def initialize opts={}; super( {}, opts )
     opts_boolean opts
   end
 
   def opts_boolean opts
-    @boolean_fields = opts[:boolean_fields] || []
+    @boolean_lookup = opts[:boolean_lookup]
     add_trues(  opts[:boolean_trues ]  ) unless opts[:boolean_trues].nil?
     add_falses( opts[:boolean_falses]  ) unless opts[:boolean_falses].nil?
     add_words(  DEFAULT_VALUES         ) unless opts[:skip_boolean_defaults]
@@ -40,7 +44,8 @@ class Boolean < Base
 
   # Check whether key is a known boolean field, if so, get truthiness.
   def parse_field key, val, opts={}, &block
-    if @boolean_fields.member?(key)
+    looky = opts[:boolean_lookup] || self.boolean_lookup
+    if looky.member?(key)
       parse_value( val, opts, &block )
     else
       val

data/spec/ghaki/match/mixin/auto_boolean_spec.rb

@@ -28,56 +28,54 @@ describe AutoBoolean do
     end
   end
 
-  describe '#auto_boolean_fields' do
+  describe '#boolean_lookup' do
     it 'defaults to empty list' do
-      subject.auto_boolean_fields.should be_empty
+      subject.boolean_lookup.should be_empty
     end
     it 'returns truthiness when field is present' do
-      subject.auto_boolean_fields = FIELDS_EXP
-      subject.auto_boolean_fields.should == FIELDS_EXP
-      subject.auto_boolean_field( GOOD_KEY, GOOD_TRUE ).should be_true
+      subject.boolean_lookup = FIELDS_EXP
+      subject.boolean_field( GOOD_KEY, GOOD_TRUE ).should be_true
     end
     it 'returns orginal when field is missing' do
-      subject.auto_boolean_fields = FIELDS_EXP
-      subject.auto_boolean_fields.should == FIELDS_EXP
-      subject.auto_boolean_field( MISS_KEY, GOOD_TRUE ).should == GOOD_TRUE
+      subject.boolean_lookup = FIELDS_EXP
+      subject.boolean_field( MISS_KEY, GOOD_TRUE ).should == GOOD_TRUE
     end
   end
 
-  describe '#auto_boolean_value' do
+  describe '#boolean_value' do
 
     context 'using defaults' do
       context 'with known values' do
         Parser::Boolean::DEFAULT_VALUES[true].each do |item|
           it "returns true for: #{item}" do
-              subject.auto_boolean_value(item).should be_true
+              subject.boolean_value(item).should be_true
             end
           end
         end
         Parser::Boolean::DEFAULT_VALUES[false].each do |item|
           it "returns false for: #{item}" do
-              subject.auto_boolean_value(item).should be_false
+              subject.boolean_value(item).should be_false
           end
         end
       end
       context 'with unknown values' do
         it 'returns original value' do
-          subject.auto_boolean_value(MISS_VAL).should == MISS_VAL
+          subject.boolean_value(MISS_VAL).should == MISS_VAL
         end
       end
 
   end
 
-  describe '#auto_boolean_field' do
+  describe '#boolean_field' do
     context 'with present field' do
       it 'converts value to boolean' do
-        subject.auto_boolean_fields = FIELDS_EXP
-        subject.auto_boolean_field(GOOD_KEY,GOOD_TRUE).should be_true
+        subject.boolean_lookup = FIELDS_EXP
+        subject.boolean_field(GOOD_KEY,GOOD_TRUE).should be_true
       end
     end
     context 'with invalid field' do
       it 'returns original value' do
-        subject.auto_boolean_field(MISS_KEY,MISS_VAL).should == MISS_VAL
+        subject.boolean_field(MISS_KEY,MISS_VAL).should == MISS_VAL
       end
     end
   end

data/spec/ghaki/match/mixin/auto_rename_spec.rb

@@ -22,32 +22,32 @@ describe AutoRename do
   end
   subject { @subj }
 
-  it { should respond_to :auto_rename_to_token? }
-  it { should respond_to :auto_rename_to_token! }
+  it { should respond_to :auto_tokenize? }
+  it { should respond_to :auto_tokenize! }
 
-  it { should respond_to :auto_rename_fields= }
-  describe '#auto_rename_fields' do
+  it { should respond_to :field_renames= }
+  describe '#field_renames' do
     it 'defaults empty hash' do
-      subject.auto_rename_fields.should == {}
+      subject.field_renames.should == {}
     end
     it 'returns set value' do
       thing = { 'zip' => 'zap' }
-      subject.auto_rename_fields = thing
-      subject.auto_rename_fields.should == thing
+      subject.field_renames = thing
+      subject.field_renames.should == thing
     end
   end
 
-  describe '#auto_field_name' do
+  describe '#format_field' do
     FIELD_CLEANUP_EXAMPLES.each_pair do |reason,examples|
      it reason do
         examples.each_pair do |key,val|
-          subject.auto_field_name(key).should == val
+          subject.format_field(key).should == val
         end
       end
     end
   end
 
-  describe '#auto_rename_field' do
+  describe '#rename_field' do
 
     ARF_RULES = {
       'phasellus_tortor_elementum' => true,                   # clean and token
@@ -68,14 +68,14 @@ describe AutoRename do
     }
 
     before(:each) do
-      subject.auto_rename_fields = ARF_RULES
+      subject.field_renames = ARF_RULES
     end
 
     context 'with matched' do
       ARF_EXPECTED.each_pair do |reason,examples|
         it "#{reason} by rule" do
           examples.each_pair do |get,put|
-            subject.auto_rename_field(get).should == put
+            subject.rename_field(get).should == put
           end
         end
       end
@@ -86,39 +86,39 @@ describe AutoRename do
       let(:put_token) { :unknown }
       let(:put_clean) { 'unknown' }
 
-      context 'using set :auto_rename_to_token' do
+      context 'using set :auto_tokenize' do
 
         it 'translates unknown into Symbol' do
-          subject.auto_rename_to_token! true
-          subject.auto_rename_field(get_field).should == put_token
+          subject.auto_tokenize! true
+          subject.rename_field(get_field).should == put_token
         end
 
         it 'translates unknown into String' do
-          subject.auto_rename_to_token! false
-          subject.auto_rename_field(get_field).should == put_clean
+          subject.auto_tokenize! false
+          subject.rename_field(get_field).should == put_clean
         end
 
         it 'fails when not set' do
           lambda do
-            subject.auto_rename_field('missing')
+            subject.rename_field('missing')
           end.should raise_error( ArgumentError, 'Unknown Auto Rename Field Value: missing' )
         end
 
       end
 
-      context 'using option :auto_rename_to_token' do
+      context 'using option :auto_tokenize' do
 
-        it 'accepts :auto_rename_to_token when true' do
-          subject.auto_rename_field( get_field , :auto_rename_to_token => true ).should == put_token
+        it 'accepts :auto_tokenize when true' do
+          subject.rename_field( get_field, :auto_tokenize => true ).should == put_token
         end
 
-        it 'accepts :auto_rename_to_token when false' do
-          subject.auto_rename_field( get_field, :auto_rename_to_token => false ).should == put_clean
+        it 'accepts :auto_tokenize when false' do
+          subject.rename_field( get_field, :auto_tokenize => false ).should == put_clean
         end
 
         it 'fails when not set' do
           lambda do
-            subject.auto_rename_field('missing')
+            subject.rename_field('missing')
           end.should raise_error( ArgumentError, 'Unknown Auto Rename Field Value: missing' )
         end
       end

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

@@ -7,19 +7,19 @@ describe Boolean do
   EXTRA_KEY = 'ZAP'
   EXTRA_TEXT = 'ZIP ZAP ZOOM'
 
-  it { should respond_to :boolean_fields }
-  it { should respond_to :boolean_fields= }
-
+  it { should respond_to :boolean_lookup }
+  it { should respond_to :boolean_lookup= }
+  
   describe '#initialize' do
 
-    context 'using option :boolean_fields' do
+    context 'using option :boolean_lookup' do
       it 'accepts when given' do
-        @subj = Boolean.new( :boolean_fields => FIELDS_EXP )
-        @subj.boolean_fields.should == FIELDS_EXP
+        @subj = Boolean.new( :boolean_lookup => FIELDS_EXP )
+        @subj.boolean_lookup.should == FIELDS_EXP
       end
       it 'defaults as empty' do
         @subj = Boolean.new
-        @subj.boolean_fields.should be_empty
+        @subj.boolean_lookup.should be_empty
       end
     end
 
@@ -86,7 +86,7 @@ describe Boolean do
 
   describe '#parse_field' do
 
-    subject { Boolean.new :boolean_fields => FIELDS_EXP }
+    subject { Boolean.new :boolean_lookup => FIELDS_EXP }
 
     context 'with present field' do
 

metadata

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