blacklight-spotlight 3.5.0.2 → 3.5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b37ca44843ce17defff551d04be7ad02dec03229756548a7f42dbda6d7608ed
-  data.tar.gz: d240e8284f7030833fd81256d232c37f3ee178c8b329823007a1de6d44e6e7ca
+  metadata.gz: 6f2b5e2ecd48de319a43b16c29e60ab1fcff2936525f54241c8a338eb94f73f3
+  data.tar.gz: 673c1ecde408e6406c34db51e29f00c56364ba999b584e9f68ad4c3849fc86cc
 SHA512:
-  metadata.gz: 6ab409d1cb4743910da14cc580d2048fe18a798edcbaa5b5dcbf93c67b1a7c9a6e40a9647a44262d369e13830cf7e3a0419278c18a3de58bbb70a2df93933716
-  data.tar.gz: 900d4dec2ff3596e0f9ee37f66b118419317eb8c1a2931827a1ed3ebb117a3a6324e9358bb660180f94c63427db39520b3663e8cb167afc2db4d54bd01ef86a5
+  metadata.gz: f682bd13aa9a3584da448b68da13b45de241d04c42acfa7e45104013c4d0ae666e6927fbdddb9b85364ccaf85634b7d0c35b3f2f86c3096f1c293ebf2821a6bb
+  data.tar.gz: eccb8a8e6fe2caea9986018c2c0524159d7d7862c27d57a0419fc9208f34c0d7c3779e311601cc5f7e6426ad5176a3fb120a17eafe70f0e20b4cb5179f31117d

data/app/models/concerns/spotlight/browse_category_search_builder.rb

@@ -15,7 +15,7 @@ module Spotlight
     def apply_browse_category_defaults(solr_params)
       return unless current_browse_category
 
-      solr_params.merge!(browse_category_search_builder.to_hash)
+      solr_params.merge!(browse_category_search_builder.to_hash.except(:q))
     end
 
     def fix_up_browse_category_defaults(solr_params)
@@ -25,14 +25,27 @@ module Spotlight
     end
 
     def fix_up_browse_category_queries(solr_params)
-      return unless solr_params.dig(:json, :query, :bool, :must) && blacklight_params[:q]
+      return unless current_browse_category
+
+      query = browse_category_search_builder.to_hash[:q]
+
+      solr_params.append_query(query) if query.present?
+
+      # for a browse category formed from a saved search, the query syntax reads as two "must" values
+      # e.g.  "json"=>{"query"=>{"bool"=>{"must"=>["savedsearchterm", "browsecategorysearchterm"]}}}}
+      must_values = solr_params.dig(:json, :query, :bool, :must)
+
+      return unless must_values&.any?
+
+      # this type of query must be parsed by lucene to function
+      solr_params[:defType] = 'lucene'
 
       # This replicates existing spotlight 2.x search behavior, more or less. It
       # doesn't take into account the possibility that the browse category query
       # could use a different search field (which.. doesn't have an existing UI
       # control.. and may require additional upstream work to properly encapsulate
       # the two query parameters)
-      solr_params[:json][:query][:bool][:must].map! do |q|
+      must_values.map! do |q|
         q.is_a?(String) ? { edismax: { query: q } } : q
       end
     end

data/app/services/spotlight/etl/solr_loader.rb

@@ -53,7 +53,7 @@ module Spotlight
                                data: [document].to_json,
                                headers: { 'Content-Type' => 'application/json' }
       rescue StandardError => e
-        pipeline&.on_error(self, e, document.to_json)
+        pipeline&.on_error(e, document.to_json)
       end
 
       def blacklight_solr

data/config/locales/spotlight.en.yml

@@ -801,7 +801,7 @@ en:
         note_provenance_tesim: Provenance
         note_references_tesim: References
         note_source_tesim: Source
-        personal_name_ssm: Personal names
+        personal_name_ssim: Personal names
         search:
           all_fields: Everything
           author: Author

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.5.0.2'
+  VERSION = '3.5.0.4'
 end

data/spec/factories/searches.rb

@@ -30,4 +30,16 @@ FactoryBot.define do
 
     after(:build) { |search| search.thumbnail = FactoryBot.create(:featured_image) }
   end
+
+  factory :search_field_search, class: 'Spotlight::Search' do
+    exhibit
+    title { 'Based on a search field' }
+    query_params { { 'search_field' => 'search', 'q' => 'model' } }
+  end
+
+  factory :facet_search, class: 'Spotlight::Search' do
+    exhibit
+    title { 'Based on a facet' }
+    query_params { { 'f' => { 'language_ssim' => 'Latin' } } }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.5.0.2
+  version: 3.5.0.4
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-28 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -773,6 +773,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  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: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -871,20 +885,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -1607,7 +1607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections