blacklight 9.0.0.beta6 → 9.0.0.beta8

data/spec/presenters/blacklight/rendering/pipeline_spec.rb

@@ -12,20 +12,15 @@ RSpec.describe Blacklight::Rendering::Pipeline do
     let(:values) { %w[a b] }
     let(:field_config) { Blacklight::Configuration::NullField.new }
 
-    it { is_expected.to eq "a and b" }
-
-    context "when separator_options are in the config" do
-      let(:values) { %w[c d] }
-      let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: nil, separator_options: { two_words_connector: '; ' }) }
-
-      it { is_expected.to eq "c; d" }
-    end
+    it { is_expected.to eq %w[a b] }
 
     context "when itemprop is in the config" do
       let(:values) { ['a'] }
       let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: 'some-prop', separator_options: nil) }
 
-      it { is_expected.to have_css("span[@itemprop='some-prop']", text: "a") }
+      it 'renders the expected markup' do
+        expect(rendered.first).to have_css("span[@itemprop='some-prop']", text: "a")
+      end
     end
 
     it 'sets the operations on the instance as equal to the class variable' do
@@ -37,13 +32,134 @@ RSpec.describe Blacklight::Rendering::Pipeline do
     end
 
     context 'outside of an HTML context' do
-      let(:options) { { format: 'text' } }
+      context 'when options determines format' do
+        let(:options) { { format: 'text' } }
+
+        let(:values) { ['"blah"', "<notatag>"] }
+        let(:field_config) { Blacklight::Configuration::NullField.new itemprop: 'some-prop' }
+
+        it 'does not HTML escape values or inject HTML tags' do
+          expect(rendered).to eq ['"blah"', "<notatag>"]
+        end
+      end
+
+      context 'when context determines format' do
+        let(:values) { ['"blah"', "<notatag>"] }
+        let(:field_config) { Blacklight::Configuration::NullField.new itemprop: 'some-prop' }
+        let(:controller) { CatalogController.new }
+        let(:search_state) { Blacklight::SearchState.new({ format: 'text' }, controller.blacklight_config, controller) }
+
+        before { allow(context).to receive(:search_state).and_return(search_state) }
+
+        it 'does not HTML escape values or inject HTML tags' do
+          expect(rendered).to eq ['"blah"', '<notatag>']
+        end
+      end
+    end
+
+    context 'when link_to_facet is in the config' do
+      let(:values) { %w[book manuscript] }
+      let(:field_config) { Blacklight::Configuration::Field.new(field: 'format', key: 'format', link_to_facet: true) }
+      let(:controller) { CatalogController.new }
+      let(:search_state) { Blacklight::SearchState.new({}, controller.blacklight_config, controller) }
+
+      before do
+        allow(context).to receive(:search_state).and_return(search_state)
+        allow(context).to receive(:search_action_path) { |f| "/catalog?f[format][]=#{f['f']['format'].first}" }
+        allow(context).to receive(:link_to) { |value, link|  ActiveSupport::SafeBuffer.new("<a href=#{link}>#{value}</a>") }
+      end
+
+      it 'renders html' do
+        expect(rendered).to eq ["<a href=/catalog?f[format][]=book>book</a>", "<a href=/catalog?f[format][]=manuscript>manuscript</a>"]
+      end
+
+      context 'outside html context' do
+        let(:values) { %w[book manuscript] }
+        let(:field_config) { Blacklight::Configuration::Field.new(field: 'format', link_to_facet: true) }
+        let(:search_state) { Blacklight::SearchState.new({ format: 'json' }, CatalogController.blacklight_config, CatalogController.new) }
+
+        it 'does not render html' do
+          expect(rendered).to eq %w[book manuscript]
+        end
+      end
+    end
+
+    context 'when joining values' do
+      context 'with join in the config' do
+        let(:field_config) { Blacklight::Configuration::NullField.new(join: true) }
+
+        it 'joins the values' do
+          expect(rendered).to eq ['a and b']
+        end
+      end
+
+      context 'with join is in the options' do
+        let(:options) { { join: true } }
+        let(:field_config) { Blacklight::Configuration::NullField.new }
+
+        it 'joins the values' do
+          expect(rendered).to eq ['a and b']
+        end
+      end
+
+      context 'with separator_options in the config' do
+        let(:values) { %w[c d] }
+        let(:field_config) { Blacklight::Configuration::NullField.new(separator_options: { two_words_connector: '; ' }) }
+
+        it { is_expected.to eq ["c; d"] }
+      end
+
+      context 'with a single value' do
+        let(:values) { [1] }
+        let(:field_config) { Blacklight::Configuration::NullField.new(join: true) }
+
+        it 'does not run the join step' do
+          expect(rendered).to eq [1]
+        end
+      end
+
+      context 'with a single html value' do
+        let(:values) { ['<b>value</b>'] }
+        let(:field_config) { Blacklight::Configuration::NullField.new(join: true) }
+
+        it 'does not escape the html' do
+          expect(rendered).to eq ['<b>value</b>']
+        end
+
+        it 'does not mark the value as html_safe' do
+          expect(rendered.first).not_to be_html_safe
+        end
+      end
+
+      context 'with an array of values containing unsafe characters' do
+        let(:values) { ['<a', 'b'] }
+        let(:field_config) { Blacklight::Configuration::NullField.new(join: true) }
+
+        it 'escapes the unsafe characters' do
+          expect(rendered).to eq ["&lt;a and b"]
+        end
+
+        it 'marks the joined value as html_safe' do
+          expect(rendered.first).to be_html_safe
+        end
+      end
+
+      context 'outside the html context' do
+        let(:values) { %w[a b <c] }
+        let(:field_config) { Blacklight::Configuration::Field.new(join: true) }
+        let(:options) { { format: 'json' } }
+
+        it 'does not run the join step' do
+          expect(rendered).to eq %w[a b <c]
+        end
 
-      let(:values) { ['"blah"', "<notatag>"] }
-      let(:field_config) { Blacklight::Configuration::NullField.new itemprop: 'some-prop' }
+        it 'does not escape unsafe html characters' do
+          expect(rendered.last).to eq '<c'
+        end
 
-      it 'does not HTML escape values or inject HTML tags' do
-        expect(rendered).to eq '"blah" and <notatag>'
+        it 'does not mark the values as html_safe' do
+          expect(rendered.none?(&:html_safe?)).to be true
+        end
       end
     end
   end

data/spec/support/presenter_test_helpers.rb

@@ -2,7 +2,7 @@
 
 module PresenterTestHelpers
   def controller
-    @controller ||= ViewComponent::Base.test_controller.constantize.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
+    @controller ||= ApplicationController.new.tap { |c| c.request = request }.extend(Rails.application.routes.url_helpers)
   end
 
   def request

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -96,6 +96,8 @@ RSpec.describe "catalog/index" do
     context 'with a custom template' do
       before do
         my_template = Class.new(ViewComponent::Base) do
+          def initialize(**); end
+
           def call
             'whatever content'.html_safe
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta6
+  version: 9.0.0.beta8
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -16,7 +16,7 @@ authors:
 - Justin Coyne
 bindir: exe
 cert_chain: []
-date: 2025-07-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,16 +112,22 @@ dependencies:
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -632,6 +638,7 @@ files:
 - app/models/search_builder.rb
 - app/models/solr_document.rb
 - app/presenters/blacklight/clause_presenter.rb
+- app/presenters/blacklight/constraint_presenter.rb
 - app/presenters/blacklight/document_presenter.rb
 - app/presenters/blacklight/facet_checkbox_item_presenter.rb
 - app/presenters/blacklight/facet_field_presenter.rb
@@ -731,7 +738,6 @@ files:
 - app/views/shared/_flash_msg.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_modal.html.erb
-- app/views/shared/_sitelinks_search_box.html.erb
 - app/views/shared/_user_util_links.html.erb
 - blacklight.gemspec
 - compose.yaml
@@ -792,6 +798,7 @@ files:
 - lib/blacklight/solr/document.rb
 - lib/blacklight/solr/facet_paginator.rb
 - lib/blacklight/solr/facet_search_builder_behavior.rb
+- lib/blacklight/solr/field_reflection_search_builder.rb
 - lib/blacklight/solr/repository.rb
 - lib/blacklight/solr/request.rb
 - lib/blacklight/solr/response.rb
@@ -804,6 +811,7 @@ files:
 - lib/blacklight/solr/response/response.rb
 - lib/blacklight/solr/response/spelling.rb
 - lib/blacklight/solr/search_builder_behavior.rb
+- lib/blacklight/solr/single_doc_search_builder.rb
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets/importmap_generator.rb
 - lib/generators/blacklight/assets/propshaft_generator.rb
@@ -904,7 +912,6 @@ files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
-- spec/features/sitelinks_search_box_spec.rb
 - spec/features/sms_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
@@ -960,6 +967,7 @@ files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/blacklight/clause_presenter_spec.rb
+- spec/presenters/blacklight/constraint_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_checkbox_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb
@@ -1023,7 +1031,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
@@ -1088,7 +1096,6 @@ test_files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
-- spec/features/sitelinks_search_box_spec.rb
 - spec/features/sms_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
@@ -1144,6 +1151,7 @@ test_files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/blacklight/clause_presenter_spec.rb
+- spec/presenters/blacklight/constraint_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_checkbox_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb

data/app/views/shared/_sitelinks_search_box.html.erb

@@ -1,12 +0,0 @@
-<script type="application/ld+json">
-  {
-    "@context": "http://schema.org",
-    "@type": "WebSite",
-    "url": "<%= root_url %>",
-    "potentialAction": {
-      "@type": "SearchAction",
-      "target": "<%= root_url %>?q={search_term_string}",
-      "query-input": "required name=search_term_string"
-    }
-  }
-</script>

data/spec/features/sitelinks_search_box_spec.rb

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