blacklight-spotlight 3.4.2.1 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794f8a576fd41d5dbaf29291a7becae3a6e2d813ffd607d4e9d40f101f1f8f49
-  data.tar.gz: 49d0a55f747b3c554f973676552b1f7568f75b2e1cdc42c8fb30fa0c246516ff
+  metadata.gz: d42a59c98f526b1eeac14da844d45f58e320d5433c8299672eb67d371a2b9a1e
+  data.tar.gz: b9304499e4c378fa45d2e6223caac993ad1454c9605a3b4869e83727170e680c
 SHA512:
-  metadata.gz: fe49b3279ffc22c85273eeca2c84f0853f6b78bd8147b4f639b72e116835e09cd48add6d9bf4576c28856e16998bda0e164f6db41bd877a52b0e2ca903e1f7ff
-  data.tar.gz: 4361e42c40cfde449e7a2a7a3ed6331379b51acb4c6c9d56bb6a0502233109193cbeea8a4903873638bd02d9c507306294b405ccf5a0eaccbdeaf3b1bd00e390
+  metadata.gz: ebb7c1b24d838ebe9669177d18666f387fa5e8ee7d62ab4ce412cdf1261238af1a1d431317697d4a7339864c271f1c38295cd428a97dc803747329ff5a909f97
+  data.tar.gz: 8098d1725f8076537c6b224b5302500f2b5ac9ba5c80b1676eb1d26939c4b932537e07d0cafddb5ddf82c40a23f94fb4a8920046c7393a136ba6c1b3402a6c7d

data/app/views/spotlight/sir_trevor/blocks/_video_block.html.erb

@@ -1,5 +1,5 @@
-<% if video.source == 'vimeo' %>
-  <%= render partial: '/spotlight/sir_trevor/blocks/videos/vimeo', vimeo: video %>
-<% elsif video.source == 'youtube' %>
-  <%= render partial: '/spotlight/sir_trevor/blocks/videos/youtube', youtube: video %>
-<% end %>
+<% if video_block.source == 'vimeo' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/vimeo', vimeo: video_block %>
+<% elsif video_block.source == 'youtube' %>
+  <%= render partial: '/spotlight/sir_trevor/blocks/videos/youtube', youtube: video_block %>
+<% end %>

data/lib/generators/spotlight/install_generator.rb

@@ -177,14 +177,6 @@ module Spotlight
       copy_file 'config/initializers/translation.rb'
     end
 
-    def configure_queue
-      insert_into_file 'config/application.rb', after: "< Rails::Application\n" do
-        <<-EOF
-        config.active_job.queue_adapter = ENV["RAILS_QUEUE"]&.to_sym || :sidekiq
-        EOF
-      end
-    end
-
     def configure_logging
       insert_into_file 'config/application.rb', after: "< Rails::Application\n" do
         <<-EOF

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.4.2.1'
+  VERSION = '3.4.4'
 end

data/spec/support/controllers/engine_helpers.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Controllers
+  module EngineHelpers
+    def main_app
+      Rails.application.class.routes.url_helpers
+    end
+  end
+end

data/spec/support/disable_friendly_id_deprecation_warnings.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR <= 1
+  default_deprecation_behaviours = ActiveSupport::Deprecation.behavior
+  ActiveSupport::Deprecation.behavior = lambda do |message, callstack|
+    unless callstack.find { |l| l.path =~ %r{gems/friendly_id} } &&
+           message =~ /The behavior of .* inside of after callbacks will be changing/
+      default_deprecation_behaviours.each { |b| b.call(message, callstack) }
+    end
+  end
+end

data/spec/support/features/capybara_default_max_wait_metadata_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module CapybaraDefaultMaxWaitMetadataHelper
+  extend ActiveSupport::Concern
+
+  included do
+    before do |example|
+      next unless example.metadata[:default_max_wait_time]
+
+      @previous_wait_time = Capybara.default_max_wait_time
+      Capybara.default_max_wait_time = example.metadata[:default_max_wait_time]
+    end
+
+    after do |example|
+      next unless example.metadata[:default_max_wait_time]
+
+      Capybara.default_max_wait_time = @previous_wait_time
+    end
+  end
+end

data/spec/support/features/test_features_helpers.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Spotlight
+  module TestFeaturesHelpers
+    def fill_in_typeahead_field(opts = {})
+      type = opts[:type] || 'twitter'
+      # Poltergeist / Capybara doesn't fire the events typeahead.js
+      # is listening for, so we help it out a little:
+      page.execute_script <<-EOF
+        $("[data-#{type}-typeahead]:visible").val("#{opts[:with]}").trigger("input");
+        $("[data-#{type}-typeahead]:visible").typeahead("open");
+        $(".tt-suggestion").click();
+      EOF
+
+      find('.tt-suggestion', text: opts[:with], match: :first).click
+    end
+
+    ##
+    # For typeahead "prefetched" fields, we need to wait for a resolved selector
+    # before proceeding.
+    def fill_in_prefetched_typeahead_field(opts)
+      type = opts[:type] || 'twitter'
+      # Poltergeist / Capybara doesn't fire the events typeahead.js
+      # is listening for, so we help it out a little:
+      find(opts[:wait_for]) if opts[:wait_for]
+      page.execute_script <<-EOF
+        $("[data-#{type}-typeahead]:visible").val("#{opts[:with]}").trigger("input");
+        $("[data-#{type}-typeahead]:visible").typeahead("open");
+        $(".tt-suggestion").click();
+      EOF
+    end
+
+    # just like #fill_in_typeahead_field, but wait for the
+    # form fields to show up on the page too
+    def fill_in_solr_document_block_typeahead_field(opts)
+      fill_in_typeahead_field(opts)
+      expect(page).to have_css('li[data-resource-id="' + opts[:with] + '"]')
+    end
+
+    def add_widget(type)
+      click_add_widget
+
+      # click the item + image widget
+      expect(page).to have_css("button[data-type='#{type}']")
+      find("button[data-type='#{type}']").click
+    end
+
+    def click_add_widget
+      unless all('.st-block-replacer').present?
+        expect(page).to have_css('.st-block-addition')
+        first('.st-block-addition').click
+      end
+      expect(page).to have_css('.st-block-replacer')
+      first('.st-block-replacer').click
+    end
+
+    def save_page
+      page.execute_script <<-EOF
+        SirTrevor.getInstance().onFormSubmit();
+      EOF
+      click_button('Save changes')
+      # verify that the page was created
+      expect(page).not_to have_selector('.alert-danger')
+      expect(page).to have_selector('.alert-info', text: 'page was successfully updated')
+    end
+
+    RSpec::Matchers.define :have_breadcrumbs do |*expected|
+      match do |actual|
+        errors = []
+        errors << 'Unable to find breadcrumbs' unless actual.has_css? '.breadcrumb'
+
+        breadcrumbs = expected.dup
+
+        actual.within('.breadcrumb') do
+          last = breadcrumbs.pop
+          breadcrumbs.each do |e|
+            errors << "Unable to find breadcrumb #{e}" unless actual.has_link? e
+          end
+
+          errors << "Unable to find breadcrumb #{last}" unless actual.has_content? last
+          errors << "Expected #{last} not to be a link" if actual.has_link? last
+        end
+
+        errors.empty?
+      end
+
+      failure_message do |actual|
+        "expected that #{actual.all('.breadcrumb li').map(&:text).join(' / ')} would include #{expected.join(' / ')}"
+      end
+    end
+  end
+end

data/spec/support/helpers/controller_level_helpers.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module ControllerLevelHelpers
+  def search_state
+    @search_state ||= Blacklight::SearchState.new(params, blacklight_config)
+  end
+
+  def current_site
+    Spotlight::Site.instance
+  end
+
+  def blacklight_configuration_context
+    @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerLevelHelpers
+    initialize_routing_helpers(helper)
+  end
+
+  def initialize_routing_helpers(helper)
+    helper.class.include ::Rails.application.routes.url_helpers
+    helper.class.include ::Rails.application.routes.mounted_helpers if ::Rails.application.routes.respond_to?(:mounted_helpers)
+  end
+end

data/spec/support/stub_iiif_response.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'fixtures/iiif_responses'
+module StubIiifResponse
+  def stub_iiif_response_for_url(url, response)
+    allow(Spotlight::Resources::IiifService).to receive(:iiif_response).with(url).and_return(response)
+  end
+
+  def stub_default_collection
+    allow_any_instance_of(Spotlight::Resources::IiifHarvester).to receive_messages(url_is_iiif?: true)
+    stub_iiif_response_for_url('uri://for-top-level-collection', complex_collection)
+    stub_iiif_response_for_url('uri://for-child-collection1', child_collection1)
+    stub_iiif_response_for_url('uri://for-child-collection2', child_collection2)
+    stub_iiif_response_for_url('uri://for-child-collection3', child_collection3)
+
+    stub_iiif_response_for_url('uri://for-manifest1', test_manifest1)
+    stub_iiif_response_for_url('uri://for-manifest2', test_manifest2)
+    stub_iiif_response_for_url('uri://for-manifest3', test_manifest3)
+    stub_iiif_response_for_url('uri://for-manifest4', test_manifest4)
+  end
+end
+
+RSpec.configure do |config|
+  config.include IiifResponses
+  config.include StubIiifResponse
+end

data/spec/support/views/test_view_helpers.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Spotlight
+  module TestViewHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      before do
+        view.send(:extend, Spotlight::RenderingHelper)
+        view.send(:extend, Spotlight::MainAppHelpers)
+        view.send(:extend, Spotlight::CrudLinkHelpers)
+        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
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.4.2.1
+  version: 3.4.4
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -365,20 +365,6 @@ 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
@@ -481,20 +467,6 @@ 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
@@ -577,20 +549,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  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: signet
   requirement: !ruby/object:Gem::Requirement
@@ -675,20 +633,6 @@ 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
@@ -1604,6 +1548,13 @@ files:
 - spec/fixtures/updated-bulk-update-template-no-cols.csv
 - spec/fixtures/updated-bulk-update-template-w-tags.csv
 - spec/fixtures/updated-bulk-update-template.csv
+- spec/support/controllers/engine_helpers.rb
+- spec/support/disable_friendly_id_deprecation_warnings.rb
+- spec/support/features/capybara_default_max_wait_metadata_helper.rb
+- spec/support/features/test_features_helpers.rb
+- spec/support/helpers/controller_level_helpers.rb
+- spec/support/stub_iiif_response.rb
+- spec/support/views/test_view_helpers.rb
 - vendor/assets/images/sir-trevor-icons.svg
 - vendor/assets/javascripts/Leaflet.Editable.js
 - vendor/assets/javascripts/MutationObserver.js