xapian-fu 1.2 → 1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.3 (7th July 2011)
+
+* Support for phrase searching
+
 === 1.2 (5th July 2011)
 
 * Support for synonyms (Damian Janowski)

data/README.rdoc

@@ -139,7 +139,7 @@ Wildcards
 
 Phrase searches
 
-  db.search("'someone dropped a steamer in the gene pool'")
+  db.search("'a steamer in the gene pool'", :phrase => true)
 
 And any combinations of the above:
 
@@ -184,7 +184,7 @@ perhaps by reindexing once in a while.
 = More Info
 
 Author::  John Leach  (mailto:john@johnleach.co.uk)
-Copyright:: Copyright (c) 2009-2010 John Leach
+Copyright:: Copyright (c) 2009-2011 John Leach
 License:: MIT (The Xapian library is GPL)
 Mailing list:: http://rubyforge.org/mailman/listinfo/xapian-fu-discuss
 Web page:: http://johnleach.co.uk/documents/xapian-fu

data/lib/xapian_fu/query_parser.rb

@@ -120,7 +120,7 @@ module XapianFu #:nodoc:
       if @flags
         @flags
       else
-        valid_flags = [:boolean, :boolean_anycase, :wildcards, :lovehate, :spelling, :pure_not, :synonyms]
+        valid_flags = [:boolean, :boolean_anycase, :wildcards, :lovehate, :spelling, :pure_not, :synonyms, :phrase]
         @flags = valid_flags.delete_if { |vf| not @options[vf] }
       end
     end
@@ -136,6 +136,7 @@ module XapianFu #:nodoc:
       qflags |= Xapian::QueryParser::FLAG_SPELLING_CORRECTION if flags.include?(:spelling)
       qflags |= Xapian::QueryParser::FLAG_PURE_NOT if flags.include?(:pure_not)
       qflags |= Xapian::QueryParser::FLAG_AUTO_SYNONYMS if flags.include?(:synonyms)
+      qflags |= Xapian::QueryParser::FLAG_PHRASE if flags.include?(:phrase)
       qflags
     end
 

data/spec/xapian_db_spec.rb

@@ -292,6 +292,22 @@ describe XapianDb do
       results.corrected_query.should == ""
     end
 
+    it "should do phrase matching when the :phrase option is set" do
+      xdb = XapianDb.new
+      doc1 = xdb << "the dog growls at the guitar"
+      doc2 = xdb << "the cat growls at the dog"
+      xdb.search('"the dog growls"').should == [doc1, doc2]
+      xdb.search('"the dog growls"', :phrase => true).should == [doc1]
+    end
+
+    it "should do phrase matching on fields" do
+      xdb = XapianDb.new(:fields => [:title])
+      doc1 = xdb << { :title => "the dog growls", :body => "at the guitar" }
+      doc2 = xdb << { :title => "the cat growls", :body => "at the dog" }
+      xdb.search('title:"the dog growls"', :phrase => true).should == [doc1]
+      xdb.search('title:"at the guitar"', :phrase => true).should == []
+    end
+
 
     it "should do phrase matching by default when then :default_op option is :phrase" do
       pending

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: xapian-fu
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - John Leach
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-07-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec