blacklight 7.33.1 → 7.34.0

data/spec/support/view_component_test_helpers.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ViewComponentTestHelpers
+  # Work around for https://github.com/teamcapybara/capybara/issues/2466
+  def render_inline_to_capybara_node(component)
+    Capybara::Node::Simple.new(render_inline(component).to_s)
+  end
+
+  # Work-around for https://github.com/ViewComponent/view_component/pull/1661
+  # which made the component test's controller method (more) private. This makes
+  # it available so we can set up controller-level state for our tests.
+  def controller
+    # ViewComponent 2.x
+    return super if defined?(super)
+
+    # ViewComponent 3.x
+    return vc_test_controller if defined?(vc_test_controller)
+
+    ApplicationController.new.extend(Rails.application.routes.url_helpers)
+  end
+
+  # Nokogiri 1.15.0 upgrades the vendored libxml2 from v2.10.4 to v2.11.3
+  # libxml2 v2.11.0 introduces a change to parsing HTML href attributes
+  # in nokogiri < 1.15, brackets in href attributes are escaped:
+  # - <a class="facet-select" rel="nofollow" href="/catalog?f%5Bz%5D%5B%5D=x:1">x:1</a>
+  # in nokogiri >= 1.15, brackets in href attributes are not escaped:
+  # - <a class="facet-select" rel="nofollow" href="/catalog?f[z][]=x:1">x:1</a>
+  # until we can spec a minimum nokogiri version of 1.15.0, we need to see how
+  # the installed version parsed the html
+  def nokogiri_mediated_href(href)
+    start = "<a href=\"".length
+    stop = -"\"></a>".length
+    Nokogiri::HTML.fragment("<a href=\"#{href}\"></a>").to_s[start...stop]
+  end
+end

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -6,67 +6,81 @@ RSpec.describe "catalog/_show_tools.html.erb" do
 
   before do
     assign :response, instance_double(Blacklight::Solr::Response, params: {})
-    assign :document, document
     allow(view).to receive(:blacklight_config).and_return blacklight_config
     allow(view).to receive(:has_user_authentication_provider?).and_return false
   end
 
+  context 'without passing in a document local explicitly' do
+    before do
+      assign :document, document
+    end
+
+    let(:document_actions) { blacklight_config.show.document_actions }
+
+    it 'defaults to the @document and renders the action' do
+      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
+      render 'catalog/show_tools'
+      expect(rendered).to have_link "Some action", href: "x"
+    end
+  end
+
   describe "document actions" do
     let(:document_actions) { blacklight_config.show.document_actions }
 
     it "renders a document action" do
       allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).to have_link "Some action", href: "x"
     end
 
     it "uses the provided label" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, label: "Some label", partial: 'document_action'
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).to have_selector '.some_action', text: "Some label"
     end
 
     it "evaluates a document action's if configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, if: false, partial: 'document_action'
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "evaluates a document action's if configuration with a proc" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', if: proc { |_config, doc| doc.id == "xyz" }
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "evaluates a document action's unless configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', unless: true
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "allows the tool to have a custom id" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', id: "some_action"
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).to have_selector '#some_action', text: "Some action"
     end
 
     it "defaults to modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end
 
     it "allows configuration to opt out of modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', modal: false
-      render partial: 'catalog/show_tools'
+      render 'catalog/show_tools', document: document
       expect(rendered).not_to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end
 
@@ -76,7 +90,7 @@ RSpec.describe "catalog/_show_tools.html.erb" do
       end
 
       it 'does not display the tools' do
-        render partial: 'catalog/show_tools'
+        render 'catalog/show_tools', document: document
 
         expect(rendered).to be_blank
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.33.1
+  version: 7.34.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,16 +127,22 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.66'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.66'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -227,20 +233,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -469,6 +461,8 @@ files:
 - app/components/blacklight/facet_field_pagination_component.rb
 - app/components/blacklight/facet_item_component.rb
 - app/components/blacklight/facet_item_pivot_component.rb
+- app/components/blacklight/header_component.html.erb
+- app/components/blacklight/header_component.rb
 - app/components/blacklight/hidden_search_state_component.rb
 - app/components/blacklight/icons/icon_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
@@ -493,6 +487,8 @@ files:
 - app/components/blacklight/search_context_component.html.erb
 - app/components/blacklight/search_context_component.rb
 - app/components/blacklight/search_history_constraint_layout_component.rb
+- app/components/blacklight/search_navbar_component.html.erb
+- app/components/blacklight/search_navbar_component.rb
 - app/components/blacklight/start_over_button_component.rb
 - app/components/blacklight/system/dropdown_component.html.erb
 - app/components/blacklight/system/dropdown_component.rb
@@ -500,6 +496,8 @@ files:
 - app/components/blacklight/system/flash_message_component.rb
 - app/components/blacklight/system/modal_component.html.erb
 - app/components/blacklight/system/modal_component.rb
+- app/components/blacklight/top_navbar_component.html.erb
+- app/components/blacklight/top_navbar_component.rb
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
 - app/controllers/concerns/blacklight/base.rb
@@ -544,6 +542,7 @@ files:
 - app/models/concerns/blacklight/configurable.rb
 - app/models/concerns/blacklight/document.rb
 - app/models/concerns/blacklight/document/active_model_shim.rb
+- app/models/concerns/blacklight/document/attributes.rb
 - app/models/concerns/blacklight/document/cache_key.rb
 - app/models/concerns/blacklight/document/dublin_core.rb
 - app/models/concerns/blacklight/document/email.rb
@@ -790,6 +789,7 @@ files:
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
@@ -823,7 +823,7 @@ files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
-- spec/features/sitelinks_search_box.rb
+- spec/features/sitelinks_search_box_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
 - spec/helpers/blacklight/facets_helper_behavior_spec.rb
@@ -900,7 +900,7 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
-- spec/support/view_component_capybara_test_helpers.rb
+- spec/support/view_component_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb
@@ -954,7 +954,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -972,6 +972,7 @@ test_files:
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
+- spec/components/blacklight/header_component_spec.rb
 - spec/components/blacklight/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/response/spellcheck_component_spec.rb
@@ -1005,7 +1006,7 @@ test_files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
-- spec/features/sitelinks_search_box.rb
+- spec/features/sitelinks_search_box_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
 - spec/helpers/blacklight/facets_helper_behavior_spec.rb
@@ -1082,7 +1083,7 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/presenter_test_helpers.rb
-- spec/support/view_component_capybara_test_helpers.rb
+- spec/support/view_component_test_helpers.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/views/catalog/_constraints.html.erb_spec.rb

data/spec/features/sitelinks_search_box.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-describe 'Sitelinks search box' do
-  it 'is home page' do
-    visit root_path
-    expect(page).to have_css 'script[type="application/ld+json"]'
-  end
-
-  it 'on search page' do
-    visit search_catalog_path q: 'book'
-    expect(page).not_to have_css 'script[type="application/ld+json"]'
-  end
-end

data/spec/support/view_component_capybara_test_helpers.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponentCapybaraTestHelpers
-  # Work around for https://github.com/teamcapybara/capybara/issues/2466
-  def render_inline_to_capybara_node(component)
-    Capybara::Node::Simple.new(render_inline(component).to_s)
-  end
-end