textquery 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/textquery/textquery_grammar.treetop

@@ -48,12 +48,20 @@ grammar TextQueryGrammar
     [^\s\(\)]+ <WordMatch>
   end
 
-  rule words
-    [^'"]+ <WordMatch>
+  rule single_quote
+    [']
   end
 
-  rule quote
-    ['"]
+  rule single_quote_words
+    [^']+ <WordMatch>
+  end
+
+  rule double_quote
+    ["]
+  end
+
+  rule double_quote_words
+    [^"]+ <WordMatch>
   end
 
   rule value
@@ -69,9 +77,15 @@ grammar TextQueryGrammar
       end
     }
     /
-    quote space words space quote {
+    double_quote space double_quote_words space double_quote {
+      def eval(text, opt)
+        double_quote_words.eval(text, opt)
+      end
+    }
+    /
+    single_quote space single_quote_words space single_quote {
       def eval(text, opt)
-        words.eval(text, opt)
+        single_quote_words.eval(text, opt)
       end
     }
     /

data/spec/textquery_spec.rb

@@ -135,6 +135,16 @@ describe TextQuery do
     parse('"to be" OR NOT "to be"').eval("to be").should be_true
   end
 
+  it "should accept mixed quotes inside the exact match queries" do
+    parse("seattle's best").eval("seattle's best").should be_true
+
+    parse("peets OR \"seattle's best\"").eval("peets").should be_true
+    parse("peets OR \"seattle's best\"").eval("seattle's").should be_false
+
+    parse("\"seattle's best\"").eval("seattle's best coffee").should be_true
+    parse('"seattle\'s best"').eval("seattle's best coffee").should be_true
+  end
+
   it "should treat spaces as implicit ANDs" do
     parse("a b").eval("a c b").should be_true
     parse("b a c").eval("a c b").should be_true
@@ -172,7 +182,7 @@ describe TextQuery do
 
     parse("~a~3").eval("daffy").should be_true
     parse("a~1").eval("adf").should be_false
-    
+
     parse("a~1 AND b").eval("adf b").should be_false
     parse("a~2 AND b").eval("adf b").should be_true
     parse("a~3 AND b").eval("adf b").should be_false

data/textquery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{textquery}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-08-18}
   s.description = %q{Evaluate any text against a collection of match rules}
   s.email = %q{ilya@igvita.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2010-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency