blacklight-spotlight 3.3.0 → 3.4.0

data/spec/features/autocomplete_typeahead_spec.rb

@@ -25,8 +25,9 @@ describe 'Autocomplete typeahead', type: :feature, js: true do
         featured_image = Spotlight::FeaturedImage.last
 
         expect(featured_image.iiif_manifest_url).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/manifest.json'
-        expect(featured_image.iiif_canvas_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/canvas/gk446cj2442_1'
-        expect(featured_image.iiif_image_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/annotation/gk446cj2442_1'
+        # TODO: this data is fetched by a javascript widget and thus isn't captured by webmock see #2817
+        expect(featured_image.iiif_canvas_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/canvas/cocina-fileSet-gk446cj2442-gk446cj2442_1'
+        expect(featured_image.iiif_image_id).to eq 'https://purl.stanford.edu/gk446cj2442/iiif/annotation/cocina-fileSet-gk446cj2442-gk446cj2442_1'
         expect(featured_image.iiif_tilesource).to eq 'https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001/info.json'
       end
 

data/spec/features/exhibit_themes_spec.rb

@@ -4,7 +4,9 @@ describe 'Update the site theme', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
   let(:user) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
 
-  before { login_as user }
+  before do
+    login_as user
+  end
 
   it 'updates the exhibit theme' do
     visit spotlight.edit_exhibit_appearance_path(exhibit)

data/spec/i18n_spec.rb

@@ -7,13 +7,12 @@ RSpec.describe 'I18n' do
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }
 
-  pending 'does not have missing keys' do
+  xit 'does not have missing keys' do
     expect(missing_keys).to be_empty,
                             "Missing #{missing_keys.leaves.count} i18n keys, run `i18n-tasks missing' to show them"
   end
 
-  it 'does not have unused keys' do
-    puts unused_keys.inspect
+  xit 'does not have unused keys' do
     expect(unused_keys).to be_empty,
                            "#{unused_keys.leaves.count} unused i18n keys, run `i18n-tasks unused' to show them"
   end

data/spec/lib/migration/iiif_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe Migration::IIIF do
       expect_any_instance_of(Spotlight::Resources::Upload).to receive(:save_and_index)
       expect do
         instance.send :migrate_upload_images
-      end.to change { Spotlight::FeaturedImage.count }.by(1)
+      end.to change(Spotlight::FeaturedImage, :count).by(1)
       expect(Spotlight::FeaturedImage.all.pluck(:id)).to include Spotlight::Resources::Upload.last.id
     end
   end
@@ -84,7 +84,7 @@ RSpec.describe Migration::IIIF do
     it 'migrates' do
       expect do
         instance.send :migrate_contact_avatars
-      end.to change { Spotlight::FeaturedImage.count }.by(1)
+      end.to change(Spotlight::FeaturedImage, :count).by(1)
       expect(Spotlight::Contact.all.pluck(:avatar_id)).to eq Spotlight::FeaturedImage.all.pluck(:id)
     end
   end

data/spec/models/sir_trevor_rails/block_spec.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe SirTrevorRails::Block do
+  describe '.block_class' do
+    subject { described_class }
+
+    describe 'for known type' do
+      let(:klass) { subject.block_class('browse') }
+
+      it 'returns class' do
+        expect(klass).to eq SirTrevorRails::Blocks::BrowseBlock
+      end
+
+      it 'returned class is the one defined in file' do
+        expect(klass.method_defined?(:searches)).to be true
+      end
+    end
+
+    describe 'for unknown type' do
+      let(:klass) { subject.block_class('unknown') }
+
+      it 'defines and returns class' do
+        expect(klass).to eq SirTrevorRails::Blocks::UnknownBlock
+      end
+
+      it 'defines class that inherits from Block' do
+        expect(klass.superclass).to eq described_class
+      end
+    end
+  end
+
+  describe '.from_hash' do
+    let(:source_hash) { { type: 'test', data: {} } }
+    let(:block) { described_class.from_hash(source_hash, nil) }
+
+    it 'initializes new block based on type field' do
+      expect(block).to be_a_kind_of SirTrevorRails::Blocks::TestBlock
+    end
+
+    it 'creates accessors for all fields defined in data field' do
+      source_hash[:data].merge!(width: '100')
+
+      expect(block.width).to eq '100'
+    end
+  end
+
+  describe 'JSON representation' do
+    let(:empty_source_hash) { { type: 'test', data: {} } }
+    let(:empty_block) { described_class.from_hash(empty_source_hash, nil) }
+    let(:data_source_hash) { { type: 'test', data: { one: 2, three: 4 } } }
+    let(:data_block) { described_class.from_hash(data_source_hash, nil) }
+
+    it 'returns source hash when #as_json is called' do
+      expect(empty_block.as_json).to eq empty_source_hash
+    end
+
+    it 'serializes block data' do
+      expect(data_block.as_json).to eq data_source_hash
+    end
+  end
+
+  describe 'partial view lookup' do
+    let(:source_hash) { { type: 'test', data: {} } }
+    let(:block) { described_class.from_hash(source_hash, nil) }
+
+    it 'uses block type to find view paritals' do
+      expect(block.to_partial_path).to eq 'sir_trevor/blocks/test_block'
+    end
+  end
+end

data/spec/models/solr_document_spec.rb

@@ -32,7 +32,7 @@ describe SolrDocument, type: :model do
   it 'is able to add tags' do
     expect do
       exhibit.tag(subject.sidecar(exhibit), with: 'paris, normandy', on: :tags)
-    end.to change { ActsAsTaggableOn::Tag.count }.by(2)
+    end.to change(ActsAsTaggableOn::Tag, :count).by(2)
     expect(subject.sidecar(exhibit).tags_from(exhibit)).to eq %w[paris normandy]
   end
 

data/spec/models/spotlight/browse_category_search_builder_spec.rb

@@ -9,7 +9,9 @@ describe Spotlight::BrowseCategorySearchBuilder do
   subject { BrowseCategoryMockSearchBuilder.new(scope).with(blacklight_params) }
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:scope) { double(blacklight_config: exhibit.blacklight_config, current_exhibit: exhibit) }
+  let(:scope) do
+    double(blacklight_config: exhibit.blacklight_config, current_exhibit: exhibit, search_state_class: nil)
+  end
   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' }) }

data/spec/models/spotlight/page_spec.rb

@@ -58,16 +58,6 @@ describe Spotlight::Page, type: :model do
   describe '#content=' do
     let(:page) { FactoryBot.create(:feature_page) }
 
-    it 'works with a serialized JSON array' do
-      page.content = [].to_json
-      expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
-    end
-
-    it 'works with an array' do
-      page.content = []
-      expect(page.content).to be_a_kind_of SirTrevorRails::BlockArray
-    end
-
     context 'with an alternate page content type' do
       let(:page) { FactoryBot.create(:feature_page, content_type: 'Static') }
       let(:fake_class) do

data/spec/models/translation_spec.rb

@@ -11,4 +11,16 @@ describe Translation, type: :model do
       end.to raise_error(ActiveRecord::RecordNotUnique)
     end
   end
+
+  describe '.to_h' do
+    it 'dumps the translations' do
+      expect(described_class.to_h).to be_a(Hash)
+    end
+  end
+
+  describe '.to_hash' do
+    it 'is not defined' do
+      expect(described_class).not_to respond_to(:to_hash)
+    end
+  end
 end

data/spec/services/spotlight/etl/pipeline_spec.rb

@@ -14,7 +14,7 @@ describe Spotlight::Etl::Pipeline do
 
   describe '#estimated_size' do
     it 'forwards the call to the executor' do
-      allow(Spotlight::Etl::Executor).to receive(:new).with(subject, context).and_return(mock_executor)
+      allow(Spotlight::Etl::Executor).to receive(:new).with(subject, context, any_args).and_return(mock_executor)
 
       expect(subject.estimated_size(context)).to eq 10
     end

data/spec/spec_helper.rb

@@ -34,7 +34,7 @@ end
 require 'webmock/rspec'
 allowed_sites = ['chromedriver.storage.googleapis.com']
 
-WebMock.disable_net_connect!(allow_localhost: true, allow: allowed_sites)
+WebMock.disable_net_connect!(net_http_connect_on_start: true, allow_localhost: true, allow: allowed_sites)
 
 if ENV['COVERAGE'] || ENV['CI']
   require 'simplecov'
@@ -47,7 +47,6 @@ end
 require 'spotlight'
 
 # configure spotlight with all the settings necessary to test functionality
-Spotlight::Engine.config.exhibit_themes = %w[default modern]
 Spotlight::Engine.config.reindexing_batch_count = 1
 Spotlight::Engine.config.assign_default_roles_to_first_user = false
 

data/spec/support/views/test_view_helpers.rb

@@ -12,6 +12,7 @@ module Spotlight
         view.send(:extend, Spotlight::TitleHelper)
         view.send(:extend, Spotlight::NavbarHelper)
         view.send(:extend, Spotlight::CropHelper)
+        view.send(:extend, Spotlight::PagesHelper)
         view.send(:extend, Blacklight::ComponentHelperBehavior)
         view.send(:extend, BreadcrumbsOnRails::ActionController::HelperMethods)
       end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,7 +11,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def add_gems
     gem 'blacklight', '~> 7.17'
-    gem 'blacklight-gallery', '~> 3.0'
+    gem 'blacklight-gallery', '~> 4.0'
     Bundler.with_clean_env do
       run 'bundle install'
     end
@@ -50,6 +50,8 @@ class TestAppGenerator < Rails::Generators::Base
 
     copy_file 'fixture.css', 'app/assets/stylesheets/application_modern.css'
     append_to_file 'config/initializers/assets.rb', 'Rails.application.config.assets.precompile += %w( application_modern.css )'
+
+    append_to_file 'config/initializers/spotlight_initializer.rb', "\nSpotlight::Engine.config.exhibit_themes = %w[default modern]"
   end
 
   def disable_filter_resources_by_exhibit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -75,6 +75,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.18'
+- !ruby/object:Gem::Dependency
+  name: blacklight-gallery
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +310,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: iiif-presentation
+  name: iiif_manifest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -304,7 +324,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: iiif_manifest
+  name: iiif-presentation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -345,6 +365,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -447,6 +481,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '13'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -456,7 +504,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -466,7 +514,27 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: riiif
   requirement: !ruby/object:Gem::Requirement
@@ -510,7 +578,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: signet
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -524,19 +592,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sir_trevor_rails
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -607,6 +675,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: webpacker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -1100,6 +1182,7 @@ files:
 - app/models/concerns/spotlight/solr_document/uploaded_resource.rb
 - app/models/concerns/spotlight/translatables.rb
 - app/models/concerns/spotlight/user.rb
+- app/models/sir_trevor_rails/block.rb
 - app/models/sir_trevor_rails/blocks/browse_block.rb
 - app/models/sir_trevor_rails/blocks/browse_group_categories_block.rb
 - app/models/sir_trevor_rails/blocks/displayable.rb
@@ -1159,6 +1242,7 @@ files:
 - app/models/spotlight/site.rb
 - app/models/spotlight/solr_document_sidecar.rb
 - app/models/spotlight/temporary_image.rb
+- app/models/translation.rb
 - app/presenters/spotlight/iiif_manifest_presenter.rb
 - app/services/spotlight/bulk_updates_csv_template_service.rb
 - app/services/spotlight/carrierwave_file_resolver.rb
@@ -1363,6 +1447,7 @@ files:
 - app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb
 - app/views/spotlight/sir_trevor/blocks/_text_block.html.erb
 - app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb
+- app/views/spotlight/sir_trevor/blocks/_video_block.html.erb
 - app/views/spotlight/sir_trevor/blocks/videos/_vimeo.html.erb
 - app/views/spotlight/sir_trevor/blocks/videos/_youtube.html.erb
 - app/views/spotlight/sites/_exhibit.html.erb
@@ -1384,6 +1469,7 @@ files:
 - config/i18n-tasks.yml
 - config/locales/devise.en.yml
 - config/locales/spotlight.ar.yml
+- config/locales/spotlight.de.yml
 - config/locales/spotlight.en.yml
 - config/locales/spotlight.es.yml
 - config/locales/spotlight.fr.yml
@@ -1472,7 +1558,6 @@ files:
 - lib/generators/spotlight/templates/catalog_controller.rb
 - lib/generators/spotlight/templates/config/initializers/oembed.rb
 - lib/generators/spotlight/templates/config/initializers/riiif.rb
-- lib/generators/spotlight/templates/config/initializers/sir_trevor_rails.rb
 - lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb
 - lib/generators/spotlight/templates/config/initializers/translation.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
@@ -1649,6 +1734,7 @@ files:
 - spec/lib/spotlight/controller_spec.rb
 - spec/lib/spotlight/upload_field_config_spec.rb
 - spec/mailers/spotlight/indexing_complete_mailer_spec.rb
+- spec/models/sir_trevor_rails/block_spec.rb
 - spec/models/sir_trevor_rails/blocks/browse_block_spec.rb
 - spec/models/sir_trevor_rails/blocks/browse_group_categories_block_spec.rb
 - spec/models/sir_trevor_rails/blocks/featured_pages_block_spec.rb
@@ -2008,6 +2094,7 @@ test_files:
 - spec/lib/spotlight/controller_spec.rb
 - spec/lib/spotlight/upload_field_config_spec.rb
 - spec/mailers/spotlight/indexing_complete_mailer_spec.rb
+- spec/models/sir_trevor_rails/block_spec.rb
 - spec/models/sir_trevor_rails/blocks/browse_block_spec.rb
 - spec/models/sir_trevor_rails/blocks/browse_group_categories_block_spec.rb
 - spec/models/sir_trevor_rails/blocks/featured_pages_block_spec.rb

data/lib/generators/spotlight/templates/config/initializers/sir_trevor_rails.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# Required for 0.6 and up:
-# https://github.com/madebymany/sir-trevor-rails#upgrade-guide-to-v060
-class SirTrevorRails::Block
-  def self.custom_block_types
-    # You can define your custom block types directly here or in your engine config.
-    Spotlight::Engine.config.sir_trevor_widgets
-  end
-end