xapian-fu 1.5.1 → 1.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU5N2ExNTgxZjc3NzlhZjkwMjhiY2UzZDcwMzZhNzQwODk0N2M2ZQ==
+    ZWQ0ZTRhYmZlNmM5MWVlMWJmMjg1OTViNjYyNTBjYTc4NGMyYjlkMQ==
   data.tar.gz: !binary |-
-    YWE3ZDUwYmMyNTdiZjg2NzdhZGNjNTNkYzJhYjg2NzAzNTkyYjg2OA==
+    MGEyZjY2MDcxMTRjNWY4NjQ4ZDllNDAyYjY0Y2MzOTBmODg4ZTRmNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDVmYmQ3YzA4OWUzYTZhNzEzYWU5NmMyMzU0ZDNmOTE2NDUyMDEyMDQwZTZk
-    YTI0MGMwMzNiN2YwMmY0NmNlYzFmOTlhNjIzNTU5ZGZhZWI0MmMwZmNjNGI1
-    MWYwYTQxYWZhMDQ3ZWExOWExM2Q5NGMzY2QyYjZkNmViYTJhMWQ=
+    OGVhZDMyNzM4YzU3MDVkZDQwZDkwZTQ0NTdjZWM3N2U2YzM4Mjk2ZjExNWU3
+    NDA2MjI3N2YyNzEzNGY5NWNhZWYzMjZjYjViYzBjYmJjNTdjZmQ3YTUzOWFj
+    ZWFmMDI2OGFmOWVmNTMyYmE5OTI2MzgwMmNkNzM0NmZlMTZjOTM=
   data.tar.gz: !binary |-
-    NDE1OTM0NmQ2MThiZmVhYWU3YTYyNjEzZTIxNmE3MTRkZjRjYTI0MDhiNjg1
-    MGRmZWM5YmNmY2ZmZmQwZDYyNDYwOWU4NjdiMDY2NWRlMDgwOGRjZjdiMGZi
-    OGM4ZDgyODQ2ZWQxMzc2OTExOWY2ZjNlNWM1M2QyZDQwNTU1NjM=
+    MGUxNWFjYzAxMWNiZmU5ZGRkYWI2YTVjOThlYjk5Y2EwMjQ4ZjE4ZTE5MjUw
+    ZDFjODA2NDQ3ZGRhMDAyNzg1ZmFmY2EyNTAwMmFmNDk0NjdjNjI5NzI5NTRj
+    OGY2MDAxYjUxOTJkNzQ4NTEyMTZhYmEwMDQzMTU0MDQ4ZDdlNGM=

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 1.5.2 (25th July 2014)
+
+* Added `XapianDb#close` to close both the read and write databases.
+
+* Fixed a bug that caused the `:query_builder` to take precedence over
+  the given filters.
+
 === 1.5.1 (17th July 2014)
 
 * You can now customize the parsed query by passing `:query_builder` to

data/lib/xapian_fu/version.rb

@@ -1,3 +1,3 @@
 module XapianFu #:nodoc:
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 end

data/lib/xapian_fu/xapian_db.rb

@@ -271,12 +271,13 @@ module XapianFu #:nodoc:
 
       qp = XapianFu::QueryParser.new({ :database => self }.merge(options))
       query = qp.parse_query(q.is_a?(Symbol) ? q : q.to_s)
-      query = filter_query(query, options[:filter]) if options[:filter]
 
       if options.include?(:query_builder)
         query = options[:query_builder].call(query)
       end
 
+      query = filter_query(query, options[:filter]) if options[:filter]
+
       enquiry = Xapian::Enquire.new(ro)
       setup_ordering(enquiry, options[:order], options[:reverse])
       if options[:collapse]
@@ -339,6 +340,17 @@ module XapianFu #:nodoc:
       ro.reopen
     end
 
+    # Closes the database.
+    def close
+      raise ConcurrencyError if @tx_mutex.locked?
+
+      @rw.close if @rw
+      @rw = nil
+
+      @ro.close if @ro
+      @ro = nil
+    end
+
     def serialize_value(field, value, type = nil)
       if sortable_fields.include?(field)
         Xapian.sortable_serialise(value)

data/spec/xapian_db_spec.rb

@@ -48,6 +48,34 @@ describe XapianDb do
     xdb.size.should == 1
   end
 
+  it "closes" do
+    xdb = XapianDb.new(:dir => tmp_dir, :create => true)
+
+    xdb << "Once upon a time"
+    xdb.size.should == 0
+
+    # Make sure we're not using Database#reopen.
+    class << xdb.ro
+      def reopen
+        raise "Shouldn't use reopen when closing"
+      end
+    end
+
+    xdb.close
+    xdb.size.should == 1
+  end
+
+  it "fails when trying to close in the middle of a transaction" do
+    xdb = XapianDb.new(:dir => tmp_dir, :create => true)
+
+    lambda {
+      xdb.transaction do
+        xdb << "Once upon a time"
+        xdb.close
+      end
+    }.should raise_error(XapianFu::ConcurrencyError)
+  end
+
   it "should return a nice string when inspect is called" do
     XapianDb.new.inspect.should =~ /XapianDb/
   end
@@ -519,6 +547,15 @@ describe XapianDb do
       end
 
       xdb.search("john", :query_builder => builder).map(&:id).should == [1]
+
+      # The query builder should be called before filtering.
+      builder = lambda do |q|
+        Xapian::Query.new(Xapian::Query::OP_AND_MAYBE, Xapian::Query.new(""), q)
+      end
+
+      results = xdb.search("john", filter: {age: 10}, query_builder: builder)
+
+      results.map(&:id).should == [1]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian-fu
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - John Leach