blacklight-spotlight 3.0.0.rc4 → 3.0.2

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -48,7 +48,10 @@ describe Spotlight::AddUploadsFromCsv do
       expect(Spotlight::IndexingCompleteMailer).to have_received(:documents_indexed).with(
         data, exhibit, user,
         indexed_count: 1,
-        errors: { 1 => array_including(match(/relative URI: x/)), 2 => array_including(match(/Upload is invalid/)) }
+        errors: {
+          1 => array_including(match(Regexp.union(/relative URI: x/, /URI scheme '' not in whitelist:/))),
+          2 => array_including(match(/Upload is invalid/))
+        }
       )
     end
   end

data/spec/jobs/spotlight/change_visibility_job_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+describe Spotlight::ChangeVisibilityJob do
+  subject { described_class.new(solr_params: solr_params, exhibit: exhibit, visibility: visibility) }
+
+  let(:solr_params) { { q: 'map' } }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:visibility) { 'private' }
+
+  before do
+    allow(Spotlight::Engine.config).to receive_messages(bulk_actions_batch_size: 5)
+  end
+
+  it 'sets the items based off of the visibility' do
+    subject.perform_now
+    response = exhibit.blacklight_config.repository.search(solr_params.merge('rows' => 999_999_999))
+    expect(response.total).to eq 55
+    expect(Spotlight::JobTracker.last).to have_attributes(
+      status: 'completed',
+      total: 55,
+      progress: 55,
+      job_class: 'Spotlight::ChangeVisibilityJob'
+    )
+    response.documents.each do |document|
+      expect(document.private?(exhibit)).to be true
+      document.make_public!(exhibit)
+      document.reindex
+    end
+  end
+end

data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+def tag_names(exhibit, id)
+  exhibit.blacklight_config.repository.find(id).documents.first.sidecar(exhibit).taggings.includes(:tag).map { |tagging| tagging&.tag&.name }
+end
+
+describe Spotlight::ProcessBulkUpdatesCsvJob do
+  subject { described_class.new(exhibit, bulk_update) }
+
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+
+  describe 'visibility' do
+    let(:bulk_update) { FactoryBot.create(:bulk_update, exhibit: exhibit) }
+
+    it 'is updated' do
+      allow(SolrDocument.index.connection).to receive(:update).and_call_original
+      expect(exhibit.blacklight_config.repository.find('dq287tq6352').documents.first).not_to be_private(exhibit)
+
+      subject.perform_now
+
+      expect(exhibit.blacklight_config.repository.find('dq287tq6352').documents.first).to be_private(exhibit)
+      expect(SolrDocument.index.connection).to have_received(:update)
+    end
+
+    context 'with a row that does not change visibility' do
+      before do
+        sidecar = exhibit.solr_document_sidecars.find_or_create_by(document_type: 'SolrDocument', document_id: 'dq287tq6352')
+        sidecar.private!
+      end
+
+      it 'does not update solr' do
+        allow(SolrDocument.index.connection).to receive(:update)
+
+        subject.perform_now
+
+        expect(SolrDocument.index.connection).not_to have_received(:update)
+      end
+    end
+  end
+
+  describe 'tags' do
+    let(:bulk_update) { FactoryBot.create(:tagged_bulk_update, exhibit: exhibit) }
+
+    before do
+      document = exhibit.blacklight_config.repository.find('cz507zk0531').documents.first
+      exhibit.tag(document.sidecar(exhibit), with: 'CSV Tag1', on: :tags)
+    end
+
+    it 'are added/removed' do
+      allow(SolrDocument.index.connection).to receive(:update).and_call_original
+      expect(tag_names(exhibit, 'bm387cy2596')).to be_empty
+      expect(tag_names(exhibit, 'cz507zk0531')).to eq(['CSV Tag1'])
+      expect(tag_names(exhibit, 'dq287tq6352')).to be_empty
+      subject.perform_now
+      expect(tag_names(exhibit, 'bm387cy2596')).to eq(['CSV Tag1', 'CSV Tag2'])
+      expect(tag_names(exhibit, 'cz507zk0531')).to eq(['CSV Tag2'])
+      expect(tag_names(exhibit, 'dq287tq6352')).to eq(['CSV Tag1', 'CSV Tag2'])
+
+      # 3 updates plus the final commit
+      expect(SolrDocument.index.connection).to have_received(:update).exactly(4).times
+    end
+
+    context 'with a row that does not change visibility' do
+      before do
+        # set up the documents to match what's the in the spreadsheet already
+        subject.perform_now
+      end
+
+      it 'does not update solr' do
+        allow(SolrDocument.index.connection).to receive(:update)
+
+        subject.perform_now
+
+        expect(SolrDocument.index.connection).not_to have_received(:update)
+      end
+    end
+  end
+end

data/spec/jobs/spotlight/reindex_job_spec.rb

@@ -8,7 +8,6 @@ describe Spotlight::ReindexJob do
   let(:user) { FactoryBot.create(:user) }
 
   before do
-    ActiveJob::Base.queue_adapter = :test
     allow_any_instance_of(Spotlight::Resource).to receive(:reindex)
   end
 
@@ -19,6 +18,10 @@ describe Spotlight::ReindexJob do
       expect(resource).to receive(:reindex)
       subject.perform_now
     end
+
+    it 'adds some job tracking events' do
+      expect { subject.perform_now }.to change(Spotlight::Event, :count).by(1)
+    end
   end
 
   describe 'validity' do

data/spec/jobs/spotlight/remove_tags_job_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+describe Spotlight::RemoveTagsJob do
+  subject { described_class.new(solr_params: solr_params, exhibit: exhibit, tags: tags) }
+
+  let(:solr_params) { { q: 'map' } }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:tags) { %w[hello world] }
+
+  before do
+    allow(Spotlight::Engine.config).to receive_messages(bulk_actions_batch_size: 5)
+  end
+
+  it 'removes tags from SolrDocumentSidecar objects' do
+    response = exhibit.blacklight_config.repository.search(solr_params.merge('rows' => 999_999_999))
+    expect(response.total).to eq 55
+    response.documents.each do |document|
+      exhibit.tag(document.sidecar(exhibit), with: %w[hello world], on: :tags)
+      document.reindex
+    end
+    subject.perform_now
+    response = exhibit.blacklight_config.repository.search(solr_params.merge('rows' => 999_999_999))
+    expect(response.total).to eq 55
+    expect(Spotlight::JobTracker.last).to have_attributes(
+      status: 'completed',
+      total: 55,
+      progress: 55,
+      job_class: 'Spotlight::RemoveTagsJob'
+    )
+    response.documents.each do |document|
+      expect(document.sidecar(exhibit).all_tags_list).to eq []
+    end
+    exhibit.owned_tags.destroy_all
+    response.documents.each do |document|
+      document.sidecar(exhibit).destroy
+      document.reindex
+    end
+  end
+end

data/spec/lib/migration/iiif_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Migration::IIIF do
     context "when it's any FeaturedImage" do
       it 'updates the iiif_tilesource attribute based on the given host and image resource' do
         instance.run
-        expect(updated_thumb.iiif_tilesource).to eq "http://test.host/images/#{updated_thumb.id}/info.json"
+        expect(updated_thumb.iiif_tilesource).to match %r{http://test.host/images/#{updated_thumb.id}-.*/info.json}
       end
 
       it 'returns a nil region if one was not set' do

data/spec/models/spotlight/ability_spec.rb

@@ -80,6 +80,7 @@ describe Spotlight::Ability, type: :model do
     it { is_expected.to be_able_to(:destroy, translation) }
 
     it { is_expected.to be_able_to(:tag, exhibit) }
+    it { is_expected.to be_able_to(:bulk_update, exhibit) }
 
     it { is_expected.to be_able_to(:edit, contact) }
     it { is_expected.to be_able_to(:new, contact) }
@@ -88,4 +89,30 @@ describe Spotlight::Ability, type: :model do
     it { is_expected.not_to be_able_to(:manage, language) }
     it { is_expected.to be_able_to(:read, language) }
   end
+
+  context 'with an unpublished exhibit' do
+    before do
+      exhibit.update(published: false)
+    end
+
+    context 'with a user with a viewer role' do
+      let(:user) { FactoryBot.create(:user, :with_exhibit_role, role: 'viewer', exhibit: exhibit) }
+
+      it { is_expected.not_to be_able_to(:create, exhibit) }
+      it { is_expected.to be_able_to(:read, exhibit) }
+      it { is_expected.to be_able_to(:read, page) }
+      it { is_expected.not_to be_able_to(:create, Spotlight::Page.new(exhibit: exhibit)) }
+      it { is_expected.to be_able_to(:read, search) }
+      it { is_expected.to be_able_to(:read, public_language) }
+      it { is_expected.not_to be_able_to(:read, language) }
+      it { is_expected.not_to be_able_to(:read, unpublished_search) }
+      it { is_expected.not_to be_able_to(:tag, exhibit) }
+    end
+
+    context 'with an anonymous user' do
+      let(:user) { FactoryBot.create(:exhibit_visitor) }
+
+      it { is_expected.not_to be_able_to(:read, exhibit) }
+    end
+  end
 end

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -42,8 +42,7 @@ describe Spotlight::AccessControlsEnforcementSearchBuilder do
     it 'does not filter resources to just those created by the exhibit' do
       allow(current_ability).to receive(:can?).and_return(true)
       subject.apply_permissive_visibility_filter(solr_request)
-      expect(solr_request).to include :fq
-      expect(solr_request[:fq]).not_to include "{!term f=spotlight_exhibit_slug_#{exhibit.slug}_bsi}true"
+      expect(solr_request[:fq]).to be_blank
     end
   end
 

data/spec/models/spotlight/{reindex_progress_spec.rb → background_job_progress_spec.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-describe Spotlight::ReindexProgress, type: :model do
-  subject(:progress) { described_class.new(exhibit) }
+describe Spotlight::BackgroundJobProgress, type: :model do
+  subject(:progress) { described_class.new(exhibit, job_class: Spotlight::ReindexExhibitJob) }
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let!(:job_tracker) do
@@ -44,6 +44,19 @@ describe Spotlight::ReindexProgress, type: :model do
   end
 
   context 'with an in-progress job' do
+    let(:job_tracker_args) { { status: 'in_progress', data: { progress: 32, total: 50 } } }
+
+    it 'reports on reindexing progress' do
+      expect(progress.as_json).to include(
+        completed: 32,
+        total: 50,
+        finished: false,
+        errored: false
+      )
+    end
+  end
+
+  context 'with an in-progress job with subtasks' do
     before do
       FactoryBot.create(:job_tracker, on: job_tracker, resource: exhibit, data: { progress: 32, total: 32 }, status: 'completed')
       FactoryBot.create(:job_tracker, on: job_tracker, resource: exhibit, data: { progress: 16, total: 50 }, status: 'in_progress')

data/spec/models/spotlight/blacklight_configuration_spec.rb

@@ -314,7 +314,7 @@ describe Spotlight::BlacklightConfiguration, type: :model do
     context 'title only configuration' do
       before do
         blacklight_config.configure do |config|
-          config.view.gallery.title_only_by_default = true
+          config.view.gallery(title_only_by_default: true)
           config.add_index_field 'a'
         end
       end
@@ -449,11 +449,16 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
       expect(subject.blacklight_config.per_page).to eq [10, 50]
     end
+  end
 
-    it 'prepends the default per page' do
-      blacklight_config.per_page = [1, 10, 50, 100]
+  describe '#default_per_page' do
+    it 'is the first per page option by default' do
+      expect(subject.blacklight_config.default_per_page).to eq 10
+    end
+
+    it "is set from the model's default_per_page" do
       subject.default_per_page = 50
-      expect(subject.blacklight_config.per_page.first).to eq 50
+      expect(subject.blacklight_config.default_per_page).to eq 50
     end
   end
 
@@ -473,20 +478,20 @@ describe Spotlight::BlacklightConfiguration, type: :model do
     # rubocop:disable RSpec/PredicateMatcher
     it 'filters the upstream blacklight config' do
       subject.document_index_view_types = %w[list gallery unknown]
-      blacklight_config.view.list
-      blacklight_config.view.gallery
-      blacklight_config.view.something
+      blacklight_config.view.list!
+      blacklight_config.view.gallery!
+      blacklight_config.view.something!
 
       expect(subject.blacklight_config.view.keys).to include :list, :gallery, :something
-      expect(subject.blacklight_config.view.all? { |k, v| v.key == k && v.if == :enabled_in_spotlight_view_type_configuration? }).to be_truthy
+      expect(subject.blacklight_config.view.select { |k, v| v.key == k && v.if == :enabled_in_spotlight_view_type_configuration? }.any?).to be_truthy
     end
     # rubocop:enable RSpec/PredicateMatcher
 
     it 'passes through the blacklight configuration when not set' do
-      blacklight_config.view.list
-      blacklight_config.view.gallery
-      blacklight_config.view.something
-      expect(subject.blacklight_config.view.keys).to include(*blacklight_config.view.keys)
+      blacklight_config.view.list!
+      blacklight_config.view.gallery!
+      blacklight_config.view.something!
+      expect(subject.blacklight_config.view.keys.map(&:to_s)).to include(*blacklight_config.view.keys.map(&:to_s))
     end
   end
 
@@ -622,9 +627,9 @@ describe Spotlight::BlacklightConfiguration, type: :model do
 
   describe '#document_index_view_types_selected_hash' do
     before do
-      subject.default_blacklight_config.view.list
-      subject.default_blacklight_config.view.gallery
-      subject.default_blacklight_config.view.map
+      subject.default_blacklight_config.view.list!
+      subject.default_blacklight_config.view.gallery!
+      subject.default_blacklight_config.view.whatever!
       subject.default_blacklight_config.view.rss.if = false
       subject.document_index_view_types = %w[list gallery rss]
     end
@@ -633,8 +638,8 @@ describe Spotlight::BlacklightConfiguration, type: :model do
       expect(subject.document_index_view_types_selected_hash.to_h).to include list: true, gallery: true
     end
 
-    it 'disabled view types are not included' do
-      expect(subject.document_index_view_types_selected_hash.to_h).not_to include :map
+    it 'disabled view types use the value false' do
+      expect(subject.document_index_view_types_selected_hash.to_h).to include whatever: false
     end
 
     it 'excludes view types disabled by configuration (not by curator settings)' do

data/spec/models/spotlight/browse_category_search_builder_spec.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+describe Spotlight::BrowseCategorySearchBuilder do
+  class BrowseCategoryMockSearchBuilder < Blacklight::SearchBuilder
+    include Blacklight::Solr::SearchBuilderBehavior
+    include Spotlight::BrowseCategorySearchBuilder
+  end
+
+  subject { BrowseCategoryMockSearchBuilder.new(scope).with(blacklight_params) }
+
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:scope) { double(blacklight_config: exhibit.blacklight_config, current_exhibit: exhibit) }
+  let(:solr_request) { Blacklight::Solr::Request.new }
+  let(:blacklight_params) { { browse_category_id: search.id } }
+  let(:search) { FactoryBot.create(:search, exhibit: exhibit, query_params: { sort: 'type', f: { genre_ssim: ['term'] }, q: 'search query' }) }
+
+  describe '#restrict_to_browse_category' do
+    it 'adds the search query parameters from the browse category' do
+      params = subject.to_hash.with_indifferent_access
+
+      expect(params).to include(
+        q: 'search query',
+        fq: ['{!term f=genre_ssim}term'],
+        sort: 'sort_type_ssi asc'
+      )
+    end
+
+    context 'with a user-provided query' do
+      let(:blacklight_params) { { browse_category_id: search.id, q: 'cats' } }
+
+      it 'uses the user-provided query to further restrict the search' do
+        params = subject.to_hash.with_indifferent_access
+        expect(params).not_to include(:q)
+        expect(params).to include(
+          json: {
+            query: {
+              bool: {
+                must: [
+                  { edismax: { query: 'cats' } },
+                  { edismax: { query: 'search query' } }
+                ]
+              }
+            }
+          }
+        )
+      end
+    end
+  end
+end

data/spec/models/spotlight/exhibit_spec.rb

@@ -329,7 +329,7 @@ describe Spotlight::Exhibit, type: :model do
   describe '#reindex_progress' do
     it 'returns the latest log entry that is not unstarted' do
       reindex_progress = subject.reindex_progress
-      expect(reindex_progress).to be_a Spotlight::ReindexProgress
+      expect(reindex_progress).to be_a Spotlight::BackgroundJobProgress
     end
   end
 

data/spec/models/spotlight/featured_image_spec.rb

@@ -5,6 +5,18 @@ describe Spotlight::FeaturedImage do
 
   let(:temp_image) { FactoryBot.create(:temporary_image) }
 
+  describe '#bust_containing_resource_caches' do
+    let!(:feature_page) { FactoryBot.create(:feature_page, thumbnail: temp_image) }
+    let!(:feature_page2) { FactoryBot.create(:feature_page, thumbnail: temp_image) }
+
+    it 'changes the updated_at for all resources that might be using this image' do
+      temp_image.save
+
+      expect(feature_page.updated_at).to be < feature_page.reload.updated_at
+      expect(feature_page2.updated_at).to be < feature_page2.reload.updated_at
+    end
+  end
+
   context 'with an uploaded image' do
     it 'copies the temporary uploaded image to this model' do
       featured_image.source = 'remote'
@@ -41,7 +53,7 @@ describe Spotlight::FeaturedImage do
         end
 
         it 'points at the RIIIF endpoint' do
-          expect(subject.iiif_url).to match(%r{^/images/\d+/})
+          expect(subject.iiif_url).to match(%r{^/images/\d+-.+/})
         end
       end
     end

data/spec/models/spotlight/resource_spec.rb

@@ -22,6 +22,12 @@ describe Spotlight::Resource, type: :model do
       subject.save_and_index
     end
 
+    it 'passes through reindexing options' do
+      expect(subject).to receive(:save).and_return(true)
+      expect(subject).to receive(:reindex_later).with(a: 1)
+      subject.save_and_index(reindex_options: { a: 1 })
+    end
+
     context 'if the save fails' do
       it 'does not reindex' do
         expect(subject).to receive(:save).and_return(false)
@@ -31,6 +37,23 @@ describe Spotlight::Resource, type: :model do
     end
   end
 
+  describe '#reindex_later' do
+    around do |block|
+      old = ActiveJob::Base.queue_adapter
+      begin
+        ActiveJob::Base.queue_adapter = :test
+
+        block.call
+      ensure
+        ActiveJob::Base.queue_adapter = old
+      end
+    end
+
+    it 'passes through reindexing options' do
+      expect { subject.reindex_later(whatever: true) }.to have_enqueued_job(Spotlight::ReindexJob).with(subject, whatever: true, 'validity_token' => nil)
+    end
+  end
+
   describe '#reindex' do
     before do
       # sneak some data into the pipeline