textquery 0.1.2 → 0.1.3

data/.gitignore

@@ -0,0 +1,2 @@
+pkg
+textquery.gemspec

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/textquery/textquery.rb

@@ -72,8 +72,7 @@ class TextQuery
   private
 
   def update_options(options)
-    @options = {:delim => ' '}.merge options
-    @options[:delim] = Regexp.escape @options[:delim]
+    @options = {:delim => ' '}.merge(options)
+    @options[:delim] = "(#{[@options[:delim]].flatten.map { |opt| Regexp.escape(opt) }.join("|")})"
   end
-
 end

data/lib/textquery/textquery_grammar.treetop

@@ -49,7 +49,11 @@ grammar TextQueryGrammar
   end
 
   rule words
-    [^\']+ <WordMatch>
+    [^'"]+ <WordMatch>
+  end
+
+  rule quote
+    ['"]
   end
 
   rule value
@@ -65,7 +69,7 @@ grammar TextQueryGrammar
       end
     }
     /
-    "'" space words space "'" {
+    quote space words space quote {
       def eval(text, opt)
         words.eval(text, opt)
       end
@@ -73,5 +77,4 @@ grammar TextQueryGrammar
     /
     word
   end
-
 end

data/spec/textquery_spec.rb

@@ -132,6 +132,7 @@ describe TextQuery do
 
     # shakespeare got nothin' on ruby...
     parse("'to be' OR NOT 'to be'").eval("to be").should be_true
+    parse('"to be" OR NOT "to be"').eval("to be").should be_true
   end
 
   it "should treat spaces as implicit ANDs" do
@@ -199,4 +200,29 @@ describe TextQuery do
     TextQuery.new("a AND CD", :ignorecase => false).match?("A b cD").should be_false
   end
 
+  context 'delimiters' do
+    it 'should default to space delimiter' do
+      TextQuery.new("a").match?("a b").should be_true
+      TextQuery.new("a").match?("a*b").should be_false
+    end
+
+    it 'should accept a string delimiter' do
+      TextQuery.new("a", :delim => "*").match?("a*b").should be_true
+      TextQuery.new("a", :delim => "*").match?("a b").should be_false
+    end
+
+    it 'should accept an array of delimiters' do
+      TextQuery.new("a", :delim => ["*"]).match?("a*b").should be_true
+    end
+
+    it 'should OR delimiters together when provided as an array' do
+      TextQuery.new("a", :delim => ["*", "|"]).match?("a|b").should be_true
+      TextQuery.new("a", :delim => ["*", "|"]).match?("a*b").should be_true
+      TextQuery.new("a", :delim => ["*", "|"]).match?("a b").should be_false
+    end
+
+    it 'should not match just the delimiter' do
+      TextQuery.new("a*b", :delim => ["*", "<"]).match?("over<under").should be_false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: textquery
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -05:00
+date: 2010-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - README.rdoc
 - Rakefile
 - VERSION