xapian_db 1.3.8 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a56c8dcca3d9af676803407a5f0ba9ca07d72a33c877909f9e5b7bc0ab884c
-  data.tar.gz: 19f87585356eb95bbe54c4e22d10b770b953c09c74856ffe10441fcf053c530d
+  metadata.gz: 5a85e207edfe687e3cdb78beb5056f293b9b152a49ebf8c373e76a67c5057f06
+  data.tar.gz: 2c103133ef9838b3d243e640fb51d970acb77384ac45cced1269efeb38789479
 SHA512:
-  metadata.gz: 107aa90d69efc2dccd06f104a66fd9b0a252491c1110ebbc879e3998c74fd7619b1c41c523af7f8017611287ad339290f5a0aec72b07825687873af9f6780ae4
-  data.tar.gz: 3052ca4107227f97f48bbbc023478279e2f06c952b604d77269bb52ae3add718675940ce044a99b616037e801144ed09c474ad53ed7344853046e8200ce7d2aa
+  metadata.gz: c21ff4ce44b81671de58eae9cd2817e781f473fd6b4518bf5b77def92711e204fcbb3fab45cd245d0776149dedda799a17c56e36109f55c583d51c27c3c90d12
+  data.tar.gz: a0893f80236829214c7db92f5a0a60bdd72a68ff90fbb84131cdff4e7a531c22163563d2f150a18d09a344e9ba2b66cac17dedc21d1f2ba5756f9239149ed71c

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.10 (March 2nd, 2023)
+
+Fixes:
+
+- Improved the code that reads the `xapian_db.yml` file to allow aliases in the yml file when using Ruby 3.1 or higher.
+
+## 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:

data/lib/xapian_db/railtie.rb

@@ -30,7 +30,11 @@ module XapianDb
       # Read the database configuration file if there is one
       config_file_path = "#{Rails.root}/config/xapian_db.yml"
       if File.exist?(config_file_path)
-        db_config = YAML::load_file config_file_path
+        db_config = if YAML.respond_to?(:unsafe_load_file) # Psych 4.0 way
+                      YAML.unsafe_load_file(config_file_path)
+                    else
+                      YAML.load_file(config_file_path)
+                    end
         env_config = db_config[Rails.env]
         env_config ? configure_from(env_config) : configure_defaults
       else

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.8
+  version: 1.3.10
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -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