xapian_db 1.3.11 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d51dc4c64a7d47ea51d42af7509932b6b15be2c02ec6d0ccd27482b762f4754d
-  data.tar.gz: dd2d7382f5537370e73f40bdb7d49d4e96a8b8ae3bfbe911aa54cfc6cff39694
+  metadata.gz: a29f75d11adde6b1e29a279ca708947892348e8cec46d5713a830c71c02b5885
+  data.tar.gz: 4d466f487f8c9df855d6a3ba49a28201e7aad91ff9efec6c8aa7a827dd25e616
 SHA512:
-  metadata.gz: abd8997703c4be61c239942432e208e34724e2132f8b7c1ebcf0a74544f03f0f45c665a2571ca97d3e9c6519511113736a124369a2a06fe9ecb67150e06aeba2
-  data.tar.gz: 995ac1009c8177051cb63dd3ac001d3e6e33e5788e0b6ef5d24f52be9de71180e8708af77b625c4e72ea1bdce46a9600567e4451840caf7a72615cd1df8b53db
+  metadata.gz: a3ef99e32b11ea43b1d5147036ad9e52a9fa513a4298d3800f24534837d4cf8c3e7a950fb6cd90f7abd81e3837901926fbf9ec0d2a66afdcf5b1ba11cd29a143
+  data.tar.gz: 30afda34bf9dfbcbf8d8f3838c8dd6971cacc19f8846ee5ec22a4fcdb70bb275e374e7e6f3c847e138cb30cc269b1b53289ba4737bc514b679305133415d230c

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.13 (August 26th, 2024)
+
+Changes:
+
+- make sidekiq_retry configurable for Xapian
+
+## 1.3.12 (August 23th, 2024)
+
+Changes:
+
+- Add set_max_expansion option
+
 ## 1.3.11 (November 13th, 2023)
 
 Changes:

data/README.rdoc

@@ -536,8 +536,11 @@ Install and start redis as described on the {resque github page}[https://github.
     database:     db/xapian_db/production
     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

@@ -57,6 +57,14 @@ module XapianDb
         @config.instance_variable_get("@_term_min_length") || 1
       end
 
+      def set_max_expansion
+        @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
@@ -74,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
+    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
@@ -149,6 +158,18 @@ module XapianDb
       @_sidekiq_queue = name
     end
 
+    # Set the value for the max_expansion setting.
+    # @param [Integer] value The value to set for the set_max_expansion setting.
+    def set_max_expansion(value)
+      @_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

@@ -40,6 +40,14 @@ module XapianDb
           klass = constantize options['class']
           DirectWriter.reindex_class klass, :verbose => false
         end
+
+        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

@@ -10,36 +10,48 @@ module XapianDb
 
       SidekiqWorker.class_eval do
         include Sidekiq::Worker
+
+        sidekiq_options set_max_expansion: set_max_expansion
       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

data/lib/xapian_db/query_parser.rb

@@ -32,6 +32,8 @@ module XapianDb
         parser.stemming_strategy = Xapian::QueryParser::STEM_SOME
         parser.stopper           = XapianDb::Config.stopper
       end
+      max_expansion = XapianDb::Config.set_max_expansion
+      parser.set_max_expansion(max_expansion, Xapian::Query::WILDCARD_LIMIT_MOST_FREQUENT) if max_expansion
 
       # Add the searchable prefixes to allow searches by field
       # (like "name:Kogler")

data/lib/xapian_db/railtie.rb

@@ -58,6 +58,8 @@ module XapianDb
         config.language @language.try(:to_sym)
         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
@@ -85,6 +87,8 @@ module XapianDb
       @term_min_length      = env_config["term_min_length"]
       @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.11
+  version: 1.3.13
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons