xapian_db 1.3.10 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a85e207edfe687e3cdb78beb5056f293b9b152a49ebf8c373e76a67c5057f06
-  data.tar.gz: 2c103133ef9838b3d243e640fb51d970acb77384ac45cced1269efeb38789479
+  metadata.gz: 10c83c4915676e35cda8a6f364577e016a85e20286398497a9c836096a54fb81
+  data.tar.gz: 07c4310598ba2dcd13424cbc50b23b8fd5989bfb898b416f56f353de52f19797
 SHA512:
-  metadata.gz: c21ff4ce44b81671de58eae9cd2817e781f473fd6b4518bf5b77def92711e204fcbb3fab45cd245d0776149dedda799a17c56e36109f55c583d51c27c3c90d12
-  data.tar.gz: a0893f80236829214c7db92f5a0a60bdd72a68ff90fbb84131cdff4e7a531c22163563d2f150a18d09a344e9ba2b66cac17dedc21d1f2ba5756f9239149ed71c
+  metadata.gz: 40e04a7578ed2f9619642e3a8959d7d207b80179a9b08bd3e980e49bf8a83c42963e1d80857a872a534dc34c00e92f47c0164533641e26626d383cfbb1c81903
+  data.tar.gz: 47b10314479c53db6bfb53f57bec32dae99f2bd35061133e0b4da4a46885c0295777ff1d3450c937a701648fefd52a61db24fe8add0bf468d52fe60898196bfb

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.3.12 (August 23th, 2024)
+
+Changes:
+
+- Add set_max_expansion option
+
+## 1.3.11 (November 13th, 2023)
+
+Changes:
+
+- Update sidekiq version
+
 ## 1.3.10 (March 2nd, 2023)
 
 Fixes:

data/README.rdoc

@@ -536,6 +536,7 @@ 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
 
 If you don't specify a queue name XapianDb will use 'xapian_db' by default.
 

data/lib/xapian_db/config.rb

@@ -57,6 +57,10 @@ module XapianDb
         @config.instance_variable_get("@_term_min_length") || 1
       end
 
+      def set_max_expansion
+        @config.instance_variable_get("@_set_max_expansion")
+      end
+
       def term_splitter_count
         @config.instance_variable_get("@_term_splitter_count") || 0
       end
@@ -75,7 +79,7 @@ module XapianDb
     # ---------------------------------------------------------------------------------
 
     attr_reader :_database, :_adapter, :_writer, :_beanstalk_daemon, :_resque_queue, :_sidekiq_queue, 
-                :_stemmer, :_stopper, :_term_min_length, :_term_splitter_count, :_enabled_query_flags
+                :_stemmer, :_stopper, :_term_min_length, :_term_splitter_count, :_enabled_query_flags, :_set_max_expansion
 
     # Set the global database to use
     # @param [String] path The path to the database. Either apply a file sytem path or :memory
@@ -149,6 +153,12 @@ 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 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

@@ -24,19 +24,26 @@ module XapianDb
         end
 
         def index(options)
+          options = JSON.parse(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]
         end
 
         def delete_doc(options)
+          options = JSON.parse(options)
           DirectWriter.delete_doc_with options['xapian_id']
         end
 
         def reindex_class(options)
+          options = JSON.parse(options)
           klass = constantize options['class']
           DirectWriter.reindex_class klass, :verbose => false
         end
+
+        def set_max_expansion
+          XapianDb::Config.set_max_expansion
+        end
       end
     end
   end

data/lib/xapian_db/index_writers/sidekiq_writer.rb

@@ -10,26 +10,42 @@ 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 index(obj, commit=true, changed_attrs: [])
-          Sidekiq::Client.enqueue worker_class, :index, :class => obj.class.name, :id => obj.id, :changed_attrs => changed_attrs
+
+        def queue
+          XapianDb::Config.sidekiq_queue
+        end
+
+        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)
         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 worker_class, :delete_doc, :xapian_id => xapian_id
+        def delete_doc_with(xapian_id, _commit= true)
+          Sidekiq::Client.enqueue_to(queue, worker_class, 'delete_doc', { xapian_id: xapian_id }.to_json)
         end
 
         # Reindex all objects of a given class
         # @param [Class] klass The class to reindex
-        def reindex_class(klass, options = {})
-          Sidekiq::Client.enqueue worker_class, :reindex_class, :class => klass.name
+        def reindex_class(klass, _options = {})
+          Sidekiq::Client.enqueue_to(queue, worker_class, 'reindex_class', { class: klass.name }.to_json)
+        end
+
+        def set_max_expansion
+          XapianDb::Config.set_max_expansion
         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,7 @@ 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
         @enabled_query_flags.each  { |flag| config.enable_query_flag flag }
         @disabled_query_flags.each { |flag| config.disable_query_flag flag }
       end
@@ -85,6 +86,7 @@ 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"]
 
       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.10
+  version: 1.3.12
 platform: ruby
 authors:
 - Gernot Kogler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -126,16 +126,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: xapian-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Ruby library to use a Xapian db as a key/value store with high performance