blacklight 7.15.2 → 7.18.0

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

@@ -120,6 +120,16 @@ RSpec.describe Blacklight::Solr::Response, api: true do
     expect(r.params['test']).to eq :test
   end
 
+  it 'extracts json params' do
+    raw_response = eval(mock_query_response)
+    raw_response['responseHeader']['params']['test'] = 'from query'
+    raw_response['responseHeader']['params'].delete('rows')
+    raw_response['responseHeader']['params']['json'] = { limit: 5, params: { test: 'from json params' } }.to_json
+    r = described_class.new(raw_response, raw_response['params'])
+    expect(r.params['test']).to eq 'from query'
+    expect(r.rows).to eq 5
+  end
+
   it 'provides the solr-returned params and "rows" should be 11' do
     raw_response = eval(mock_query_response)
     r = described_class.new(raw_response, {})

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

@@ -259,6 +259,23 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
     end
 
+    describe 'with a json facet' do
+      let(:user_params) { { f: { json_facet: ['value'] } }.with_indifferent_access }
+
+      before do
+        blacklight_config.add_facet_field 'json_facet', field: 'foo', json: { bar: 'baz' }
+      end
+
+      it "has proper solr parameters" do
+        expect(subject[:fq]).to include('{!term f=foo}value')
+        expect(subject.dig(:json, :facet, 'json_facet')).to include(
+          field: 'foo',
+          type: 'terms',
+          bar: 'baz'
+        )
+      end
+    end
+
     describe 'with multi-valued facets' do
       let(:user_params) { { f_inclusive: { format: %w[Book Movie CD] } } }
 
@@ -321,6 +338,38 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       end
     end
 
+    describe "solr json query parameters from the fielded search" do
+      let(:user_params) { subject_search_params }
+
+      before do
+        blacklight_config.search_fields['subject'].solr_parameters = {
+          some: :parameter
+        }
+
+        blacklight_config.search_fields['subject'].clause_params = {
+          edismax: {
+            another: :parameter
+          }
+        }
+      end
+
+      it 'sets solr parameters from the field' do
+        expect(subject[:some]).to eq :parameter
+      end
+
+      it 'does not set a q parameter' do
+        expect(subject).not_to have_key :q
+      end
+
+      it 'includes the user query in the JSON query DSL request' do
+        expect(subject.dig(:json, :query, :bool, :must, 0, :edismax)).to include query: 'wome'
+      end
+
+      it 'includes addtional clause parameters for the field' do
+        expect(subject.dig(:json, :query, :bool, :must, 0, :edismax)).to include another: :parameter
+      end
+    end
+
     describe "overriding of qt parameter" do
       let(:user_params) do
         { qt: 'overridden' }
@@ -751,4 +800,13 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash.with_indifferent_access.dig(:json, :query, :bool, :must, 1, :edismax, :qf)).to eq '${author_qf}'
     end
   end
+
+  describe '#where' do
+    let(:user_params) { {} }
+
+    it 'adds additional query filters on the search' do
+      subject.where(id: [1, 2, 3])
+      expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
+    end
+  end
 end

data/spec/services/blacklight/search_service_spec.rb

@@ -477,7 +477,7 @@ RSpec.describe Blacklight::SearchService, api: true do
     end
 
     before do
-      blacklight_config.view.opensearch.title_field = :field
+      blacklight_config.view.opensearch(title_field: :field)
       allow(repository).to receive(:search).and_return(mock_response)
     end
 

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

@@ -3,7 +3,7 @@
 RSpec.describe "catalog/constraints" do
   let :blacklight_config do
     Blacklight::Configuration.new do |config|
-      config.view.xyz
+      config.view.xyz({})
     end
   end
 

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

@@ -3,13 +3,9 @@
 RSpec.describe "catalog/_view_type_group" do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
-  let(:icon_instance) { instance_double(Blacklight::Icon) }
 
   before do
     allow(view).to receive(:view_label), &:to_s
-    allow(Blacklight::Icon).to receive(:new).and_return icon_instance
-    allow(icon_instance).to receive(:svg).and_return '<svg></svg>'
-    allow(icon_instance).to receive(:options).and_return({})
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
     assign(:response, response)
@@ -24,13 +20,16 @@ RSpec.describe "catalog/_view_type_group" do
   it "displays the group" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a
-      config.view.b
-      config.view.c
+      config.view.a(icon: :list)
+      config.view.b(icon: :list)
+      config.view.c(icon: :list)
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
     expect(rendered).to have_selector('.view-type-a', text: 'a')
+    within '.view-type-a' do
+      expect(rendered).to have_selector 'svg'
+    end
     expect(rendered).to have_selector('.view-type-b', text: 'b')
     expect(rendered).to have_selector('.view-type-c', text: 'c')
   end
@@ -38,8 +37,8 @@ RSpec.describe "catalog/_view_type_group" do
   it "sets the current view to 'active'" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a
-      config.view.b
+      config.view.a(icon: :list)
+      config.view.b(icon: :list)
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.active', text: 'a')

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

@@ -12,7 +12,7 @@ RSpec.describe "catalog/index" do
     end
   end
 
-  let(:blacklight_config) { CatalogController.blacklight_config }
+  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
 
   before do
     @response = Blacklight::Solr::Response.new({ response: { numFound: 30 } }, start: 10, rows: 10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.15.2
+  version: 7.18.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.23.0
+        version: 2.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.23.0
+        version: 2.28.0
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +402,7 @@ files:
 - app/components/blacklight/constraint_layout_component.rb
 - app/components/blacklight/constraints_component.html.erb
 - app/components/blacklight/constraints_component.rb
+- app/components/blacklight/content_areas_shim.rb
 - app/components/blacklight/document/action_component.html.erb
 - app/components/blacklight/document/action_component.rb
 - app/components/blacklight/document/actions_component.html.erb
@@ -420,6 +421,8 @@ 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/document_title_component.html.erb
+- app/components/blacklight/document_title_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
@@ -448,6 +451,8 @@ files:
 - app/components/blacklight/response/sort_component.rb
 - app/components/blacklight/response/spellcheck_component.html.erb
 - app/components/blacklight/response/spellcheck_component.rb
+- app/components/blacklight/response/view_type_button_component.html.erb
+- app/components/blacklight/response/view_type_button_component.rb
 - app/components/blacklight/response/view_type_component.html.erb
 - app/components/blacklight/response/view_type_component.rb
 - app/components/blacklight/search_bar_component.html.erb
@@ -691,6 +696,7 @@ files:
 - lib/blacklight/solr/response/group_response.rb
 - lib/blacklight/solr/response/more_like_this.rb
 - lib/blacklight/solr/response/pagination_methods.rb
+- lib/blacklight/solr/response/params.rb
 - lib/blacklight/solr/response/response.rb
 - lib/blacklight/solr/response/spelling.rb
 - lib/blacklight/solr/search_builder_behavior.rb