wvanbergen-scoped_search 0.7.0 → 0.7.2

data/lib/scoped_search/query_language_parser.rb

@@ -87,10 +87,12 @@ module ScopedSearch
       tokens = []
       matches = query.scan(pattern).flatten.compact
       matches.each { |match|
-        tokens << :not unless match.index('-').nil?
-        # Remove any escaped quotes and any dashes - the dash usually the first character.
+        tokens << :not if match.index('-') == 0
+        # Remove any escaped quotes
+        # Remove any dashes preceded by a space or at the beginning of a token
         # Remove any additional spaces - more that one.
-        tokens << match.gsub(/[-"]/,'').gsub(/[ ]{2,}/, ' ')
+        cleaned_token = match.gsub(/"/,'').gsub(/^-| -/,'').gsub(/[ ]{2,}/, ' ')
+        tokens << cleaned_token if cleaned_token.length > 0
       }
       return tokens
     end

data/lib/scoped_search/reg_tokens.rb

@@ -1,7 +1,7 @@
 # Regular expression tokens to be used for parsing.
 module RegTokens
    
-  WORD = '[\w]+'
+  WORD = '[\w-]+'
   SPACE = '[ ]'
   STRING = '["][\w ]+["]'
   OR = 'OR'

data/test/query_language_test.rb

@@ -76,7 +76,17 @@ class QueryLanguageTest < Test::Unit::TestCase
     assert_equal 1, parsed.length
     assert_equal 'willem', parsed[0].first
     assert_equal :not,     parsed[0].last
-  
+
+    parsed = parse_query('hallo-world')
+    assert_equal 1, parsed.length
+    assert_equal 'hallo-world', parsed.first.first
+
+    parsed = parse_query('hallo -world')
+    assert_equal 2, parsed.length
+    assert_equal 'hallo', parsed.first.first
+    assert_equal 'world', parsed.last.first
+    assert_equal :not,     parsed.last.last
+
     parsed = parse_query('123 -"456 789"')
     assert_equal 2, parsed.length
     assert_equal '123', parsed[0].first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-scoped_search
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -07:00
+date: 2008-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: []