keyword_search 1.3.1 → 1.4.1

data/lib/keyword_search.rl

@@ -15,7 +15,7 @@ module KeywordSearch
       }
       
       action key {
-        key = data[tokstart...p-1]
+        key = word
         results[key] ||= []
       }
       
@@ -23,28 +23,53 @@ module KeywordSearch
         key = nil
       }
       
+      action word {
+        word = data[tokstart..p-1]
+      }
+      
       action value {
-        value = data[tokstart..p-1]
-        value = value[1..-2] if ["'", '"'].include?(value[0,1])
-        (results[key || :default] ||= []) << value
+        (results[key || :default] ||= []) << [ word, positive_match ]
+      }
+      
+      action negative_match {
+        positive_match = false
+      }
+      
+      action positive_match {
+        positive_match = true
       }
       
       action quote { quotes += 1 }
       
       action unquote { quotes -= 1 }
-      
-      bareword = [^ '":] [^ ":]*; # allow apostrophes
-      dquoted = '"' @ quote any* :>> '"' @ unquote;
-      squoted = '\'' @ quote any* :>> '\'' @ unquote;
 
-      value = ( dquoted | squoted | bareword );
+      seperators = ' '+ | / *[,|] */ ;
+
+      bareword = ( [^ '"(:] . [^ "):]* ) > start % word ; # allow apostrophes
+      dquoted = '"' @ quote ( [^"]* > start % word ) :>> '"' @ unquote;
+      squoted = '\'' @ quote ( [^']* > start % word ) :>> '\'' @ unquote;
+
+      anyword = dquoted | squoted | bareword ;      
+
+      anyvalue = anyword % value ;
+      multivalues = anyvalue ( seperators anyvalue )* ;
+      groupedvalues = '(' @ quote multivalues :>> ')' @ unquote;
+
+      value = groupedvalues | anyvalue ;
+
+      pair = bareword % key ':' value ;
+
+      value_only = value > default ;
       
-      pair = (bareword > start ':') % key value > start % value ;
+      match_mode = ('-' % negative_match | '+'? % positive_match ) ;
+
+      definition = match_mode? <: ( pair | value_only ) ;
       
-      definition = ( pair | value > start > default % value) ' ';        
-      main := definition** 0
+      definitions = definition ( ' '+ definition )*;
+
+      main := ' '* definitions? ' '* 0
               @!{ raise ParseError, "At offset #{p}, near: '#{data[p,10]}'" };        
-    	    
+
     }%%
     
     def search(input_string, definition=nil, &block)
@@ -64,14 +89,16 @@ module KeywordSearch
       data = input + ' '
       %% write data;
     	p = 0
+      eof = nil
+      word = nil
     	pe = data.length
     	key = nil
+      positive_match = nil
     	tokstart = nil
     	results = {}
     	quotes = 0
       %% write init;
       %% write exec;
-    	%% write eof;
     	unless quotes.zero?
     	  raise ParseError, "Unclosed quotes"
     	end

data/lib/keyword_search/definition.rb

@@ -10,8 +10,14 @@ module KeywordSearch
         @handler = handler
       end
       
-      def handle(value)
-        handler.call(value)
+      def handle(value, sign)
+        # If the handler is only expecting one argument, 
+        # only give them the positive matches
+        if handler.arity == 1
+          handler.call(value) if sign
+        else
+          handler.call(value, sign)
+        end
       end
       
     end
@@ -36,11 +42,16 @@ module KeywordSearch
     def handle(key, values)
       key = @default_keyword if key == :default
       return false unless key
+      true_values, false_values = *values.partition { |v| v[1] }
+      
+      # Get just the values
+      true_values.collect! { |v| v[0] }
+      false_values.collect! { |v| v[0] }
+      
       if k = keywords.detect { |kw| kw.name == key.to_sym}
-        k.handle(values) 
+        k.handle(true_values, true)   unless true_values.empty?
+        k.handle(false_values, false) unless false_values.empty?
       end
     end
-    
   end
-  
 end

data/test/test_keyword_search.rb

@@ -4,16 +4,20 @@ require 'rubygems' rescue nil
 require 'test/spec'
 
 require File.dirname(__FILE__) + '/../lib/keyword_search'
-  
+
 context "KeywordSearch" do
-  
+
   NAME_AND_AGE = %<bruce williams age:26>
   NAME_QUOTED_AND_AGE = %<"bruce williams" age:26>
-  NAME_AND_QUOTED_AGE = %<bruce williams age:"26">  
+  NAME_AND_QUOTED_AGE = %<bruce williams age:"26">
   DEFAULT_AGE_WITH_QUOTED_AGE = %<26 name:"bruce williams">
   DEFAULT_AGE_WITH_SINGLE_QUOTED_AGE = %<26 name:'bruce williams'>
   NAME_WITH_NESTED_SINGLE_QUOTES = %<"d'arcy d'uberville" age:28>
-  
+  NAME_AND_GROUPED_AGE = %<coda hale age:(27)>
+  NAME_AND_GROUPED_QUOTED_AGE = %<coda hale age:("27")>
+  NAME_AND_GROUPED_QUOTED_AGES = %<coda hale age:("27" 34 '48')>
+  GROUPED_NAMES_AND_AGE = %<(coda bruce 'hale' "williams") age:20>
+
   specify "default keyword" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
@@ -24,7 +28,18 @@ context "KeywordSearch" do
     end
     assert_equal 'bruce williams', result
   end
-  
+
+  specify "grouped default keywords" do
+    result = nil
+    KeywordSearch.search(GROUPED_NAMES_AND_AGE) do |with|
+      with.default_keyword :name
+      with.keyword :name do |values|
+        result = values
+      end
+    end
+    assert_equal ['coda', 'bruce', 'hale', 'williams'], result
+  end
+
   specify "unquoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_AGE) do |with|
@@ -32,9 +47,39 @@ context "KeywordSearch" do
         result = Integer(values.first)
       end
     end
-    assert_equal 26, result    
+    assert_equal 26, result
+  end
+
+  specify "unquoted grouped keyword term" do
+    result = nil
+    KeywordSearch.search(NAME_AND_GROUPED_AGE) do |with|
+      with.keyword :age do |values|
+        result = Integer(values.first)
+      end
+    end
+    assert_equal 27, result
+  end
+
+  specify "quoted grouped keyword term" do
+    result = nil
+    KeywordSearch.search(NAME_AND_GROUPED_QUOTED_AGE) do |with|
+      with.keyword :age do |values|
+        result = Integer(values.first)
+      end
+    end
+    assert_equal 27, result
   end
-  
+
+  specify "mixed grouped keyword terms" do
+    result = nil
+    KeywordSearch.search(NAME_AND_GROUPED_QUOTED_AGES) do |with|
+      with.keyword :age do |values|
+        result = values.map { |v| v.to_i }
+      end
+    end
+    assert_equal [27, 34, 48], result
+  end
+
   specify "quoted default keyword term" do
     result = nil
     KeywordSearch.search(NAME_QUOTED_AND_AGE) do |with|
@@ -43,9 +88,9 @@ context "KeywordSearch" do
         result = values.join(' ')
       end
     end
-    assert_equal 'bruce williams', result    
+    assert_equal 'bruce williams', result
   end
-  
+
   specify "quoted keyword term" do
     result = nil
     KeywordSearch.search(NAME_AND_QUOTED_AGE) do |with|
@@ -53,9 +98,9 @@ context "KeywordSearch" do
         result = Integer(values.first)
       end
     end
-    assert_equal 26, result    
+    assert_equal 26, result
   end
-  
+
   specify "quoted keyword term with whitespace" do
     result = nil
     KeywordSearch.search(DEFAULT_AGE_WITH_QUOTED_AGE) do |with|
@@ -64,20 +109,20 @@ context "KeywordSearch" do
         result = values.first
       end
     end
-    assert_equal 'bruce williams', result    
+    assert_equal 'bruce williams', result
   end
-  
+
   specify "single quoted keyword term with whitespace" do
-    result = nil    
+    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
       end
     end
-    assert_equal 'bruce williams', result    
+    assert_equal 'bruce williams', result
   end
-  
+
   specify "nested single quote is accumulated" do
     result = nil
     KeywordSearch.search(NAME_WITH_NESTED_SINGLE_QUOTES) do |with|
@@ -86,9 +131,9 @@ context "KeywordSearch" do
         result = values.first
       end
     end
-    assert_equal %<d'arcy d'uberville>, result    
+    assert_equal %<d'arcy d'uberville>, result
   end
-  
+
   specify "nested double quote is accumulated" do
     result = nil
     KeywordSearch.search(%<'he was called "jake"'>) do |with|
@@ -97,9 +142,9 @@ context "KeywordSearch" do
         result = values.first
       end
     end
-    assert_equal %<he was called "jake">, result    
+    assert_equal %<he was called "jake">, result
   end
-  
+
   specify "bare single quote in unquoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<bruce's age:27>) do |with|
@@ -108,9 +153,9 @@ context "KeywordSearch" do
         result = values.first
       end
     end
-    assert_equal %<bruce's>, result    
+    assert_equal %<bruce's>, result
   end
-  
+
   specify "single quoted literal is accumulated" do
     result = nil
     KeywordSearch.search(%<foo 'bruce williams' age:27>) do |with|
@@ -119,9 +164,9 @@ context "KeywordSearch" do
         result = values.last
       end
     end
-    assert_equal %<bruce williams>, result    
+    assert_equal %<bruce williams>, result
   end
-  
+
   specify "period in literal is accumulated" do
     result = nil
     KeywordSearch.search(%<okay... age:27>) do |with|
@@ -130,9 +175,9 @@ context "KeywordSearch" do
         result = values.first
       end
     end
-    assert_equal %<okay...>, result    
+    assert_equal %<okay...>, result
   end
-  
+
   specify "parse error results in exception" do
     assert_raises(KeywordSearch::ParseError) do
       KeywordSearch.search(%<we_do_not_allow:! or ::>) do |with|
@@ -143,7 +188,7 @@ context "KeywordSearch" do
       end
     end
   end
-  
+
   specify "can use apostrophes in unquoted literal" do
     result = nil
     KeywordSearch.search(%<d'correct>) do |with|
@@ -154,7 +199,7 @@ context "KeywordSearch" do
     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|
@@ -165,7 +210,7 @@ context "KeywordSearch" do
     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|
@@ -176,7 +221,7 @@ context "KeywordSearch" do
       end
     end
   end
-  
+
   specify "keywords are case sensitive" do
     result = nil
     KeywordSearch.search(%<Text:justtesting>) do |with|
@@ -185,11 +230,11 @@ context "KeywordSearch" do
       end
       with.keyword :Text do |values|
         result = :big
-      end      
+      end
     end
     assert_equal :big, result
   end
-  
+
   specify "values are case sensitive" do
     result = nil
     KeywordSearch.search(%<text:Big>) do |with|
@@ -199,11 +244,94 @@ context "KeywordSearch" do
     end
     assert_equal 'Big', result
   end
-  
-end
 
+  specify "spaces are condensed" do
+    result = nil
+    KeywordSearch.search(%<   this   is    some    text   >) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values|
+        result = values
+      end
+    end
+    assert_equal %w(this is some text), result
+  end
+
+  specify "an empty search is successful" do
+    result = nil
+    KeywordSearch.search(%<>) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values|
+        result = values
+      end
+    end
+    assert_nil result
+  end
+
+  specify 'a negative search' do
+    result = nil
+
+    KeywordSearch.search(%<-site:google.com>) do |with|
+      with.keyword :site do |values, positive|
+        result = [ values, positive ]
+      end
+    end
+    assert_equal [ [ 'google.com' ], false ], result
+  end
+
+  specify 'a positive search' do
+    result = nil
+
+    KeywordSearch.search(%<+site:google.com>) do |with|
+      with.keyword :site do |values, positive|
+        result = [ values, positive ]
+      end
+    end
+    assert_equal [ [ 'google.com' ], true ], result
+  end
+
+  specify 'a search with no sign' do
+    result = nil
+
+    KeywordSearch.search(%<site:google.com>) do |with|
+      with.keyword :site do |values, positive|
+        result = [ values, positive ]
+      end
+    end
+    assert_equal [ [ 'google.com' ], true ], result
+  end
+
+  specify 'a term should default to positive with no sign' do
+    result = nil
 
+    KeywordSearch.search(%<-site:google.com inurl:atom>) do |with|
+      with.keyword :inurl do |values, positive|
+        result = [ values, positive ]
+      end
+    end
+    assert_equal [ %w(atom), true ], result
+  end
 
+  specify 'a negative and positive search to the default keyword' do
+    result = []
 
+    KeywordSearch.search(%<text -google.com search>) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values, positive|
+        result << [ values, positive ]
+      end
+    end
+    assert_equal [ [ %w(text search), true ], [ %w(google.com), false ] ], result
+  end
 
+  specify 'a negative search to the default keyword with quotes' do
+    result = []
 
+    KeywordSearch.search(%<-google.com>) do |with|
+      with.default_keyword :text
+      with.keyword :text do |values, positive|
+        result << [ values, positive ]
+      end
+    end
+    assert_equal [ [ %w(google.com), false ] ], result
+  end
+end