keyword_search 1.2.0 → 1.3.0

data/History.txt

@@ -1,3 +1,11 @@
+= 1.3.0 / 2007-10-09
+
+* Conversion to Ragel-based parser (faster, less resource-intensive)
+* Better support for other character sets, allow apostrophes in
+  unquoted words
+* Test suite now uses test/spec
+* API Should be backwards compatible
+
 = 1.2.0 / 2007-05-09
 
 * Raises KeywordSearch::ParseError instead of returning an empty Hash if an error occurs during parsing

data/Manifest.txt

@@ -3,9 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 lib/keyword_search.rb
+lib/keyword_search.rl
 lib/keyword_search/definition.rb
-lib/keyword_search/evaluator.rb
-lib/keyword_search/grammar.rb
-lib/keyword_search/parser.rb
-lib/keyword_search/tokenizer.rb
 test/test_keyword_search.rb

data/README.txt

@@ -17,8 +17,6 @@ Various notes:
 * Input is automatically downcased (both keywords and values should be assumed to be in lowercase)
 
 Development Roadmap:
-1.1:: Expand supported character set for keywords and values
-      (currently supports a-z)
 2.0:: Add negation and grouping (will break API backwards compatibility)
 
 == SYNOPSIS:
@@ -59,7 +57,6 @@ Here's an example of usage from Rails (though the library is generic, and could
 
 == REQUIREMENTS:
 
-* dhaka
 * hoe
 
 == INSTALL:

data/Rakefile

@@ -2,9 +2,8 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/keyword_search.rb'
 
-Hoe.new('keyword_search', KeywordSearch::VERSION) do |p|
+Hoe.new('keyword_search', '1.3.0') do |p|
   p.rubyforge_name = 'codefluency'
   p.summary = 'Generic support for extracting GMail-style search keywords/values from strings'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
@@ -12,31 +11,10 @@ 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', '= 2.1.0']]
 end
 
-task :rebuild_parser do
-  require 'dhaka'
-  parser = Dhaka::Parser.new(KeywordSearch::Grammar)
-  File.open('lib/keyword_search/parser.rb', 'w') do |file|
-    file << parser.compile_to_ruby_source_as('KeywordSearch::Parser')
-  end
+rule '.rb' => '.rl' do |t|
+  sh "ragel -R #{t.source} | rlgen-ruby -o #{t.name}"
 end
 
-task :rebuild_lexer do
-  require 'dhaka'
-  lexer = Dhaka::Lexer.new(KeywordSearch::LexerSpec)
-  File.open('lib/keyword_search/lexer.rb', 'w') do |file|
-    file << lexer.compile_to_ruby_source_as('KeywordSearch::Lexer')
-  end
-end
-
-task :rebuild_lexer do
-  require 'dhaka'
-  lexer = Dhaka::Lexer.new(KeywordSearch::LexerSpec)
-  File.open('lib/keyword_search/lexer.rb', 'w') do |file|
-    file << lexer.compile_to_ruby_source_as('KeywordSearch::Lexer')
-  end
-end
-
-# vim: syntax=Ruby
+task :ragel => 'lib/keyword_search.rb'

data/lib/keyword_search.rb

@@ -1,31 +1,265 @@
-require 'dhaka'
-
-dirname = File.join(File.dirname(__FILE__), 'keyword_search')
-%w|grammar parser lexer_spec lexer evaluator definition|.each do |dependency|
-  require File.join(dirname, dependency)
-end
+# line 1 "lib/keyword_search.rl"
+require File.dirname(__FILE__) << '/keyword_search/definition.rb'
 
 module KeywordSearch
-  
-  class ParseError < ::SyntaxError; end
-  
-  VERSION = '1.2.0'
-  
+
+  class ParseError < ::SyntaxError; end  
+      
   class << self
+  
+    # line 44 "lib/keyword_search.rl"
+    
     def search(input_string, definition=nil, &block)
-      @evaluator ||= Evaluator.new
       definition ||= Definition.new(&block)
-      parse_result = Parser.parse(Lexer.lex(input_string))
-      unless parse_result.has_error?
-        results = @evaluator.evaluate(parse_result.parse_tree)
-        results.each do |key, terms|
-          definition.handle(key, terms)
-        end
-        results
-      else
-        raise ParseError, "Unexpected token #{parse_result.unexpected_token.inspect}"
+      results = parse(input_string)
+      results.each do |key, terms|
+        definition.handle(key, terms)
       end
+      results
+    end
+    
+    #######
+    private
+    #######
+    
+    def parse(input) #:nodoc:
+      data = input + ' '
+      
+# line 30 "lib/keyword_search.rb"
+class << self
+	attr_accessor :_parser_actions
+	private :_parser_actions, :_parser_actions=
+end
+self._parser_actions = [
+	0, 1, 3, 1, 4, 2, 0, 2, 
+	2, 1, 0
+]
+
+class << self
+	attr_accessor :_parser_key_offsets
+	private :_parser_key_offsets, :_parser_key_offsets=
+end
+self._parser_key_offsets = [
+	0, 0, 5, 8, 12, 15, 16, 17, 
+	18
+]
+
+class << self
+	attr_accessor :_parser_trans_keys
+	private :_parser_trans_keys, :_parser_trans_keys=
+end
+self._parser_trans_keys = [
+	0, 32, 34, 39, 58, 32, 34, 58, 
+	32, 34, 39, 58, 32, 34, 58, 34, 
+	32, 39, 32, 34, 58, 0
+]
+
+class << self
+	attr_accessor :_parser_single_lengths
+	private :_parser_single_lengths, :_parser_single_lengths=
+end
+self._parser_single_lengths = [
+	0, 5, 3, 4, 3, 1, 1, 1, 
+	3
+]
+
+class << self
+	attr_accessor :_parser_range_lengths
+	private :_parser_range_lengths, :_parser_range_lengths=
+end
+self._parser_range_lengths = [
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0
+]
+
+class << self
+	attr_accessor :_parser_index_offsets
+	private :_parser_index_offsets, :_parser_index_offsets=
+end
+self._parser_index_offsets = [
+	0, 0, 6, 10, 15, 19, 21, 23, 
+	25
+]
+
+class << self
+	attr_accessor :_parser_trans_targs_wi
+	private :_parser_trans_targs_wi, :_parser_trans_targs_wi=
+end
+self._parser_trans_targs_wi = [
+	8, 0, 5, 7, 0, 2, 1, 0, 
+	3, 2, 0, 5, 7, 0, 4, 1, 
+	0, 0, 4, 6, 5, 1, 0, 6, 
+	7, 1, 0, 3, 2, 0
+]
+
+class << self
+	attr_accessor :_parser_trans_actions_wi
+	private :_parser_trans_actions_wi, :_parser_trans_actions_wi=
+end
+self._parser_trans_actions_wi = [
+	5, 3, 5, 5, 3, 5, 1, 0, 
+	0, 0, 0, 8, 8, 0, 8, 1, 
+	0, 0, 0, 0, 0, 1, 0, 0, 
+	0, 1, 0, 0, 0, 0
+]
+
+class << self
+	attr_accessor :parser_start
+end
+self.parser_start = 1;
+class << self
+	attr_accessor :parser_first_final
+end
+self.parser_first_final = 8;
+class << self
+	attr_accessor :parser_error
+end
+self.parser_error = 0;
+
+class << self
+	attr_accessor :parser_en_main
+end
+self.parser_en_main = 1;
+
+# line 62 "lib/keyword_search.rl"
+    	p = 0
+    	pe = data.length
+    	key = nil
+    	tokstart = nil
+    	results = {}
+      
+# line 133 "lib/keyword_search.rb"
+begin
+	p ||= 0
+	pe ||= data.length
+	cs = parser_start
+end
+# line 68 "lib/keyword_search.rl"
+      
+# line 141 "lib/keyword_search.rb"
+begin
+	_klen, _trans, _keys, _acts, _nacts = nil
+	if p != pe
+	if cs != 0
+	while true
+	_break_resume = false
+	begin
+	_break_again = false
+	_keys = _parser_key_offsets[cs]
+	_trans = _parser_index_offsets[cs]
+	_klen = _parser_single_lengths[cs]
+	_break_match = false
+	
+	begin
+	  if _klen > 0
+	     _lower = _keys
+	     _upper = _keys + _klen - 1
+
+	     loop do
+	        break if _upper < _lower
+	        _mid = _lower + ( (_upper - _lower) >> 1 )
+
+	        if data[p] < _parser_trans_keys[_mid]
+	           _upper = _mid - 1
+	        elsif data[p] > _parser_trans_keys[_mid]
+	           _lower = _mid + 1
+	        else
+	           _trans += (_mid - _keys)
+	           _break_match = true
+	           break
+	        end
+	     end # loop
+	     break if _break_match
+	     _keys += _klen
+	     _trans += _klen
+	  end
+	  _klen = _parser_range_lengths[cs]
+	  if _klen > 0
+	     _lower = _keys
+	     _upper = _keys + (_klen << 1) - 2
+	     loop do
+	        break if _upper < _lower
+	        _mid = _lower + (((_upper-_lower) >> 1) & ~1)
+	        if data[p] < _parser_trans_keys[_mid]
+	          _upper = _mid - 2
+	        elsif data[p] > _parser_trans_keys[_mid+1]
+	          _lower = _mid + 2
+	        else
+	          _trans += ((_mid - _keys) >> 1)
+	          _break_match = true
+	          break
+	        end
+	     end # loop
+	     break if _break_match
+	     _trans += _klen
+	  end
+	end while false
+	cs = _parser_trans_targs_wi[_trans]
+	break if _parser_trans_actions_wi[_trans] == 0
+	_acts = _parser_trans_actions_wi[_trans]
+	_nacts = _parser_actions[_acts]
+	_acts += 1
+	while _nacts > 0
+		_nacts -= 1
+		_acts += 1
+		case _parser_actions[_acts - 1]
+when 0:
+# line 13 "lib/keyword_search.rl"
+		begin
+
+        tokstart = p;
+      		end
+# line 13 "lib/keyword_search.rl"
+when 1:
+# line 17 "lib/keyword_search.rl"
+		begin
+
+        key = data[tokstart...p-1]
+        results[key] ||= []
+      		end
+# line 17 "lib/keyword_search.rl"
+when 2:
+# line 22 "lib/keyword_search.rl"
+		begin
+
+        key = nil
+      		end
+# line 22 "lib/keyword_search.rl"
+when 3:
+# line 26 "lib/keyword_search.rl"
+		begin
+
+        value = data[tokstart..p-1]
+        value = value[1..-2] if ["'", '"'].include?(value[0,1])
+        (results[key || :default] ||= []) << value
+      		end
+# line 26 "lib/keyword_search.rl"
+when 4:
+# line 42 "lib/keyword_search.rl"
+		begin
+ raise ParseError, "At offset #{p}, near: '#{data[p,10]}'" 		end
+# line 42 "lib/keyword_search.rl"
+# line 244 "lib/keyword_search.rb"
+		end # action switch
+	end
+	end while false
+	break if _break_resume
+	break if cs == 0
+	p += 1
+	break if p == pe
+	end
+	end
+	end
+	end
+# line 69 "lib/keyword_search.rl"
+    	
+# line 258 "lib/keyword_search.rb"
+# line 70 "lib/keyword_search.rl"
+    	results
     end
+    
   end
   
-end
+end
+
+

data/lib/keyword_search.rl

@@ -0,0 +1,85 @@
+require File.dirname(__FILE__) << '/keyword_search/definition.rb'
+
+module KeywordSearch
+
+  class ParseError < ::SyntaxError; end  
+      
+  class << self
+  
+    %%{
+      
+      machine parser;
+      
+      action start {
+        tokstart = p;
+      }
+      
+      action key {
+        key = data[tokstart...p-1]
+        results[key] ||= []
+      }
+      
+      action default {
+        key = nil
+      }
+      
+      action value {
+        value = data[tokstart..p-1]
+        value = value[1..-2] if ["'", '"'].include?(value[0,1])
+        (results[key || :default] ||= []) << value
+      }
+      
+      action quote { quotes += 1 }
+      
+      action unquote { quotes -= 1 }
+      
+      bareword = [^ '":] [^ ":]*; # allow apostrophes
+      dquoted = '"' @ quote any* :>> '"' @ unquote;
+      squoted = '\'' @ quote any* :>> '\'' @ unquote;
+
+      value = ( dquoted | squoted | bareword );
+      
+      pair = (bareword > start ':') % key value > start % value ;
+      
+      definition = ( pair | value > start > default % value) ' ';        
+      main := definition** 0
+              @!{ raise ParseError, "At offset #{p}, near: '#{data[p,10]}'" };        
+    	    
+    }%%
+    
+    def search(input_string, definition=nil, &block)
+      definition ||= Definition.new(&block)
+      results = parse(input_string)
+      results.each do |key, terms|
+        definition.handle(key, terms)
+      end
+      results
+    end
+    
+    #######
+    private
+    #######
+    
+    def parse(input) #:nodoc:
+      data = input + ' '
+      %% write data;
+    	p = 0
+    	pe = data.length
+    	key = nil
+    	tokstart = nil
+    	results = {}
+    	quotes = 0
+      %% write init;
+      %% write exec;
+    	%% write eof;
+    	unless quotes.zero?
+    	  raise ParseError, "Unclosed quotes"
+    	end
+    	results
+    end
+    
+  end
+  
+end
+
+

data/lib/keyword_search/definition.rb

@@ -4,28 +4,29 @@ module KeywordSearch
     
     class Keyword
       
-      attr_reader :name, :description
-      
+      attr_reader :name, :description, :handler
       def initialize(name, description=nil, &handler)
         @name, @description = name, description
         @handler = handler
       end
       
       def handle(value)
-        @handler.call(value)
+        handler.call(value)
       end
       
     end
 
-    attr_reader :keywords
     def initialize
-      @keywords = []
       @default_keyword = nil
       yield self if block_given?
     end
+    
+    def keywords
+      @keywords ||= []
+    end
 
     def keyword(name, description=nil, &block)
-      @keywords << Keyword.new(name, description, &block)
+      keywords << Keyword.new(name, description, &block)
     end
       
     def default_keyword(name)
@@ -35,7 +36,7 @@ module KeywordSearch
     def handle(key, values)
       key = @default_keyword if key == :default
       return false unless key
-      if k = @keywords.detect{|kw| kw.name == key.to_sym}
+      if k = keywords.detect { |kw| kw.name == key.to_sym}
         k.handle(values) 
       end
     end

data/test/test_keyword_search.rb

@@ -1,7 +1,11 @@
 require 'test/unit'
+
+require 'rubygems' rescue nil
+require 'test/spec'
+
 require File.dirname(__FILE__) + '/../lib/keyword_search'
   
-class TestKeywordSearch < Test::Unit::TestCase
+context "KeywordSearch" do
   
   NAME_AND_AGE = %<bruce williams age:26>
   NAME_QUOTED_AND_AGE = %<"bruce williams" age:26>
@@ -10,7 +14,7 @@ class TestKeywordSearch < Test::Unit::TestCase
   DEFAULT_AGE_WITH_SINGLE_QUOTED_AGE = %<26 name:'bruce williams'>
   NAME_WITH_NESTED_SINGLE_QUOTES = %<"d'arcy d'uberville" age:28>
   
-  def test_default_keyword
+  specify "default keyword" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
       with.default_keyword :name
@@ -21,7 +25,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 'bruce williams', result
   end
   
-  def test_unquoted_keyword_term
+  specify "unquoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
       with.keyword :age do |values|
@@ -31,7 +35,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 26, result    
   end
   
-  def test_quoted_default_keyword_term
+  specify "quoted default keyword term" do
     result = nil
     KeywordSearch.search(NAME_QUOTED_AND_AGE) do |with|
       with.default_keyword :name
@@ -42,7 +46,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 'bruce williams', result    
   end
   
-  def test_quoted_keyword_term
+  specify "quoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_QUOTED_AGE) do |with|
       with.keyword :age do |values|
@@ -52,7 +56,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 26, result    
   end
   
-  def test_quoted_keyword_term_with_whitespace
+  specify "quoted keyword term with whitespace" do
     result = nil
     KeywordSearch.search(DEFAULT_AGE_WITH_QUOTED_AGE) do |with|
       with.default_keyword :age
@@ -63,9 +67,9 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 'bruce williams', result    
   end
   
-  def test_single_quoted_keyword_term_with_whitespace
-    result = nil
-    KeywordSearch.search(DEFAULT_AGE_WITH_SINGLE_QUOTED_AGE) do |with|
+  specify "single quoted keyword term with whitespace" do
+    result = nil    
+    r = KeywordSearch.search(DEFAULT_AGE_WITH_SINGLE_QUOTED_AGE) do |with|
       with.default_keyword :age
       with.keyword :name do |values|
         result = values.first
@@ -74,7 +78,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal 'bruce williams', result    
   end
   
-  def test_nested_single_quote_is_accumulated
+  specify "nested single quote is accumulated" do
     result = nil
     KeywordSearch.search(NAME_WITH_NESTED_SINGLE_QUOTES) do |with|
       with.default_keyword :name
@@ -85,7 +89,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal %<d'arcy d'uberville>, result    
   end
   
-  def test_nested_double_quote_is_accumulated
+  specify "nested double quote is accumulated" do
     result = nil
     KeywordSearch.search(%<'he was called "jake"'>) do |with|
       with.default_keyword :text
@@ -96,7 +100,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal %<he was called "jake">, result    
   end
   
-  def test_bare_single_quote_in_unquoted_literal_is_accumulated
+  specify "bare single quote in unquoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<bruce's age:27>) do |with|
       with.default_keyword :text
@@ -107,7 +111,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal %<bruce's>, result    
   end
   
-  def test_single_quoted_literal_is_accumulated
+  specify "single quoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<foo 'bruce williams' age:27>) do |with|
       with.default_keyword :text
@@ -118,7 +122,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal %<bruce williams>, result    
   end
   
-  def test_period_in_literal_is_accumulated
+  specify "period in literal is accumulated" do
     result = nil
     KeywordSearch.search(%<okay... age:27>) do |with|
       with.default_keyword :text
@@ -129,7 +133,7 @@ class TestKeywordSearch < Test::Unit::TestCase
     assert_equal %<okay...>, result    
   end
   
-  def test_parse_error_results_in_exception
+  specify "parse error results in exception" do
     assert_raises(KeywordSearch::ParseError) do
       KeywordSearch.search(%<we_do_not_allow:! or ::>) do |with|
         with.default_keyword :text
@@ -140,6 +144,38 @@ class TestKeywordSearch < Test::Unit::TestCase
     end
   end
   
+  specify "can use apostrophes in unquoted literal" do
+    result = nil
+    KeywordSearch.search(%<d'correct>) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values|
+        result = values.first
+      end
+    end
+    assert_equal "d'correct", result
+  end
+  
+  specify "can use apostrophes in unquoted literal values" do
+    result = nil
+    KeywordSearch.search(%<text:d'correct>) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values|
+        result = values.first
+      end
+    end
+    assert_equal "d'correct", result
+  end
+  
+  specify "cannot use an apostrophe at the beginning on an unquoted literal" do
+    assert_raises(KeywordSearch::ParseError) do
+      KeywordSearch.search(%<'thisiswrong>) do |with|
+        with.default_keyword :text
+        with.keyword :text do |values|
+          result = values.first
+        end
+      end
+    end
+  end
 end
 
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: keyword_search
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-05-09 00:00:00 -06:00
+  version: 1.3.0
+date: 2007-10-09 00:00:00 -05:00
 summary: Generic support for extracting GMail-style search keywords/values from strings
 require_paths: 
 - lib
 email: bruce@codefluency.com
 homepage: "    http://codefluency.rubyforge.org/keyword_search"
 rubyforge_project: codefluency
-description: "== FEATURES/PROBLEMS:  The library features a very simple, easy-to-use API. * Define handlers for supported keywords with blocks * Define the default keyword (values not part of a keyword/value pair)  Various notes: * Quoted values are supported. * Input is automatically downcased (both keywords and values should be assumed to be in lowercase)  Development Roadmap: 1.1:: Expand supported character set for keywords and values (currently supports a-z) 2.0:: Add negation and grouping (will break API backwards compatibility)  == SYNOPSIS:"
+description: "== FEATURES/PROBLEMS:  The library features a very simple, easy-to-use API. * Define handlers for supported keywords with blocks * Define the default keyword (values not part of a keyword/value pair)  Various notes: * Quoted values are supported. * Input is automatically downcased (both keywords and values should be assumed to be in lowercase)  Development Roadmap: 2.0:: Add negation and grouping (will break API backwards compatibility)  == SYNOPSIS:"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -34,18 +34,18 @@ files:
 - README.txt
 - Rakefile
 - lib/keyword_search.rb
+- lib/keyword_search.rl
 - lib/keyword_search/definition.rb
-- lib/keyword_search/evaluator.rb
-- lib/keyword_search/grammar.rb
-- lib/keyword_search/parser.rb
-- lib/keyword_search/tokenizer.rb
 - test/test_keyword_search.rb
 test_files: 
 - test/test_keyword_search.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -53,15 +53,6 @@ extensions: []
 requirements: []
 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: dhaka
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
@@ -69,5 +60,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.3.0
     version: 

data/lib/keyword_search/evaluator.rb

@@ -1,35 +0,0 @@
-module KeywordSearch
-  
-  class Evaluator < Dhaka::Evaluator
-
-    self.grammar = Grammar
-
-    define_evaluation_rules do
-
-      for_multiple_pairs do
-        child_nodes.inject({}) do |result,child_node|
-          evaluate(child_node).each do |key,value|
-            result[key] ||= []
-            result[key] += value
-          end
-          result
-        end
-      end
-
-      for_one_pair do
-        evaluate(child_nodes.first)
-      end
-
-      for_keyword_and_term do
-        {child_nodes.first.tokens.first.value => [child_nodes.last.tokens.first.value]}
-      end
-
-      for_default_keyword_term do
-        {:default => [child_nodes[0].tokens[0].value]}
-      end
-
-    end
-
-  end
-  
-end

data/lib/keyword_search/grammar.rb

@@ -1,21 +0,0 @@
-module KeywordSearch
-  
-  class Grammar < Dhaka::Grammar
-  
-    for_symbol(Dhaka::START_SYMBOL_NAME) do
-      start ['Pairs']
-    end
-  
-    for_symbol 'Pairs' do
-      one_pair ['Pair']
-      multiple_pairs ['Pairs', 'Pair']
-    end
-  
-    for_symbol 'Pair' do
-      keyword_and_term ['s', ':', 's']
-      default_keyword_term ['s']
-    end
-    
-  end
-  
-end

data/lib/keyword_search/parser.rb

@@ -1,40 +0,0 @@
-class KeywordSearch::Parser < Dhaka::CompiledParser
-
-  self.grammar = KeywordSearch::Grammar
-
-  start_with 0
-
-  at_state(1) {
-    for_symbols("_End_") { reduce_with "start" }
-    for_symbols("s") { shift_to 3 }
-    for_symbols("Pair") { shift_to 2 }
-  }
-
-  at_state(5) {
-    for_symbols("_End_", "s") { reduce_with "keyword_and_term" }
-  }
-
-  at_state(4) {
-    for_symbols("s") { shift_to 5 }
-  }
-
-  at_state(2) {
-    for_symbols("_End_", "s") { reduce_with "multiple_pairs" }
-  }
-
-  at_state(0) {
-    for_symbols("Pair") { shift_to 6 }
-    for_symbols("s") { shift_to 3 }
-    for_symbols("Pairs") { shift_to 1 }
-  }
-
-  at_state(6) {
-    for_symbols("_End_", "s") { reduce_with "one_pair" }
-  }
-
-  at_state(3) {
-    for_symbols(":") { shift_to 4 }
-    for_symbols("_End_", "s") { reduce_with "default_keyword_term" }
-  }
-
-end