blacklight 9.0.0.beta5 → 9.0.0.beta7

data/config/locales/blacklight.de.yml

@@ -111,7 +111,7 @@ de:
         remove:
           label_value: "Filter %{label}: %{value} entfernen"
           value: Filter %{value} entfernen
-        title: "Sie suchten nach:"
+        title: "Ihre Auswahl:"
       form:
         search:
           label: suchen nach
@@ -147,7 +147,6 @@ de:
         submit: Aktualisieren
         title: Anzahl der Ergebnisse, die pro Seite angezeigt werden
       rss_feed: RSS für Ergebnisse
-      search_constraints_header: Suchen
       search_results: Suchergebnisse
       show:
         label: "%{label}:"

data/config/locales/blacklight.en.yml

@@ -129,7 +129,7 @@ en:
         remove:
           label_value: "Remove constraint %{label}: %{value}"
           value: Remove constraint %{value}
-        title: "You searched for:"
+        title: "Your selections:"
       form:
         search:
           label: search for
@@ -165,7 +165,6 @@ en:
         submit: Update
         title: Number of results to display per page
       rss_feed: RSS for results
-      search_constraints_header: Search Constraints
       search_results: Search Results
       show:
         label: "%{label}:"

data/config/locales/blacklight.es.yml

@@ -110,7 +110,7 @@ es:
         remove:
           label_value: "Eliminar la restricción%{label}: %{value}"
           value: Eliminar la restricción %{value}
-        title: "Usted ha buscado:"
+        title: "Tus selecciones:"
       form:
         search:
           label: buscar
@@ -146,7 +146,6 @@ es:
         submit: Actualización
         title: El número de resultados a mostrar por página
       rss_feed: RSS de los resultados
-      search_constraints_header: Buscar
       search_results: Resultados de la búsqueda
       show:
         label: "%{label}:"

data/config/locales/blacklight.fr.yml

@@ -110,7 +110,7 @@ fr:
         remove:
           label_value: "Supprimer la restriction %{label}: %{value}"
           value: Supprimer la restriction %{value}
-        title: "Vous avez demandé :"
+        title: "Vos sélections:"
       form:
         search:
           label: Rechercher
@@ -146,7 +146,6 @@ fr:
         submit: mettre à jour
         title: Nombre de résultats à afficher par page
       rss_feed: RSS pour les résultats
-      search_constraints_header: Recherche
       search_results: Résultats de recherche
       show:
         label: "%{label}:"

data/config/locales/blacklight.hu.yml

@@ -108,7 +108,7 @@ hu:
         remove:
           label_value: "Feltétel eltávolítása %{label}: %{value}"
           value: Feltételek eltávolítása %{value}
-        title: "Ön ezt kereste:"
+        title: "Az Ön választása:"
       form:
         search:
           label: keresés
@@ -144,7 +144,6 @@ hu:
         submit: Frissítés
         title: Az eredmények száma oldalanként
       rss_feed: Eredmények RSS-ként
-      search_constraints_header: Keresés feltételei
       search_results: Keresés eredményei
       show:
         label: "%{label}:"

data/config/locales/blacklight.it.yml

@@ -111,7 +111,7 @@ it:
         remove:
           label_value: "Cancella il filtro %{label}: %{value}"
           value: Cancella il filtro %{value}
-        title: "Hai cercato per:"
+        title: "Le tue selezioni:"
       form:
         search:
           label: cerca per
@@ -147,7 +147,6 @@ it:
         submit: Aggiorna
         title: Risultati per pagina
       rss_feed: RSS per i risultati
-      search_constraints_header: Ricerca
       search_results: Risultati della ricerca
       show:
         label: "%{label}:"

data/config/locales/blacklight.nl.yml

@@ -108,7 +108,7 @@ nl:
         remove:
           label_value: "Verwijder zoekfilter %{label}: %{value}"
           value: Verwijder zoekfilter %{value}
-        title: "U zocht op:"
+        title: "Uw selecties:"
       form:
         search:
           label: zoeken op
@@ -144,7 +144,6 @@ nl:
         submit: Update
         title: Toon aantal zoekresultaten per pagina
       rss_feed: RSS voor zoekresultaten
-      search_constraints_header: Zoek filters
       search_results: Zoek resultaten
       show:
         label: "%{label}:"

data/config/locales/blacklight.pt-BR.yml

@@ -109,7 +109,7 @@ pt-BR:
         remove:
           label_value: "Remover %{label}: %{value}"
           value: Remover filtro %{value}
-        title: "Sua busca por:"
+        title: "Suas seleções:"
       form:
         search:
           label: busca
@@ -145,7 +145,6 @@ pt-BR:
         submit: Atualizar
         title: Número de resultados para mostrar por página
       rss_feed: RSS para resultadoss
-      search_constraints_header: Busca
       search_results: Resultados da Busca
       show:
         label: "%{label}:"

data/config/locales/blacklight.sq.yml

@@ -108,7 +108,7 @@ sq:
         remove:
           label_value: "Fshij kufizimin %{label}: %{value}"
           value: Fshij kufizimin %{value}
-        title: "Ju keni kërkuar për:"
+        title: "Zgjedhjet tuaja:"
       form:
         search:
           label: kërko për
@@ -144,7 +144,6 @@ sq:
         submit: Përditëso
         title: Numri i rezultateve që do të shfaqen për faqe
       rss_feed: RSS për rezultatet
-      search_constraints_header: Kufizimet e kërkimit
       search_results: Rezultatet e kërkimit
       show:
         label: "%{label}:"

data/config/locales/blacklight.zh.yml

@@ -108,7 +108,7 @@ zh:
         remove:
           label_value: "删除限定条件 %{label}: %{value}"
           value: 删除限定条件 %{value}
-        title: 你在搜索：
+        title: 您的选择：
       form:
         search:
           label: 搜索
@@ -144,7 +144,6 @@ zh:
         submit: 更新
         title: 每页显示结果数
       rss_feed: 搜索结果RSS
-      search_constraints_header: 搜索条件
       search_results: 搜索结果
       show:
         label: "%{label}:"

data/lib/blacklight/component.rb

@@ -9,9 +9,13 @@ module Blacklight
         @__vc_compiler = nil
       end
 
+      # This allows the host application to provide erb templates that override the templates
+      # provided by Blacklight.
       def sidecar_files(*args, **kwargs)
         upstream_sidecar_files(*args, **kwargs).map do |path|
-          app_path = Rails.root.join(path.slice(path.index(view_component_path)..-1).to_s).to_s
+          components_path = ViewComponent::VERSION::MAJOR == 3 ? view_component_path : config.generate.path
+
+          app_path = Rails.root.join(path.slice(path.index(components_path)..-1).to_s).to_s
 
           if File.exist?(app_path)
             app_path

data/lib/blacklight/configuration/facet_field.rb

@@ -76,6 +76,8 @@ module Blacklight
       self.index_range = 'A'..'Z' if index_range == true
       self.presenter ||= Blacklight::FacetFieldPresenter
       self.item_presenter ||= Blacklight::FacetItemPresenter
+      self.constraint_presenter ||= Blacklight::ConstraintPresenter
+
       self.component = Blacklight::Facets::ListComponent if component.nil? || component == true
       self.advanced_search_component ||= Blacklight::Facets::CheckboxesComponent
       self.item_component ||= Blacklight::Facets::ItemComponent

data/lib/blacklight/configuration.rb

@@ -148,6 +148,8 @@ module Blacklight
       property :index, default: ViewConfig::Index.new(
         # document presenter class used by helpers and views
         document_presenter_class: nil,
+        # document presenter used for json responses
+        json_presenter_class: Blacklight::JsonPresenter,
         # component class used to render a document
         document_component: Blacklight::DocumentComponent,
         sidebar_component: Blacklight::Search::SidebarComponent,

data/lib/generators/blacklight/templates/.solr_wrapper.yml

@@ -3,5 +3,5 @@
 env:
   SOLR_MODULES: analysis-extras
 collection:
-  dir: solr/conf/
+  dir: solr/
   name: blacklight-core

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "9.0.0-beta5",
+  "version": "9.0.0-beta7",
   "description": "The frontend code and styles for Blacklight",
   "exports": {
     "./blacklight.esm.js": "./app/assets/javascripts/blacklight/blacklight.esm.js",

data/spec/components/blacklight/constraints_component_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     end
 
     it 'has a header' do
-      expect(page).to have_css('h2', text: 'Search Constraints')
+      expect(page).to have_css('h2', text: 'Your selections:')
     end
 
     it 'wraps the output in a div' do
@@ -79,7 +79,7 @@ RSpec.describe Blacklight::ConstraintsComponent, type: :component do
     end
 
     it 'omits the headers' do
-      expect(page).to have_no_css('h2', text: 'Search Constraints')
+      expect(page).to have_no_css('h2', text: 'Your selections:')
     end
   end
 end

data/spec/components/blacklight/document_component_spec.rb

@@ -34,11 +34,11 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has some defined content areas' do
-    component.set_slot(:title) { 'Title' }
-    component.set_slot(:embed, nil, 'Embed')
-    component.set_slot(:metadata, nil, 'Metadata')
-    component.set_slot(:thumbnail, nil, 'Thumbnail')
-    component.set_slot(:actions) { 'Actions' }
+    component.with_title { 'Title' }
+    component.with_embed('Embed')
+    component.with_metadata('Metadata')
+    component.with_thumbnail('Thumbnail')
+    component.with_actions { 'Actions' }
     render_inline component
 
     expect(page).to have_content 'Title'
@@ -49,7 +49,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
   end
 
   it 'has schema.org properties' do
-    component.set_slot(:body) { '-' }
+    component.with_body { '-' }
     render_inline component
 
     expect(page).to have_css 'article[@itemtype="http://schema.org/Thing"]'
@@ -58,7 +58,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
 
   context 'with a provided body' do
     it 'opts-out of normal component content' do
-      component.set_slot(:body) { 'Body content' }
+      component.with_body { 'Body content' }
       render_inline component
 
       expect(page).to have_content 'Body content'
@@ -75,7 +75,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     let(:attr) { { counter: 5 } }
 
     it 'has data properties' do
-      component.set_slot(:body) { '-' }
+      component.with_body { '-' }
       render_inline component
 
       expect(page).to have_css 'article[@data-document-id="x"]'
@@ -137,7 +137,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
     end
 
     it 'renders with an id' do
-      component.set_slot(:body) { '-' }
+      component.with_body { '-' }
       render_inline component
 
       expect(page).to have_css 'article#document'

data/spec/components/blacklight/facets/index_navigation_component_spec.rb

@@ -16,7 +16,8 @@ RSpec.describe Blacklight::Facets::IndexNavigationComponent, type: :component do
 
   it 'renders the facet index navigation range' do
     expect(page).to have_css '.pagination'
-    expect(page).to have_link '0', href: '/catalog/facet/language.html?facet.prefix=0&facet.sort=index'
+    facet_path = ViewComponent::VERSION::MAJOR == 3 ? '/catalog/facet/language.html' : '/catalog/facet/language'
+    expect(page).to have_link '0', href: "#{facet_path}?facet.prefix=0&facet.sort=index"
     expect(page).to have_link '1'
     expect(page).to have_link '8'
     expect(page).to have_link '9'

data/spec/components/blacklight/facets/list_component_spec.rb

@@ -4,9 +4,15 @@ require 'spec_helper'
 
 RSpec.describe Blacklight::Facets::ListComponent, type: :component do
   before do
+    allow(facet_field).to receive(:item_presenter).and_return(item_presenter)
+
     render_inline(described_class.new(facet_field: facet_field))
   end
 
+  let(:item_presenter) do
+    facet_config.item_presenter.new('stuff', facet_config, vc_test_controller.view_context, facet_field.key)
+  end
+
   let(:facet_field) do
     instance_double(
       Blacklight::FacetFieldPresenter,

data/spec/components/blacklight/facets/pivot_list_component_spec.rb

@@ -4,9 +4,15 @@ require 'spec_helper'
 
 RSpec.describe Blacklight::Facets::PivotListComponent, type: :component do
   before do
+    allow(facet_field).to receive(:item_presenter).and_return(item_presenter)
+
     render_inline(described_class.new(facet_field: facet_field))
   end
 
+  let(:item_presenter) do
+    facet_config.item_presenter.new('stuff', facet_config, vc_test_controller.view_context, facet_field.key)
+  end
+
   let(:facet_field) do
     instance_double(
       Blacklight::FacetFieldPresenter,

data/spec/components/blacklight/facets/suggest_component_spec.rb

@@ -28,7 +28,8 @@ RSpec.describe Blacklight::Facets::SuggestComponent, type: :component do
   it 'has an input with the data-facet-search-context attribute, which the javascript needs to determine the current search context' do
     with_request_url "/catalog/facet/language_facet?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields" do
       rendered = render_inline component
-      expect(rendered.css('input[data-facet-search-context="/catalog/facet/language_facet.html?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields"]').count).to eq 1
+      facet_path = ViewComponent::VERSION::MAJOR == 3 ? '/catalog/facet/language_facet.html' : '/catalog/facet/language_facet'
+      expect(rendered.css("input[data-facet-search-context=\"#{facet_path}?f%5Bformat%5D%5B%5D=Book&facet.prefix=R&facet.sort=index&q=tibet&search_field=all_fields\"]").count).to eq 1
     end
   end
 

data/spec/features/search_filters_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 
@@ -140,7 +140,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
   end
@@ -164,7 +164,7 @@ RSpec.describe "Facets" do
       expect(page).to have_css("span.facet-count.selected", text: "2")
     end
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
   end

data/spec/features/search_spec.rb

@@ -44,7 +44,7 @@ RSpec.describe "Search Page" do
     Capybara.ignore_hidden_elements = tmp_value
 
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 
@@ -74,7 +74,7 @@ RSpec.describe "Search Page" do
     click_on 'search'
 
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "Title"
       expect(page).to have_content "inmul"
     end
@@ -104,7 +104,7 @@ RSpec.describe "Search Page" do
     fill_in "q", with: 'history'
     click_on 'search'
     within "#appliedParams" do
-      expect(page).to have_content "You searched for:"
+      expect(page).to have_content "Your selections:"
       expect(page).to have_content "history"
     end
 

data/spec/presenters/blacklight/constraint_presenter_spec.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::ConstraintPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(facet_item_presenter: facet_item_presenter, field_label: field_label)
+  end
+
+  let(:facet_item_presenter) do
+    instance_double(Blacklight::FacetItemPresenter, label: 'item 1', remove_href: '/catalog')
+  end
+  let(:field_label) { 'field 1' }
+
+  describe '#constraint_label' do
+    subject { presenter.constraint_label }
+
+    it { is_expected.to eq 'item 1' }
+  end
+
+  describe '#field_label' do
+    subject { presenter.field_label }
+
+    it { is_expected.to eq 'field 1' }
+  end
+
+  describe '#remove_href' do
+    subject { presenter.remove_href }
+
+    it { is_expected.to eq '/catalog' }
+  end
+end

data/spec/presenters/blacklight/facet_item_presenter_spec.rb

@@ -56,13 +56,6 @@ RSpec.describe Blacklight::FacetItemPresenter, type: :presenter do
     end
   end
 
-  describe '#constraint_label' do
-    it 'provides the label for the constraint' do
-      allow(facet_config).to receive_messages(query: nil, date: nil, helper_method: nil, url_method: nil)
-      expect(presenter.constraint_label).to eq presenter.label
-    end
-  end
-
   describe '#href' do
     let(:filter_field) { instance_double(Blacklight::SearchState::FilterField, include?: false) }
 

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.beta5
+  version: 9.0.0.beta7
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -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
@@ -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
@@ -1144,6 +1152,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