xapian_db 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c83c4915676e35cda8a6f364577e016a85e20286398497a9c836096a54fb81
-  data.tar.gz: 07c4310598ba2dcd13424cbc50b23b8fd5989bfb898b416f56f353de52f19797
+  metadata.gz: a29f75d11adde6b1e29a279ca708947892348e8cec46d5713a830c71c02b5885
+  data.tar.gz: 4d466f487f8c9df855d6a3ba49a28201e7aad91ff9efec6c8aa7a827dd25e616
 SHA512:
-  metadata.gz: 40e04a7578ed2f9619642e3a8959d7d207b80179a9b08bd3e980e49bf8a83c42963e1d80857a872a534dc34c00e92f47c0164533641e26626d383cfbb1c81903
-  data.tar.gz: 47b10314479c53db6bfb53f57bec32dae99f2bd35061133e0b4da4a46885c0295777ff1d3450c937a701648fefd52a61db24fe8add0bf468d52fe60898196bfb
+  metadata.gz: a3ef99e32b11ea43b1d5147036ad9e52a9fa513a4298d3800f24534837d4cf8c3e7a950fb6cd90f7abd81e3837901926fbf9ec0d2a66afdcf5b1ba11cd29a143
+  data.tar.gz: 30afda34bf9dfbcbf8d8f3838c8dd6971cacc19f8846ee5ec22a4fcdb70bb275e374e7e6f3c847e138cb30cc269b1b53289ba4737bc514b679305133415d230c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.13 (August 26th, 2024)
+
+Changes:
+
+- make sidekiq_retry configurable for Xapian
+
 ## 1.3.12 (August 23th, 2024)
 
 Changes:

data/README.rdoc

@@ -537,8 +537,10 @@ Install and start redis as described on the {resque github page}[https://github.
     writer:       sidekiq
     sidekiq_queue: my_queue
     set_max_expansion: 100
+    sidekiq_retry: false
 
 If you don't specify a queue name XapianDb will use 'xapian_db' by default.
+Additionally, if you don't provide a 'sidekiq_retry' option, it will default to 'false'.
 
 === 4. Start sidekiq
 

data/lib/xapian_db/config.rb

@@ -61,6 +61,10 @@ module XapianDb
         @config.instance_variable_get("@_set_max_expansion")
       end
 
+      def sidekiq_retry
+        @config.instance_variable_get("@_sidekiq_retry") || false
+      end
+
       def term_splitter_count
         @config.instance_variable_get("@_term_splitter_count") || 0
       end
@@ -78,8 +82,9 @@ module XapianDb
     # DSL methods
     # ---------------------------------------------------------------------------------
 
-    attr_reader :_database, :_adapter, :_writer, :_beanstalk_daemon, :_resque_queue, :_sidekiq_queue, 
-                :_stemmer, :_stopper, :_term_min_length, :_term_splitter_count, :_enabled_query_flags, :_set_max_expansion
+    attr_reader :_database, :_adapter, :_writer, :_beanstalk_daemon, :_resque_queue, :_sidekiq_queue,
+                :_stemmer, :_stopper, :_term_min_length, :_term_splitter_count, :_enabled_query_flags,
+                :_set_max_expansion, :_sidekiq_retry
 
     # Set the global database to use
     # @param [String] path The path to the database. Either apply a file sytem path or :memory
@@ -159,6 +164,12 @@ module XapianDb
       @_set_max_expansion = value
     end
 
+    # Set the value for the Sidekiq retry setting.
+    # @param [Boolean, Numeric] value The value to set for the Sidekiq retry setting.
+    def sidekiq_retry(value)
+      @_sidekiq_retry = value
+    end
+
     # Set the language.
     # @param [Symbol] lang The language; apply the two letter ISO639 code for the language
     # @example

data/lib/xapian_db/index_writers/sidekiq_worker.rb

@@ -44,6 +44,10 @@ module XapianDb
         def set_max_expansion
           XapianDb::Config.set_max_expansion
         end
+
+        def sidekiq_retry
+          XapianDb::Config.sidekiq_retry
+        end
       end
     end
   end

data/lib/xapian_db/index_writers/sidekiq_writer.rb

@@ -15,39 +15,45 @@ module XapianDb
       end
 
       class << self
-
-        # Update an object in the index
-        # @param [Object] obj An instance of a class with a blueprint configuration
-
         def queue
           XapianDb::Config.sidekiq_queue
         end
 
+        # 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: [])
-          Sidekiq::Client.enqueue_to(queue, worker_class, 'index',
-                                     {
-                                       class: obj.class.name,
-                                       id: obj.id,
-                                       changed_attrs: changed_attrs
-                                     }.to_json)
+          Sidekiq::Client.push('queue' => queue,
+                               'class' => worker_class,
+                               'args' => ['index', { class: obj.class.name, id: obj.id, changed_attrs: changed_attrs }.to_json],
+                               'retry' => sidekiq_retry)
         end
 
         # Remove an object from the index
         # @param [String] xapian_id The document id
         def delete_doc_with(xapian_id, _commit= true)
-          Sidekiq::Client.enqueue_to(queue, worker_class, 'delete_doc', { xapian_id: xapian_id }.to_json)
+          Sidekiq::Client.push('queue' => queue,
+                               'class' => worker_class,
+                               'args' => ['delete_doc', { xapian_id: xapian_id }.to_json],
+                               'retry' => sidekiq_retry)
         end
 
         # Reindex all objects of a given class
         # @param [Class] klass The class to reindex
         def reindex_class(klass, _options = {})
-          Sidekiq::Client.enqueue_to(queue, worker_class, 'reindex_class', { class: klass.name }.to_json)
+          Sidekiq::Client.push('queue' => queue,
+                               'class' => worker_class,
+                               'args' => ['reindex_class', { class: klass.name }.to_json],
+                               'retry' => sidekiq_retry)
         end
 
         def set_max_expansion
           XapianDb::Config.set_max_expansion
         end
 
+        def sidekiq_retry
+          XapianDb::Config.sidekiq_retry
+        end
+
         def worker_class
           SidekiqWorker
         end

data/lib/xapian_db/railtie.rb

@@ -59,6 +59,7 @@ module XapianDb
         config.term_min_length @term_min_length
         config.term_splitter_count @term_splitter_count
         config.set_max_expansion @set_max_expansion
+        config.sidekiq_retry @sidekiq_retry
         @enabled_query_flags.each  { |flag| config.enable_query_flag flag }
         @disabled_query_flags.each { |flag| config.disable_query_flag flag }
       end
@@ -87,6 +88,7 @@ module XapianDb
       @enable_phrase_search = env_config["enable_phrase_search"] == true
       @term_splitter_count  = env_config["term_splitter_count"] || 0
       @set_max_expansion    = env_config["set_max_expansion"]
+      @sidekiq_retry        = env_config["sidekiq_retry"]
 
       if env_config["enabled_query_flags"]
         @enabled_query_flags = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.21
+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