xapian_db 0.5.8 → 0.5.9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+##0.5.9 (March 25th, 2011)
+
+Fixes:
+
+  - indexing was broken in 0.5.8
+
 ##0.5.8 (March 22th, 2011)
 
 Fixes:

data/lib/xapian_db.rb

@@ -88,13 +88,15 @@ module XapianDb
   # Update an object in the index
   # @param [Object] obj An instance of a class with a blueprint configuration
   def self.index(obj)
-    @writer.index obj
+    writer = @transactional_writer || XapianDb::Config.writer
+    writer.index obj
   end
 
   # Remove an object from the index
   # @param [Object] obj An instance of a class with a blueprint configuration
   def self.unindex(obj)
-    @writer.unindex obj
+    writer = @transactional_writer || XapianDb::Config.writer
+    writer.unindex obj
   end
 
   # Reindex all objects of a given class
@@ -102,7 +104,7 @@ module XapianDb
   # @param [Hash] options Options for reindexing
   # @option options [Boolean] :verbose (false) Should the reindexing give status informations?
   def self.reindex_class(klass, options={})
-    @writer.reindex_class klass, options
+    XapianDb::Config.writer.reindex_class klass, options
   end
 
   # Rebuild the xapian index for all configured blueprints
@@ -121,10 +123,10 @@ module XapianDb
   # Execute a block as a transaction
   def self.transaction(&block)
     # Temporarily use the transactional writer
-    @writer = XapianDb::IndexWriters::TransactionalWriter.new
+    @transactional_writer = XapianDb::IndexWriters::TransactionalWriter.new
     begin
       block.call
-      @writer.commit_using XapianDb::Config.writer
+      @transactional_writer.commit_using XapianDb::Config.writer
     rescue Exception => ex
       msg = "error in XapianDb transaction block: #{ex}, transaction aborted"
       if defined?(Rails)
@@ -133,8 +135,8 @@ module XapianDb
         puts msg
       end
     ensure
-      # switch back to the configured writer
-      @writer = XapianDb::Config.writer
+      # release the transactional writer
+      @transactional_writer = nil
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency