blacklight 6.17.0 → 6.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ab78d68e30d49fcc8d4f8308d4340080a7697f604cc5face23c75fcdae3fea27
-  data.tar.gz: f9f0457f2d22cb0fdeba22fac2a89f7b88a525591052cf8d3fc7a965c9555d59
+SHA1:
+  metadata.gz: 59d179acd38459b0540692e705b2c4835f31c022
+  data.tar.gz: e3f02fe1b03842e4d80fe678435105064504c8c6
 SHA512:
-  metadata.gz: a73b55d12488b47cfe7a5d511512806e2c03e157015697598ffb9c2bb9fe3a526b5cac56624089802ff7895381251ed8ae39e011a7076b47a713a3e3480ac803
-  data.tar.gz: 520745be6bb8458dc8fc050343f90f941b43d80f5c4e013bdc0f5d11f20009f4416fa92576c23a46f00a889f92737b2bee694ddda0137a37fe0bb741db6c88d8
+  metadata.gz: f55802166972b36f29a5e687c4e42a323426b27a189134bc7940bf227e0532e6b183c57b4f3d539f92dd64a85ca8c915af68bd627e50c6560b9c07061a6141ad
+  data.tar.gz: dec4137377509c2eebd25f4c63fb7302d9daf7e22d84e8bc7b0a8916999637c7d048b51964c7de8b7e8ebd5dcddb7739c7453c5304a612b9e045be9c9b3bc02d

data/VERSION

@@ -1 +1 @@
-6.17.0
+6.18.0

data/app/controllers/concerns/blacklight/search_helper.rb

@@ -141,8 +141,9 @@ module Blacklight::SearchHelper
       query = search_builder.
                 with(user_params).
                 where(blacklight_config.document_model.unique_key => ids).
-                merge(extra_controller_params).
-                merge(fl: '*')
+                merge(blacklight_config.fetch_many_document_params || deprecated_fetch_many_document_params).
+                merge(extra_controller_params)
+
       solr_response = repository.search(query)
 
       [solr_response, solr_response.documents]
@@ -152,4 +153,9 @@ module Blacklight::SearchHelper
       solr_response = repository.find id, extra_controller_params
       [solr_response, solr_response.documents.first]
     end
+
+    def deprecated_fetch_many_document_params
+      Deprecation.warn(self, 'You should configure blacklight_config.fetch_many_document_params; defaulting to { fl: "*" }, but this will be removed in Blacklight 7')
+      { fl: '*' }
+    end
 end

data/lib/blacklight/configuration.rb

@@ -57,6 +57,7 @@ module Blacklight
             #rows: 1
           },
           document_pagination_params: {},
+          fetch_many_document_params: nil,
           ##
           # == Response models
           ## Class for sending and receiving requests from a search index

data/spec/controllers/blacklight/search_helper_spec.rb

@@ -16,13 +16,13 @@ describe Blacklight::SearchHelper do
   class SearchHelperTestClass
     include Blacklight::SearchHelper
 
-    attr_accessor :blacklight_config
-    attr_accessor :repository
+    attr_accessor :blacklight_config, :repository, :search_state
 
-    def initialize blacklight_config, conn
+    def initialize blacklight_config, conn, state
       self.blacklight_config = blacklight_config
       self.repository = Blacklight::Solr::Repository.new(blacklight_config)
       self.repository.connection = conn
+      self.search_state = search_state
     end
 
     def params
@@ -30,11 +30,12 @@ describe Blacklight::SearchHelper do
     end
   end
 
-  subject { SearchHelperTestClass.new blacklight_config, blacklight_solr }
+  subject { SearchHelperTestClass.new blacklight_config, blacklight_solr, state }
 
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:copy_of_catalog_config) { ::CatalogController.blacklight_config.deep_copy }
   let(:blacklight_solr) { RSolr.connect(Blacklight.connection_config.except(:adapter)) }
+  let(:state) { {} }
 
   before(:each) do
     @all_docs_query = ''
@@ -307,6 +308,24 @@ describe Blacklight::SearchHelper do
     end
   end
 
+  describe 'Get multiple documents By Id', integration: true do
+    let(:doc_id) { '2007020969' }
+    let(:bad_id) { 'redrum' }
+    let(:response) { subject.fetch([doc_id]).first }
+
+    before do
+      blacklight_config.fetch_many_document_params = { fl: 'id,format' }
+    end
+
+    it 'has the expected value in the id field' do
+      expect(response.documents.first.id).to eq doc_id
+    end
+
+    it 'returns all the requested fields' do
+      expect(response.documents.first['format']).to eq 'Book'
+    end
+  end
+
 # SPECS FOR SPELLING SUGGESTIONS VIA SEARCH
   describe "Searches should return spelling suggestions", :integration => true do
     it 'search results for just-poor-enough-query term should have (multiple) spelling suggestions' do
@@ -377,7 +396,7 @@ describe Blacklight::SearchHelper do
       it "returns nil if no @response available" do
         expect(subject.facet_limit_for("some_unknown_field")).to be_nil
       end
-      it "gets from @response facet.limit if available" do        
+      it "gets from @response facet.limit if available" do
         @response = instance_double(Blacklight::Solr::Response, aggregations: { "language_facet" => double(limit: nil) })
         subject.instance_variable_set(:@response, @response)
         blacklight_config.facet_fields['language_facet'].limit = 10
@@ -392,7 +411,7 @@ describe Blacklight::SearchHelper do
         expect(subject.facet_limit_for("language_facet")).to eq 10
       end
     end
-    
+
     context 'for facet fields with a key that is different from the field name' do
       let(:blacklight_config) do
         Blacklight::Configuration.new do |config|
@@ -424,11 +443,11 @@ describe Blacklight::SearchHelper do
     it "pulls the grouped key out of the config" do
       blacklight_config.index.group = 'xyz'
       expect(subject.grouped_key_for_results).to eq('xyz')
-    end 
+    end
   end
 
   describe "#get_previous_and_next_documents_for_search" do
-    let(:pre_query) { SearchHelperTestClass.new blacklight_config, blacklight_solr }
+    let(:pre_query) { SearchHelperTestClass.new blacklight_config, blacklight_solr, state }
     before do
       @full_response, @all_docs = pre_query.search_results(q: '', per_page: '100')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.17.0
+  version: 6.18.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -765,7 +765,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)