blacklight-spotlight 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00bc8950c632e97a365418053a379016e111b937
-  data.tar.gz: 4eb7a348e011e9e0fc646946b91126a0e017269d
+  metadata.gz: ece8d22f7b1839d5ea4fb24642d7805f9ab02567
+  data.tar.gz: 604eeed993a923572cd6c7fb533f531ed395427d
 SHA512:
-  metadata.gz: 9b6ce0ffe5fe536bbc4b73e845e3ccbe2ae48c01f43789463e6cab7e9454a9eaac5289b7c21da19ec4b66be634440adf1a460d02352c7baafee637c5e2761da3
-  data.tar.gz: 4ba852983e8568cc516e0a3e7cabfa7cd15b46c132ddb8d34bbd2fa2fde94625c411c7a76674632f16283f4f95947f6cd1609811450251546de4a7e7b335525a
+  metadata.gz: 5004e50bc5c190078217936076b7667d48089eb9e222ca8d4a7d9b7554059d49a02ebd18504afaae233d890b1b0fdc1a24e164547cab391aa309f6cd5ca973b3
+  data.tar.gz: dc8f7e5ccbfe784a6c3372c0131843bf2fe0732227fb279761ac7cc76532b5662d361ec7ef213c37cea3b2c1ff9824711941e9a127f55e2a807633ba4be6ad02

data/app/controllers/spotlight/browse_controller.rb

@@ -26,9 +26,7 @@ module Spotlight
     protected
 
     def search_query
-      base_query = Blacklight::SearchState.new(@search.query_params, blacklight_config)
-      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
-      base_query.params_for_search(user_query)
+      @search.merge_params_for_search(params, blacklight_config)
     end
 
     ##

data/app/helpers/spotlight/pages_helper.rb

@@ -21,8 +21,8 @@ module Spotlight
     end
 
     def get_search_widget_search_results(block)
-      if block.searches?
-        search_results(search_widget_search_query(block))
+      if block.search.present?
+        search_results(block.search.merge_params_for_search(params, blacklight_config))
       else
         []
       end
@@ -50,13 +50,5 @@ module Spotlight
     def render_contact_email_address(address)
       mail_to address, address
     end
-
-    private
-
-    def search_widget_search_query(block)
-      base_query = Blacklight::SearchState.new(block.query_params, blacklight_config)
-      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
-      base_query.params_for_search(user_query)
-    end
   end
 end

data/app/models/spotlight/search.rb

@@ -78,6 +78,12 @@ module Spotlight
       search_builder.with(query_params.with_indifferent_access).merge(facet: false, fl: default_search_fields)
     end
 
+    def merge_params_for_search(params, blacklight_config)
+      base_query = Blacklight::SearchState.new(query_params, blacklight_config)
+      user_query = Blacklight::SearchState.new(params, blacklight_config).to_h
+      base_query.params_for_search(user_query).merge(user_query.slice(:page))
+    end
+
     private
 
     def search_builder_class

data/lib/spotlight/version.rb

@@ -1,3 +1,3 @@
 module Spotlight
-  VERSION = '0.28.0'.freeze
+  VERSION = '0.28.1'.freeze
 end

data/spec/models/spotlight/search_spec.rb

@@ -118,4 +118,20 @@ describe Spotlight::Search, type: :model do
       expect(search.send(:repository).blacklight_config).to eql blacklight_config
     end
   end
+
+  describe '#merge_params_for_search' do
+    it 'merges user-supplied parameters into the search query' do
+      user_params = { view: 'x' }
+      search_params = subject.merge_params_for_search(user_params, blacklight_config)
+      expect(search_params).to include query_params
+      expect(search_params).to include user_params
+    end
+
+    it 'preserves user pagination' do
+      user_params = { page: 5, per_page: 7 }
+      search_params = subject.merge_params_for_search(user_params, blacklight_config)
+      expect(search_params).to include query_params
+      expect(search_params).to include user_params
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Chris Beer