xapian_db 1.3.7.4 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1979b59ffcc42e298d5696f7729c76e4e59394fc35e230c88c3bdbf0830279d7
-  data.tar.gz: 672b7bbbe1c2e2833fc09e57e5bf8916bae46812c31608f122e7b9732d39af6f
+  metadata.gz: a219ad5e9648568bdf084f50f5639133fb493a5dd6ec44c59e2adb03102c4bdc
+  data.tar.gz: 472fa6a0894c26c46991d61cd891202aa444f92b661b2f3172856e050e6f30d5
 SHA512:
-  metadata.gz: 3094d0d66b745bf3dee99f9569ada5239d990812c50a7c995fd588cd140ce8f11b659a504340ae345db17009dc1e2873d47b9934636989e4bdfe7851e113cdb5
-  data.tar.gz: 9ff35b2818e51c8e7654f3ee4fae591a32c8cdf03c5ab7c99097a728df4ddaa4adadf5e04fbf9ea515ca9ae5b0fc7b55752835f9e80722a95039e28b6725828c
+  metadata.gz: 8f4084aed2f0fce0edc901f695d076d740a61b72ea8e2ccd9b7315af3b7b389478da74d176e2bebf019d8d7f57632595cdc9a436df875c9f5ad16541f49ae96f
+  data.tar.gz: 3f7463fab1bfdec7ff5c47306243c6c48ed10abfb0fbda970246bbc08289431e14c625ef6b98b53013182ac2ac5c9b07565739ec801f1e3add5f8720cf7f661a

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.9 (October 26th, 2022)
+
+Fixes:
+
+- `XapianDb.execute_block` now uses `Thread.current[:xapian_db_block_writer]` to store its block-local writer as to avoid leaking into another Thread
+
+## 1.3.8 (July 19th, 2021)
+
+Fixes:
+
+- xapian docs are deleted in the after commit hook in order to respect transaction rollbacks
+
 ## 1.3.7.4 (October 27th, 2020)
 
 Changes:

data/README.rdoc

@@ -61,7 +61,7 @@ You can override these defaults by placing a config file named 'xapian_db.yml' i
 
   # XapianDb configuration
   defaults: &defaults
-    adapter: datamapper # Avaliable adapters: :active_record, :datamapper
+    adapter: datamapper # Available adapters: :active_record, :datamapper
     language: de        # Global language; can be overridden for specific blueprints
     term_min_length: 2  # Ignore single character terms
     enabled_query_flags: FLAG_PHRASE, FLAG_SPELLING_CORRECTION
@@ -226,7 +226,8 @@ If you want to manage the (re)indexing of your objects on your own, turn off aut
     blueprint.autoindex false
   end
 
-This will turn off the auto-reindexing for any object of the configured class. Use XapianDb.reindex(object) to trigger the reindexing logic in your code. Please note that destroying an object will always remove it from the xapian index.
+This will turn off the auto-reindexing for any object of the configured class. Use XapianDb.reindex(object) to trigger the reindexing logic in your code.
+It will also turn off the auto-deletion of the doc, when the object gets destroyed. Use XapianDb.delete_doc_with(object.xapian_id) to trigger deletion logic in your code.
 
 
 Place these configurations either into the corresponding class or - I prefer to have the index configurations outside

data/lib/xapian_db/adapters/active_record_adapter.rb

@@ -48,19 +48,16 @@ module XapianDb
            klass.class_eval do
              # add the after commit logic, unless the blueprint has autoindexing turned off
              if XapianDb::DocumentBlueprint.blueprint_for(klass.name).autoindex?
-               after_commit do
-                 unless self.destroyed?
-                   XapianDb.reindex(self, true, changed_attrs: self.previous_changes.keys)
-                   XapianDb::DocumentBlueprint.dependencies_for(klass.name, self.previous_changes.keys).each do |dependency|
-                     dependency.block.call(self).each{ |model| XapianDb.reindex model, true, changed_attrs: self.previous_changes.keys }
-                   end
+               after_commit on: [:create, :update] do
+                 XapianDb.reindex(self, true, changed_attrs: self.previous_changes.keys)
+                 XapianDb::DocumentBlueprint.dependencies_for(klass.name, self.previous_changes.keys).each do |dependency|
+                   dependency.block.call(self).each{ |model| XapianDb.reindex model, true, changed_attrs: self.previous_changes.keys }
                  end
                end
-             end
 
-             # add the after destroy logic
-             after_destroy do
-               XapianDb.delete_doc_with(self.xapian_id)
+               after_commit on: :destroy do
+                 XapianDb.delete_doc_with(self.xapian_id)
+               end
              end
 
              # Add a method to reindex all models of this class

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -47,22 +47,22 @@ module XapianDb
            end
 
            klass.class_eval do
+             # add the after save/destroy logic, unless the blueprint has autoindexing turned off
+             if XapianDb::DocumentBlueprint.blueprint_for(klass.name).autoindex?
+               after :save do
+                 blueprint = XapianDb::DocumentBlueprint.blueprint_for klass.to_s
+                 if blueprint.should_index?(self)
+                   XapianDb.index(self)
+                 else
+                   XapianDb.delete_doc_with(self.xapian_id)
+                 end
+               end
 
-             # add the after save logic
-             after :save do
-               blueprint = XapianDb::DocumentBlueprint.blueprint_for klass.to_s
-               if blueprint.should_index?(self)
-                 XapianDb.index(self)
-               else
+               after :destroy do
                  XapianDb.delete_doc_with(self.xapian_id)
                end
              end
 
-             # add the after destroy logic
-             after :destroy do
-               XapianDb.delete_doc_with(self.xapian_id)
-             end
-
              # Add a method to reindex all models of this class
              define_singleton_method(:rebuild_xapian_index) do |options={}|
                options[:primary_key] = klass.serial.name

data/lib/xapian_db/document_blueprint.rb

@@ -352,7 +352,7 @@ module XapianDb
     # @param [Array] args An array of arguments; you can pass a method name, an array of method names
     #   or a method name and an options hash.
     # @param [Block] &block An optional block for complex configurations
-    # Avaliable options:
+    # Available options:
     # - :weight (default: 1) The weight for this indexed value
     # @example Simple index declaration
     #   blueprint.index :name

data/lib/xapian_db/index_writers/beanstalk_worker.rb

@@ -13,7 +13,7 @@ module XapianDb
       def index_task(options)
         klass = constantize options[:class]
         obj   = klass.respond_to?(:get) ? klass.get(options[:id]) : klass.find(options[:id])
-        DirectWriter.index obj, true, changed_attrs: options[:changed_attrs]
+        DirectWriter.index obj, options[:commit], changed_attrs: options[:changed_attrs]
       end
 
       def delete_doc_task(options)

data/lib/xapian_db/index_writers/beanstalk_writer.rb

@@ -19,7 +19,7 @@ module XapianDb
         # Update an object in the index
         # @param [Object] obj An instance of a class with a blueprint configuration
         def index(obj, commit=true, changed_attrs: [])
-          beanstalk.put( { :task => "index_task", :class => obj.class.name, :id => obj.id, :changed_attrs => changed_attrs }.to_json )
+          beanstalk.put( { :task => "index_task", :class => obj.class.name, :id => obj.id, :changed_attrs => changed_attrs, :commit => commit }.to_json )
         end
 
         # Remove an object from the index

data/lib/xapian_db/indexer.rb

@@ -59,13 +59,16 @@ module XapianDb
     # Index all configured text methods
     def index_text
       term_generator = Xapian::TermGenerator.new
-      term_generator.database = @database.writer
       term_generator.document = @xapian_doc
       if XapianDb::Config.stemmer
         term_generator.stemmer  = XapianDb::Config.stemmer
         term_generator.stopper  = XapianDb::Config.stopper if XapianDb::Config.stopper
         # Enable the creation of a spelling dictionary if the database is not in memory
-        term_generator.set_flags Xapian::TermGenerator::FLAG_SPELLING if @database.is_a? XapianDb::PersistentDatabase
+        if @database.is_a?(XapianDb::PersistentDatabase) &&
+           XapianDb::Config.query_flags.include?(Xapian::QueryParser::FLAG_SPELLING_CORRECTION)
+          term_generator.database = @database.writer
+          term_generator.set_flags Xapian::TermGenerator::FLAG_SPELLING
+        end
       end
 
       # Index the primary key as a unique term

data/lib/xapian_db.rb

@@ -106,21 +106,21 @@ module XapianDb
   # Update an object in the index
   # @param [Object] obj An instance of a class with a blueprint configuration
   def self.index(obj, commit=true, changed_attrs: [])
-    writer = @block_writer || XapianDb::Config.writer
+    writer = Thread.current[:xapian_db_block_writer] || XapianDb::Config.writer
     writer.index obj, commit, changed_attrs: changed_attrs
   end
 
   # Remove a document from the index
   # @param [String] xapian_id The document id
   def self.delete_doc_with(xapian_id, commit=true)
-    writer = @block_writer || XapianDb::Config.writer
+    writer = Thread.current[:xapian_db_block_writer] || XapianDb::Config.writer
     writer.delete_doc_with xapian_id, commit
   end
 
   # Update or delete a xapian document belonging to an object depending on the ignore_if logic(if present)
   # @param [Object] object An instance of a class with a blueprint configuration
   def self.reindex(object, commit=true, changed_attrs: [])
-    writer = @block_writer || XapianDb::Config.writer
+    writer = Thread.current[:xapian_db_block_writer] || XapianDb::Config.writer
     blueprint = XapianDb::DocumentBlueprint.blueprint_for object.class.name
     if blueprint.should_index?(object)
       writer.index object, commit, changed_attrs: changed_attrs
@@ -174,7 +174,7 @@ module XapianDb
   # @option opts [Object] :writer An index writer
   # @option opts [String] :error_message the error message to log if an error occurs
   def self.execute_block(opts, &block)
-    @block_writer = opts[:writer]
+    Thread.current[:xapian_db_block_writer] = opts[:writer]
     begin
       block.call
     rescue Exception => ex
@@ -188,7 +188,7 @@ module XapianDb
       raise
     ensure
       # release the block writer
-      @block_writer = nil
+      Thread.current[:xapian_db_block_writer] = nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.3.7.4
+  version: 1.3.9
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.22
+        version: 1.4.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.22
+        version: 1.4.17
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -260,8 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Ruby library to use a Xapian db as a key/value store with high performance