blacklight 7.13.0 → 7.15.0

data/spec/models/blacklight/solr/repository_spec.rb

@@ -134,6 +134,18 @@ RSpec.describe Blacklight::Solr::Repository, api: true do
         end
       end
     end
+
+    context 'with json parameters' do
+      it 'sends a post request with some json' do
+        allow(subject.connection).to receive(:send_and_receive) do |path, params|
+          expect(path).to eq 'select'
+          expect(params[:method]).to eq :post
+          expect(JSON.parse(params[:data]).with_indifferent_access).to include(query: { bool: {} })
+          expect(params[:headers]).to include({ 'Content-Type' => 'application/json' })
+        end.and_return('response' => { 'docs' => [] })
+        subject.search(json: { query: { bool: {} } })
+      end
+    end
   end
 
   describe "http_method configuration", integration: true do

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -109,7 +109,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     let(:facet) { { name: "foo", value: "bar", hits: 1 } }
 
     before do
-      response.merge_facet(facet)
+      response.merge_facet(**facet)
     end
 
     context "facet does not already exist" do

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -259,6 +259,17 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
     end
 
+    describe 'with multi-valued facets' do
+      let(:user_params) { { f_inclusive: { format: %w[Book Movie CD] } } }
+
+      it "has proper solr parameters" do
+        expect(subject[:fq]).to include('{!lucene}{!query v=$f_inclusive.format.0} OR {!query v=$f_inclusive.format.1} OR {!query v=$f_inclusive.format.2}')
+        expect(subject['f_inclusive.format.0']).to eq '{!term f=format}Book'
+        expect(subject['f_inclusive.format.1']).to eq '{!term f=format}Movie'
+        expect(subject['f_inclusive.format.2']).to eq '{!term f=format}CD'
+      end
+    end
+
     describe "solr parameters for a field search from config (subject)" do
       let(:user_params) { subject_search_params }
 
@@ -723,4 +734,21 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.with_ex_local_param(nil, "some-value")).to eq "some-value"
     end
   end
+
+  context 'with advanced search clause parameters' do
+    before do
+      blacklight_config.search_fields.each_value do |v|
+        v.clause_params = { edismax: v.solr_parameters.dup }
+      end
+    end
+
+    let(:user_params) { { op: 'must', clause: { '0': { field: 'title', query: 'the book' }, '1': { field: 'author', query: 'the person' } } } }
+
+    it "has proper solr parameters" do
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 0, :edismax, :query)).to eq 'the book'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 0, :edismax, :qf)).to eq '${title_qf}'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :query)).to eq 'the person'
+      expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :qf)).to eq '${author_qf}'
+    end
+  end
 end

data/spec/presenters/blacklight/clause_presenter_spec.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::ClausePresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new('0', params.with_indifferent_access.dig(:clause, '0'), field_config, controller.view_context, search_state)
+  end
+
+  let(:field_config) { Blacklight::Configuration::NullField.new key: 'some_field' }
+  let(:search_state) { Blacklight::SearchState.new(params.with_indifferent_access, Blacklight::Configuration.new) }
+  let(:params) { {} }
+
+  describe '#field_label' do
+    it 'returns a label for the field' do
+      expect(subject.field_label).to eq 'Some Field'
+    end
+  end
+
+  describe '#label' do
+    let(:params) { { clause: { '0' => { query: 'some search string' } } } }
+
+    it 'returns the query value for the clause' do
+      expect(subject.label).to eq 'some search string'
+    end
+  end
+
+  describe '#remove_href' do
+    let(:params) { { clause: { '0' => { query: 'some_search_string' } } } }
+
+    it 'returns the href to remove the search clause' do
+      expect(subject.remove_href).not_to include 'some_search_string'
+    end
+  end
+end

data/spec/presenters/blacklight/document_presenter_spec.rb

@@ -47,4 +47,17 @@ RSpec.describe Blacklight::DocumentPresenter do
       expect(presenter.field_value(field_config, options)).to eq 'abc'
     end
   end
+
+  describe '#thumbnail' do
+    it 'returns a thumbnail presenter' do
+      expect(presenter.thumbnail).to be_a_kind_of(Blacklight::ThumbnailPresenter)
+    end
+
+    it 'use the configured thumbnail presenter' do
+      custom_presenter_class = Class.new(Blacklight::ThumbnailPresenter)
+      blacklight_config.index.thumbnail_presenter = custom_presenter_class
+
+      expect(presenter.thumbnail).to be_a_kind_of custom_presenter_class
+    end
+  end
 end

data/spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Blacklight::FacetGroupedItemPresenter, type: :presenter do
+  subject(:presenter) do
+    described_class.new(group, facet_item, facet_config, view_context, facet_field, search_state)
+  end
+
+  let(:facet_config) { Blacklight::Configuration::FacetField.new(key: 'key') }
+  let(:facet_field) { instance_double(Blacklight::Solr::Response::Facets::FacetField) }
+  let(:view_context) { controller.view_context }
+
+  let(:facet_item) { 'a' }
+  let(:group) { %w[a b c] }
+  let(:search_state) { Blacklight::SearchState.new(params, Blacklight::Configuration.new) }
+  let(:params) { { f_inclusive: { key: group } } }
+
+  describe '#selected' do
+    it { is_expected.to be_selected }
+
+    context 'when the item is not in the group' do
+      let(:facet_item) { 'd' }
+
+      it { is_expected.not_to be_selected }
+    end
+
+    describe '#href' do
+      it 'removes the item from the "group" of filters' do
+        expect(Rack::Utils.parse_query(URI(presenter.href).query)).to include 'f_inclusive[key][]' => %w[b c]
+      end
+
+      context 'when the item is not in the group' do
+        let(:facet_item) { 'd' }
+
+        it 'adds the item to the "group" of filters' do
+          expect(Rack::Utils.parse_query(URI(presenter.href).query)).to include 'f_inclusive[key][]' => %w[a b c d]
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -20,12 +20,17 @@ require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 require 'capybara/rspec'
-require 'selenium-webdriver'
+require 'capybara/apparition'
 require 'equivalent-xml'
-require 'webdrivers'
 
-Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.javascript_driver = :apparition
 Capybara.disable_animation = true
+# Capybara.enable_aria_label = true
+
+# Uncomment for a headed browser
+# Capybara.register_driver :apparition do |app|
+#   Capybara::Apparition::Driver.new(app, headless: false)
+# end
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/test_app_templates/Gemfile.extra

@@ -1,2 +1,2 @@
 gem 'rails-controller-testing'
-gem 'thor', '~> 0.20'
+gem 'thor', '~> 0.20' if /^5.[12]/.match?(ENV['RAILS_VERSION'])

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

@@ -5,6 +5,7 @@ RSpec.describe "catalog/_document" do
   let(:blacklight_config) { Blacklight::Configuration.new }
 
   before do
+    allow(controller).to receive(:controller_name).and_return('test')
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     assign(:response, instance_double(Blacklight::Solr::Response, start: 20))

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

@@ -16,6 +16,8 @@ RSpec.describe "catalog/_thumbnail" do
   end
 
   before do
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(controller).to receive(:view_context).and_return(view)
     allow(controller).to receive(:action_name).and_return('index')
     assign :response, instance_double(Blacklight::Solr::Response, start: 0)
     allow(view).to receive(:render_grouped_response?).and_return false

data/tasks/blacklight.rake

@@ -14,14 +14,14 @@ require 'solr_wrapper'
 require 'open3'
 
 def system_with_error_handling(*args)
-  Open3.popen3(*args) do |stdout, stderr, status, _thread|
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
     puts stdout.read
-    raise "Unable to run #{args.inspect}: #{stderr.read}" unless status.success?
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
   end
 end
 
 def with_solr
-  if system('docker-compose')
+  if system('docker-compose -v')
     begin
       puts "Starting Solr"
       system_with_error_handling "docker-compose up -d solr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.13.0
+  version: 7.15.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -95,20 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.23.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -186,33 +214,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: apparition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.13.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +353,7 @@ files:
 - ".docker/app/Dockerfile"
 - ".docker/app/entrypoint.sh"
 - ".env"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".jshintrc"
@@ -346,7 +361,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
 - Gemfile
@@ -380,6 +394,8 @@ files:
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
 - app/builders/blacklight/action_builder.rb
+- app/components/blacklight/advanced_search_form_component.html.erb
+- app/components/blacklight/advanced_search_form_component.rb
 - app/components/blacklight/constraint_component.html.erb
 - app/components/blacklight/constraint_component.rb
 - app/components/blacklight/constraint_layout_component.html.erb
@@ -404,10 +420,14 @@ files:
 - app/components/blacklight/document_component.rb
 - app/components/blacklight/document_metadata_component.html.erb
 - app/components/blacklight/document_metadata_component.rb
+- app/components/blacklight/facet_field_checkboxes_component.html.erb
+- app/components/blacklight/facet_field_checkboxes_component.rb
 - app/components/blacklight/facet_field_component.html.erb
 - app/components/blacklight/facet_field_component.rb
 - app/components/blacklight/facet_field_filter_component.html.erb
 - app/components/blacklight/facet_field_filter_component.rb
+- app/components/blacklight/facet_field_inclusive_constraint_component.html.erb
+- app/components/blacklight/facet_field_inclusive_constraint_component.rb
 - app/components/blacklight/facet_field_list_component.html.erb
 - app/components/blacklight/facet_field_list_component.rb
 - app/components/blacklight/facet_field_no_layout_component.rb
@@ -415,6 +435,7 @@ 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/hidden_search_state_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
 - app/components/blacklight/metadata_field_component.rb
 - app/components/blacklight/metadata_field_layout_component.html.erb
@@ -496,10 +517,13 @@ files:
 - app/models/record_mailer.rb
 - app/models/search.rb
 - app/models/solr_document.rb
+- app/presenters/blacklight/clause_presenter.rb
 - app/presenters/blacklight/document_presenter.rb
 - app/presenters/blacklight/facet_field_presenter.rb
+- app/presenters/blacklight/facet_grouped_item_presenter.rb
 - app/presenters/blacklight/facet_item_presenter.rb
 - app/presenters/blacklight/field_presenter.rb
+- app/presenters/blacklight/inclusive_facet_item_presenter.rb
 - app/presenters/blacklight/index_presenter.rb
 - app/presenters/blacklight/json_presenter.rb
 - app/presenters/blacklight/link_alternate_presenter.rb
@@ -522,6 +546,8 @@ files:
 - app/views/bookmarks/_clear_bookmarks_widget.html.erb
 - app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
+- app/views/catalog/_advanced_search_form.html.erb
+- app/views/catalog/_advanced_search_help.html.erb
 - app/views/catalog/_bookmark_control.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_constraints.html.erb
@@ -568,6 +594,7 @@ files:
 - app/views/catalog/_thumbnail.html.erb
 - app/views/catalog/_view_type_group.html.erb
 - app/views/catalog/_zero_results.html.erb
+- app/views/catalog/advanced_search.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
@@ -704,14 +731,17 @@ files:
 - lib/generators/blacklight/user_generator.rb
 - lib/railties/blacklight.rake
 - package.json
+- spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - 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/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -723,6 +753,7 @@ files:
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
+- spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
@@ -792,8 +823,10 @@ files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/clause_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb
+- spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_item_presenter_spec.rb
 - spec/presenters/blacklight/field_presenter_spec.rb
 - spec/presenters/blacklight/index_presenter_spec.rb
@@ -848,35 +881,38 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files:
+- spec/components/blacklight/advanced_search_form_component_spec.rb
 - spec/components/blacklight/constraint_layout_component_spec.rb
 - spec/components/blacklight/document/action_component_spec.rb
 - spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
+- spec/components/blacklight/facet_field_checkboxes_component_spec.rb
 - 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/hidden_search_state_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
 - spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
@@ -888,6 +924,7 @@ test_files:
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/search_history_controller_spec.rb
+- spec/features/advanced_search_spec.rb
 - spec/features/alternate_controller_spec.rb
 - spec/features/autocomplete_spec.rb
 - spec/features/bookmarks_spec.rb
@@ -957,8 +994,10 @@ test_files:
 - spec/models/record_mailer_spec.rb
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
+- spec/presenters/blacklight/clause_presenter_spec.rb
 - spec/presenters/blacklight/document_presenter_spec.rb
 - spec/presenters/blacklight/facet_field_presenter_spec.rb
+- spec/presenters/blacklight/facet_grouped_item_presenter_spec.rb
 - spec/presenters/blacklight/facet_item_presenter_spec.rb
 - spec/presenters/blacklight/field_presenter_spec.rb
 - spec/presenters/blacklight/index_presenter_spec.rb