kithe 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df697bf6cd0128be5ee217fb3eb191af55994b1284e1e05f75da73667e92d8f3
-  data.tar.gz: f388992232e60a99f7a6f7a2743e47a1690152665b9c85adbdf34457ce822104
+  metadata.gz: 5f1252c0becbda9f754e23af2333aaae66cf40cbfd6bacdad0f97425cd317de6
+  data.tar.gz: 8460f704869d27d5a2011f746e88b9016fde465d1cbb023c883fe600b0510c1d
 SHA512:
-  metadata.gz: '079a440ca120cc56e4a624b335cab990b2dc0f8a7df73821f251ecae4bf17f91000e9f57bc59c01d6a378577c871d1bc5d8a31ccee3a49a8402459edb532c7c0'
-  data.tar.gz: 73ba63882d5df383011c354c648b82f422891018679c8397a13143a937f9f9a12142eac18ea22d3162bb0f3f127b7ba9234a7309a18bd6329013c598ad17737d
+  metadata.gz: '0890b072c3bfb9901f4c910fcaf0f288dd72dc8c8164202998dfabf2db4b3f7a09dfeaa8df6c4c9cd242b0c98ec084c48f5214d4a2c8f4991ee6d08643495857'
+  data.tar.gz: e7c2bbe6f3f32ce67c646289f038a06d51f371fdb87634657296546c84fe3cb52a216b0a3c6648669f73e7d61f51b56a3afb0d28584fc85950dbf0936d6f5eda

data/app/indexing/kithe/indexable/thread_settings.rb

@@ -57,7 +57,7 @@ module Kithe
       def initialize(batching:, disable_callbacks:, original_settings:,
         writer:, on_finish:)
         @original_settings = original_settings
-        @batching = !!batching
+        @batching = batching
         @disable_callbacks = disable_callbacks
         @on_finish = on_finish
 
@@ -80,8 +80,9 @@ module Kithe
       def writer
         @writer ||= begin
           if @batching
+            batch_size = (@batching == true) ? Kithe.indexable_settings.batching_mode_batch_size : @batching
             @local_writer = true
-            Kithe.indexable_settings.writer_instance!("solr_writer.batch_size" => 100)
+            Kithe.indexable_settings.writer_instance!("solr_writer.batch_size" => batch_size)
           end
         end
       end

data/app/models/kithe/validators/model_parent.rb

@@ -1,5 +1,8 @@
 class Kithe::Validators::ModelParent < ActiveModel::Validator
   def validate(record)
+    # don't load the parent just to validate it if it hasn't even changed.
+    return unless record.parent_id_changed?
+
     if record.parent.present? && (record.parent.class <= Kithe::Asset)
       record.errors.add(:parent, 'can not be an Asset instance')
     end
@@ -7,7 +10,5 @@ class Kithe::Validators::ModelParent < ActiveModel::Validator
     if record.parent.present? && record.class <= Kithe::Collection
       record.errors.add(:parent, 'is invalid for Collection instances')
     end
-
-    # TODO avoid recursive parents, maybe using a postgres CTE for efficiency?
   end
 end

data/lib/kithe/indexable_settings.rb

@@ -1,14 +1,17 @@
 module Kithe
   class IndexableSettings
     attr_accessor :solr_url, :writer_class_name, :writer_settings,
-                  :model_name_solr_field, :solr_id_value_attribute, :disable_callbacks
+                  :model_name_solr_field, :solr_id_value_attribute, :disable_callbacks,
+                  :batching_mode_batch_size
     def initialize(solr_url:, writer_class_name:, writer_settings:,
-                   model_name_solr_field:, solr_id_value_attribute:, disable_callbacks: false)
+                   model_name_solr_field:, solr_id_value_attribute:, disable_callbacks: false,
+                   batching_mode_batch_size: 100)
       @solr_url = solr_url
       @writer_class_name = writer_class_name
       @writer_settings = writer_settings
       @model_name_solr_field = model_name_solr_field
       @solr_id_value_attribute = solr_id_value_attribute || 'id'
+      @batching_mode_batch_size = batching_mode_batch_size
     end
 
     # Use configured solr_url, and merge together with configured

data/lib/kithe/version.rb

@@ -1,3 +1,3 @@
 module Kithe
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: db-query-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement