kithe 0.2.0 → 0.3.0

data/spec/indexing/indexable_spec.rb

@@ -5,12 +5,12 @@ describe Kithe::Indexable, type: :model do
     @solr_url = "http://localhost:8983/solr/collection1"
     @solr_update_url = "#{@solr_url}/update/json?softCommit=true"
 
-    @original_solr_url = Kithe::Indexable.settings.solr_url
-    Kithe::Indexable.settings.solr_url =@solr_url
+    @original_solr_url = Kithe.indexable_settings.solr_url
+    Kithe.indexable_settings.solr_url =@solr_url
   end
 
   after do
-    Kithe::Indexable.settings.solr_url = @original_solr_url
+    Kithe.indexable_settings.solr_url = @original_solr_url
   end
 
   temporary_class("TestWork") do
@@ -101,10 +101,10 @@ describe Kithe::Indexable, type: :model do
 
     describe "with global disable_callbacks" do
       around do |example|
-        original = Kithe::Indexable.settings.disable_callbacks
-        Kithe::Indexable.settings.disable_callbacks = true
+        original = Kithe.indexable_settings.disable_callbacks
+        Kithe.indexable_settings.disable_callbacks = true
         example.run
-        Kithe::Indexable.settings.disable_callbacks = original
+        Kithe.indexable_settings.disable_callbacks = original
       end
 
       it "does not index" do
@@ -125,7 +125,7 @@ describe Kithe::Indexable, type: :model do
         thread_settings = nil
         it "batches solr updates" do
           stub_request(:post, @solr_update_url)
-          expect(Kithe::Indexable.settings.writer_class_name.constantize).to receive(:new).and_call_original
+          expect(Kithe.indexable_settings.writer_class_name.constantize).to receive(:new).and_call_original
 
           Kithe::Indexable.index_with(batching: true) do
             TestWork.create!(title: "test1")
@@ -142,7 +142,7 @@ describe Kithe::Indexable, type: :model do
         end
 
         it "creates no writer if no updates happen" do
-          expect(Kithe::Indexable.settings.writer_class_name.constantize).not_to receive(:new)
+          expect(Kithe.indexable_settings.writer_class_name.constantize).not_to receive(:new)
           Kithe::Indexable.index_with(batching: true) do
           end
         end
@@ -150,7 +150,7 @@ describe Kithe::Indexable, type: :model do
         it "respects non-default on_finish" do
           stub_request(:post, @solr_update_url)
           stub_request(:get, "#{@solr_url}/update/json?commit=true")
-          expect(Kithe::Indexable.settings.writer_class_name.constantize).to receive(:new).and_call_original
+          expect(Kithe.indexable_settings.writer_class_name.constantize).to receive(:new).and_call_original
 
           Kithe::Indexable.index_with(batching: true, on_finish: ->(w){ w.flush; w.commit(commit: true) }) do
             TestWork.create!(title: "test1")

data/spec/indexing/indexer_spec.rb

@@ -148,4 +148,36 @@ describe "Indexer end-to-end" do
       indexer.process_record(work)
     }.to raise_error(NameError)
   end
+
+  describe "custom solr_id_value_attribute" do
+    around do |example|
+      original = Kithe.indexable_settings.solr_id_value_attribute
+      Kithe.indexable_settings.solr_id_value_attribute = :friendlier_id
+      example.run
+      Kithe.indexable_settings.solr_id_value_attribute = original
+    end
+
+    it "indexes specified attribute to id" do
+      result = indexer.map_record(work)
+      expect(result).to include(
+        "id" => [work.friendlier_id]
+      )
+    end
+  end
+
+  describe "custom model_name_solr_field" do
+    around do |example|
+      original = Kithe.indexable_settings.model_name_solr_field
+      Kithe.indexable_settings.model_name_solr_field = "my_model_name"
+      example.run
+      Kithe.indexable_settings.model_name_solr_field = original
+    end
+
+    it "indexes specified attribute to id" do
+      result = indexer.map_record(work)
+      expect(result).to include(
+        "my_model_name" => ["TestWork"]
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,7 +332,10 @@ files:
 - db/migrate/20190109192252_contains_association.rb
 - db/migrate/20190404144551_kithe_model_type.rb
 - lib/kithe.rb
+- lib/kithe/blacklight_tools/bulk_loading_search_service.rb
+- lib/kithe/blacklight_tools/search_service_bulk_load.rb
 - lib/kithe/engine.rb
+- lib/kithe/indexable_settings.rb
 - lib/kithe/version.rb
 - lib/shrine/plugins/kithe_accept_remote_url.rb
 - lib/shrine/plugins/kithe_multi_cache.rb
@@ -422,12 +425,10 @@ files:
 - spec/shrine/kithe_storage_location_spec.rb
 - spec/simple_form_enhancements/repeatable_input_generator_spec.rb
 - spec/spec_helper.rb
-- spec/test_repro_attempt.rb
 - spec/test_support/audio/README.md
 - spec/test_support/audio/ice_cubes.mp3
 - spec/test_support/images/1x1_pixel.jpg
 - spec/test_support/images/2x2_pixel.jpg
-- spec/test_support/images/otherphoto.jpg
 - spec/test_support/images/photo_800x586.jpg
 - spec/test_support/shrine_spec_support.rb
 - spec/test_support/temporary_class_for_specs.rb
@@ -540,12 +541,10 @@ test_files:
 - spec/shrine/kithe_storage_location_spec.rb
 - spec/simple_form_enhancements/repeatable_input_generator_spec.rb
 - spec/spec_helper.rb
-- spec/test_repro_attempt.rb
 - spec/test_support/audio/ice_cubes.mp3
 - spec/test_support/audio/README.md
 - spec/test_support/images/1x1_pixel.jpg
 - spec/test_support/images/2x2_pixel.jpg
-- spec/test_support/images/otherphoto.jpg
 - spec/test_support/images/photo_800x586.jpg
 - spec/test_support/shrine_spec_support.rb
 - spec/test_support/temporary_class_for_specs.rb

data/spec/test_repro_attempt.rb

@@ -1,16 +0,0 @@
-require 'rails_helper'
-
-describe "yes", queue_adapter: :test do
-  it "fails" do
-      asset = Kithe::Model.new(title: "foo", type: "Kithe::Model")
-      asset.file_attacher.assign(StringIO.new("data"))
-      asset.save
-
-      asset.promote
-
-      #expect(asset.stored?).to be(true)
-      expect(asset.file_attacher.stored?).to be(true)
-      expect(asset.file.exists?).to be(true)
-      expect(asset.file.metadata.keys).to include("filename", "size", "mime_type", "width", "height", "md5", "sha1", "sha512")
-  end
-end