blacklight-spotlight 3.5.0.1 → 3.5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd568a7e1663ebde3fb308ca3174b0c4aa10415a1c202f86da675873e1c722a7
-  data.tar.gz: a41c2f3a08c6bd1e5b8f3d1076cecbc2205151fd43d1371d9717f2a4ffa062e4
+  metadata.gz: 42d2555f8a1c4195b162f1372cee92830f15d5c8352fdd2feded4adfc20b91e2
+  data.tar.gz: 8767e5e3c753bb98e591652dba94e2e87f5be6010ef4d200c22c3442cd7eefcc
 SHA512:
-  metadata.gz: fde923d14c41f0313479eb27441b06f8535cd13254eb11210b75db65afaba862d5688023c9048c12f5a18ca3e867b3a6247437ab38d38bdbd0731cb517bb9321
-  data.tar.gz: 76e088c504f780faaad67bede7893e5379d7d9e07e53f3d6fd38161927fbf8b4a5c40e7fb5827f2f140fdd9e74f546a0917799109e4b7c9ca34e50386e4ab893
+  metadata.gz: 694f8dc2ff14e68d703885794e7aab5de87068c184019dd4cefcad719319cdbd152ca5df6a050dcc57fcb5dde2ae35ca41915bbf12a867d9ba3e7b06eebf4c70
+  data.tar.gz: 165f58ec01b4acd613c0b95fb25955f4dda3347c779b48e725cb855c6f689c09b811171160444f2677036d4685fb5c9427ecf33196e151b526af0e5356caadbb

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/models/spotlight/search.rb

@@ -64,6 +64,10 @@ module Spotlight
       end
     end
 
+    def query_params
+      super || {}.with_indifferent_access
+    end
+
     delegate :blacklight_config, to: :exhibit
 
     def display_masthead?

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.1'
+  VERSION = '3.5.0.3'
 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.1
+  version: 3.5.0.3
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -871,20 +871,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 +1593,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections