xapian_db 1.3.5.4 → 1.3.7.4

data/lib/xapian_db/index_writers/resque_worker.rb

@@ -22,7 +22,7 @@ module XapianDb
         def index(options)
           klass = constantize options['class']
           obj   = klass.respond_to?('get') ? klass.get(options['id']) : klass.find(options['id'])
-          DirectWriter.index obj
+          DirectWriter.index obj, true, changed_attrs: options[:changed_attrs]
         end
 
         def delete_doc(options)
@@ -34,7 +34,6 @@ module XapianDb
           DirectWriter.reindex_class klass, :verbose => false
         end
       end
-
     end
   end
 end

data/lib/xapian_db/index_writers/resque_writer.rb

@@ -12,8 +12,8 @@ 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)
-          Resque.enqueue worker_class, :index, :class => obj.class.name, :id => obj.id
+        def index(obj, commit=true, changed_attrs: [])
+          Resque.enqueue worker_class, :index, :class => obj.class.name, :id => obj.id, changed_attrs: changed_attrs
         end
 
         # Remove an object from the index
@@ -33,7 +33,6 @@ module XapianDb
         end
         private :worker_class
       end
-
     end
   end
 end

data/lib/xapian_db/index_writers/sidekiq_worker.rb

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

data/lib/xapian_db/index_writers/sidekiq_writer.rb

@@ -16,8 +16,8 @@ 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)
-          Sidekiq::Client.enqueue worker_class, :index, :class => obj.class.name, :id => obj.id
+        def index(obj, commit=true, changed_attrs: [])
+          Sidekiq::Client.enqueue worker_class, :index, :class => obj.class.name, :id => obj.id, :changed_attrs => changed_attrs
         end
 
         # Remove an object from the index
@@ -37,7 +37,6 @@ module XapianDb
         end
         private :worker_class
       end
-
     end
   end
 end

data/lib/xapian_db/index_writers/transactional_writer.rb

@@ -20,7 +20,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=false)
+      def index(obj, commit=false, changed_attrs: [])
         @index_requests << obj
       end
 
@@ -45,8 +45,6 @@ module XapianDb
         @delete_requests.each { |xapian_id| writer.delete_doc_with xapian_id, false }
         XapianDb.database.commit
       end
-
     end
-
   end
-end
+end

data/lib/xapian_db/indexer.rb

@@ -86,6 +86,7 @@ module XapianDb
           values = get_values_to_index_from obj
           values.each do |value|
             terms = value.to_s.downcase
+            terms = @blueprint.preprocess_terms.call(terms) if @blueprint.preprocess_terms
             terms = split(terms) if XapianDb::Config.term_splitter_count > 0 && !options.no_split
             # Add value with field name
             term_generator.index_text(terms, options.weight, "X#{method.upcase}") if options.prefixed

data/lib/xapian_db/query_parser.rb

@@ -35,6 +35,10 @@ module XapianDb
 
       # Add the searchable prefixes to allow searches by field
       # (like "name:Kogler")
+      processors = [] # The reason for having a seemingly useless "processors" array is as follows:
+      # We need to add a reference to the generated Xapian::XYValueRangeProcessor objects to the scope that calls parser.parse_query.
+      # If we don't, the Ruby GC will often garbage collect the generated objects before parser.parse_query can be called,
+      # which would free the memory of the corresponding C++ objects and result in segmentation faults upon calling parse_query.
       XapianDb::DocumentBlueprint.searchable_prefixes.each do |prefix|
         parser.add_prefix(prefix.to_s.downcase, "X#{prefix.to_s.upcase}")
         type_info = XapianDb::DocumentBlueprint.type_info_for(prefix)
@@ -42,11 +46,17 @@ module XapianDb
         value_number = XapianDb::DocumentBlueprint.value_number_for(prefix)
         case type_info
           when :date
-            parser.add_valuerangeprocessor Xapian::DateValueRangeProcessor.new(value_number, "#{prefix}:")
+            processor = Xapian::DateValueRangeProcessor.new(value_number, "#{prefix}:")
+            processors << processor
+            parser.add_valuerangeprocessor(processor)
           when :number
-            parser.add_valuerangeprocessor Xapian::NumberValueRangeProcessor.new(value_number, "#{prefix}:")
+            processor = Xapian::NumberValueRangeProcessor.new(value_number, "#{prefix}:")
+            processors << processor
+            parser.add_valuerangeprocessor(processor)
           when :string
-            parser.add_valuerangeprocessor Xapian::StringValueRangeProcessor.new(value_number, "#{prefix}:")
+            processor = Xapian::StringValueRangeProcessor.new(value_number, "#{prefix}:")
+            processors << processor
+            parser.add_valuerangeprocessor(processor)
         end
       end
       query = parser.parse_query(expression, @query_flags)

data/lib/xapian_db/resultset.rb

@@ -46,6 +46,7 @@ module XapianDb
     # @param [Hash] options
     # @option options [Integer] :db_size The current size (nr of docs) of the database
     # @option options [Integer] :limit The maximum number of documents to retrieve
+    # @option options [Integer] :offset The index of the first result to retrieve
     # @option options [Integer] :page (1) The page number to retrieve
     # @option options [Integer] :per_page (10) How many docs per page? Ignored if a limit option is given
     # @option options [String] :spelling_suggestion (nil) The spelling corrected query (if a language is configured)
@@ -56,25 +57,32 @@ module XapianDb
       db_size              = params.delete :db_size
       @spelling_suggestion = params.delete :spelling_suggestion
       limit                = params.delete :limit
+      offset               = params.delete :offset
       page                 = params.delete :page
       per_page             = params.delete :per_page
       raise ArgumentError.new "unsupported options for resultset: #{params}" if params.size > 0
       raise ArgumentError.new "db_size option is required" unless db_size
 
+      unless (page.nil? && per_page.nil?) || (limit.nil? && offset.nil?)
+        raise ArgumentError.new "Impossible combination of parameters. Either pass page and/or per_page, or limit and/or offset."
+      end
+
+      calculated_page = offset.nil? || limit.nil? ? nil : (offset.to_f / limit.to_f) + 1
+
       limit    = limit.nil? ? db_size : limit.to_i
-      per_page = per_page.nil? ? limit : per_page.to_i
-      page     = page.nil? ? 1 : page.to_i
-      offset   = (page - 1) * per_page
-      count  = offset + per_page < limit ? per_page : limit - offset
+      per_page = per_page.nil? ? limit.to_i : per_page.to_i
+      page     = page.nil? ? (calculated_page.nil? ? 1 : calculated_page) : page.to_i
+      offset   = offset.nil? ? (page - 1) * per_page : offset.to_i
+      count    = per_page < limit ? per_page : limit
 
+      return build_empty_resultset if (page - 1) * per_page > db_size
       result_window = enquiry.mset(offset, count)
       @hits = result_window.matches_estimated
       return build_empty_resultset if @hits == 0
-      raise ArgumentError.new "page #{@page} does not exist" if @hits > 0 && offset >= limit
 
       self.replace result_window.matches.map{|match| decorate(match).document}
       @total_pages  = (@hits / per_page.to_f).ceil
-      @current_page = page
+      @current_page = (page == page.to_i) ? page.to_i : page
       @limit_value  = per_page
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.3.5.4
+  version: 1.3.7.4
 platform: ruby
 authors:
 - Gernot Kogler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.15.1
+        version: 1.2.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.15.1
+        version: 1.2.22
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,9 +164,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: descendants_tracker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: XapianDb is a ruby gem that combines features of nosql databases and
   fulltext indexing. It is based on Xapian, an efficient and powerful indexing library
-email: gernot.kogler (at) garaio (dot) com
+email: gernot (at) kogler-informatik (dot) ch
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -221,11 +235,11 @@ files:
 - lib/xapian_db/utilities.rb
 - tasks/spec.rake
 - tasks/xapian_rebuild_index.rake
-homepage: https://github.com/garaio/xapian_db
+homepage: https://github.com/gernotkogler/xapian_db
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--line-numbers"
 - "--inline-source"
@@ -239,16 +253,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Ruby library to use a Xapian db as a key/value store with high performance
   fulltext search