keyword_search 1.0.6 → 1.1.0

data/History.txt

@@ -1,3 +1,7 @@
+= 1.1.0 / 2007-03-21
+
+* Updated to use Dhaka 2.1.0
+
 = 1.0.5 / 2007-01-29
 
 * Added single quoting support and nested quotes (apostrophes, etc)

data/Rakefile

@@ -12,7 +12,7 @@ Hoe.new('keyword_search', KeywordSearch::VERSION) do |p|
   p.author = 'Bruce Williams'
   p.email = 'bruce@codefluency.com'
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps = [['dhaka', '= 0.0.6']]
+  p.extra_deps = [['dhaka', '= 2.1.0']]
 end
 
 task :rebuild_parser do

data/lib/keyword_search.rb

@@ -7,15 +7,16 @@ end
 
 module KeywordSearch
   
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
   
   class << self
     def search(input_string, definition=nil, &block)
+      @evaluator ||= Evaluator.new
       definition ||= Definition.new(&block)
       tokens = Tokenizer.tokenize(input_string.downcase)
       parse_result = Parser.parse(tokens)
       unless parse_result.has_error?
-        results = Evaluator.new(parse_result.syntax_tree).result
+        results = @evaluator.evaluate(parse_result.parse_tree)
         results.each do |key, terms|
           definition.handle(key, terms)
         end

data/lib/keyword_search/evaluator.rb

@@ -7,23 +7,25 @@ module KeywordSearch
     define_evaluation_rules do
 
       for_multiple_pairs do
-        child_nodes[1].each do |key, terms|
-          child_nodes[0][key] ||= []
-          child_nodes[0][key] += terms
+        child_nodes.inject({}) do |result,child_node|
+          evaluate(child_node).each do |key,value|
+            result[key] ||= []
+            result[key] += value
+          end
+          result
         end
-        child_nodes[0]
       end
 
       for_one_pair do
-        child_nodes[0]
+        evaluate(child_nodes.first)
       end
 
       for_keyword_and_term do
-        {child_nodes[0].token.value => [child_nodes[1].token.value]}
+        {child_nodes.first.tokens.first.value => [child_nodes.last.tokens.first.value]}
       end
 
       for_default_keyword_term do
-        {:default => [child_nodes[0].token.value]}
+        {:default => [child_nodes[0].tokens[0].value]}
       end
 
     end

data/lib/keyword_search/parser.rb

@@ -4,46 +4,38 @@ class KeywordSearch::Parser < Dhaka::CompiledParser
 
   start_with 0
 
-  at_state(5) {
-    for_symbol('k') { shift_to 2 }
-    for_symbol('_End_') { reduce_with 'start' }
-    for_symbol('Pair') { shift_to 6 }
-    for_symbol('s') { shift_to 1 }
-  }
-
-  at_state(2) {
-    for_symbol('s') { shift_to 3 }
+  at_state(3) {
+    for_symbols("k", "_End_", "s") { reduce_with "one_pair" }
   }
 
-  at_state(3) {
-    for_symbol('k') { reduce_with 'keyword_and_term' }
-    for_symbol('_End_') { reduce_with 'keyword_and_term' }
-    for_symbol('s') { reduce_with 'keyword_and_term' }
+  at_state(1) {
+    for_symbols("s") { shift_to 2 }
   }
 
   at_state(6) {
-    for_symbol('k') { reduce_with 'multiple_pairs' }
-    for_symbol('_End_') { reduce_with 'multiple_pairs' }
-    for_symbol('s') { reduce_with 'multiple_pairs' }
+    for_symbols("k", "_End_", "s") { reduce_with "multiple_pairs" }
   }
 
-  at_state(4) {
-    for_symbol('k') { reduce_with 'one_pair' }
-    for_symbol('_End_') { reduce_with 'one_pair' }
-    for_symbol('s') { reduce_with 'one_pair' }
+  at_state(5) {
+    for_symbols("s") { shift_to 4 }
+    for_symbols("_End_") { reduce_with "start" }
+    for_symbols("k") { shift_to 1 }
+    for_symbols("Pair") { shift_to 6 }
   }
 
-  at_state(1) {
-    for_symbol('k') { reduce_with 'default_keyword_term' }
-    for_symbol('_End_') { reduce_with 'default_keyword_term' }
-    for_symbol('s') { reduce_with 'default_keyword_term' }
+  at_state(2) {
+    for_symbols("k", "_End_", "s") { reduce_with "keyword_and_term" }
   }
 
   at_state(0) {
-    for_symbol('k') { shift_to 2 }
-    for_symbol('Pairs') { shift_to 5 }
-    for_symbol('Pair') { shift_to 4 }
-    for_symbol('s') { shift_to 1 }
+    for_symbols("s") { shift_to 4 }
+    for_symbols("k") { shift_to 1 }
+    for_symbols("Pair") { shift_to 3 }
+    for_symbols("Pairs") { shift_to 5 }
+  }
+
+  at_state(4) {
+    for_symbols("k", "_End_", "s") { reduce_with "default_keyword_term" }
   }
 
 end

data/lib/keyword_search/tokenizer.rb

@@ -1,6 +1,18 @@
 module KeywordSearch
   
   class Tokenizer < Dhaka::Tokenizer
+    
+    def accumulator
+      @accumulator ||= ''
+    end
+    
+    def accumulate(string)
+      accumulator << string
+    end
+    
+    def clear_accumulator
+      @accumulator = ''
+    end
 
 
     # TODO: Add further character support; this is just for initial release
@@ -16,13 +28,13 @@ module KeywordSearch
     for_state :idle_state do
     
       for_characters(printables) do
-        self.accumulator = ''
+        clear_accumulator
         switch_to :unquoted_literal_state
       end
 
       for_characters(quotes) do
-       advance if self.accumulator && !self.accumulator.empty?
-       self.accumulator = ''
+        advance unless accumulator.empty?
+        clear_accumulator
         case curr_char
         when %<">
           advance
@@ -42,21 +54,21 @@ module KeywordSearch
     for_state :unquoted_literal_state do
     
       for_characters(printables) do
-        self.accumulator += curr_char
+        accumulate curr_char
         advance
-        tokens << Dhaka::Token.new(Grammar.symbol_for_name('s'), accumulator) unless curr_char
+        create_token('s', accumulator) unless curr_char
       end
     
       for_characters(keyword_separator) do
-        tokens << Dhaka::Token.new(Grammar.symbol_for_name('k'), self.accumulator)
-        self.accumulator = ''
+        create_token 'k', accumulator
+        clear_accumulator
         advance
         switch_to :idle_state
       end
     
       for_characters(whitespace) do
-        tokens << Dhaka::Token.new(Grammar.symbol_for_name('s'), self.accumulator)
-        self.accumulator = ''
+        create_token 's', accumulator
+        clear_accumulator
         switch_to :idle_state
       end
     
@@ -64,12 +76,12 @@ module KeywordSearch
   
     for_state :double_quoted_literal_state do
       for_characters(all_characters - %w<">) do
-        self.accumulator += curr_char
+        accumulate curr_char
         advance
       end
       for_characters %w<"> do
-        tokens << Dhaka::Token.new(Grammar.symbol_for_name('s'), self.accumulator)
-        self.accumulator = ''
+        create_token 's', accumulator
+        clear_accumulator = ''
         advance
         switch_to :idle_state
       end
@@ -77,12 +89,12 @@ module KeywordSearch
 
     for_state :single_quoted_literal_state do
       for_characters(all_characters - %w<'>) do
-        self.accumulator += curr_char
+        accumulate curr_char
         advance
       end
       for_characters %w<'> do
-        tokens << Dhaka::Token.new(Grammar.symbol_for_name('s'), self.accumulator)
-        self.accumulator = ''
+        create_token 's', accumulator
+        clear_accumulator
         advance
         switch_to :idle_state
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: keyword_search
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
-date: 2007-02-26 00:00:00 -07:00
+  version: 1.1.0
+date: 2007-03-21 00:00:00 -06:00
 summary: Generic support for extracting GMail-style search keywords/values from strings
 require_paths: 
 - lib
@@ -60,5 +60,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: 2.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.0
     version: