blacklight 5.12.1 → 5.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abad33ed78f1831cc8ae408d0d19071b667f74be
-  data.tar.gz: bd713d5fb66e2d1aa49b4fbcac88ff0724b0aedf
+  metadata.gz: f1b1cb3c8c840ba192f1b41a34318d44392d616a
+  data.tar.gz: 24a3b7ac9557d150777dd508738022c5edf5b376
 SHA512:
-  metadata.gz: c9478b659e45b4df5320395ddc301190390a7adb6d031a819761af390f07d5d59853f184381ff96fae5193c867e84b1a6bb19d86e56e9b2619c42639136697a2
-  data.tar.gz: 37f40ed46cca97a3f5fb1ddb49776e6ff4a41ca2318575d6cfb1f942c8a1e32ef7e2f29f73eac320f3b8d67ccc814aba6dc293e5482bf5062c82710cdd34cad1
+  metadata.gz: e5330c09fc2acb28fac501295d13078724d45f98c81d14163e7ce22b5b54e2cdaf8b5435704c0969534b69649db67d5a1f1893905c68c9021d53a508c5494981
+  data.tar.gz: 7c3071efa52edb0bd2549351e515fd4b40a87fdca82d25b2a910b6635f68ad2272bfba7cc9bd80ca9c2d5fc67897e50079149ece3b0df370134a8dc7827b1432

data/VERSION

@@ -1 +1 @@
-5.12.1
+5.13.0

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -266,23 +266,29 @@ module Blacklight::BlacklightHelperBehavior
   ##
   # Render the document "heading" (title) in a content tag
   # @overload render_document_heading(tag)
+  #   @params [Symbol] tag
   # @overload render_document_heading(document, options)
   #   @params [SolrDocument] document
   #   @params [Hash] options
   #   @options options [Symbol] :tag
+  # @overload render_document_heading(options)
+  #   @params [Hash] options
+  #   @options options [Symbol] :tag
   def render_document_heading(*args)
     options = args.extract_options!
-    if args.first.is_a? blacklight_config.document_model
-      document = args.shift
-      tag = options[:tag]
+
+    tag_or_document = args.first
+
+    if tag_or_document.is_a? String or tag_or_document.is_a? Symbol
+      Deprecation.warn(Blacklight::BlacklightHelperBehavior, "#render_document_heading with a tag argument is deprecated; pass e.g. `tag: :h4` instead")
+      tag = tag_or_document
+      document = @document
     else
-      document = nil
-      tag = args.first || options[:tag]
+      tag = options.fetch(:tag, :h4)
+      document = tag_or_document || @document
     end
 
-    tag ||= :h4
-
-    content_tag(tag, presenter(document).document_heading, :itemprop => "name")
+    content_tag(tag, presenter(document).document_heading, itemprop: "name")
   end
 
   ##

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -117,6 +117,15 @@ module Blacklight::CatalogHelperBehavior
     render :partial => 'show_sidebar'
   end
 
+  ##
+  # Render the main content partial for a document
+  #
+  # @param [SolrDocument]
+  # @return [String]
+  def render_document_main_content_partial(document = @document)
+    render partial: 'show_main_content'
+  end
+
   ##
   # Should we display the sort and per page widget?
   # 

data/app/helpers/blacklight/layout_helper_behavior.rb

@@ -0,0 +1,34 @@
+# Methods added to this helper will be available to all templates in the hosting
+# application
+module Blacklight
+  # A module for useful methods used in layout configuration
+  module LayoutHelperBehavior
+    ##
+    # Classes added to a document's show content div
+    # @return [String]
+    def show_content_classes
+      "#{main_content_classes} show-document"
+    end
+
+    ##
+    # Classes added to a document's sidebar div
+    # @return [String]
+    def show_sidebar_classes
+      sidebar_classes
+    end
+
+    ##
+    # Classes used for sizing the main content of a Blacklight page
+    # @return [String]
+    def main_content_classes
+      'col-md-9 col-sm-8'
+    end
+
+    ##
+    # Classes used for sizing the sidebar content of a Blacklight page
+    # @return [String]
+    def sidebar_classes
+      'col-md-3 col-sm-4'
+    end
+  end
+end

data/app/helpers/layout_helper.rb

@@ -0,0 +1,3 @@
+module LayoutHelper
+  include Blacklight::LayoutHelperBehavior
+end

data/app/views/catalog/_show_main_content.html.erb

@@ -0,0 +1,19 @@
+<%= render 'previous_next_doc' %>
+
+<% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name).html_safe %>
+<% content_for(:head) { render_link_rel_alternates } %>
+
+<div id="document" class="document <%= render_document_class %>" itemscope  itemtype="<%= @document.itemtype %>">
+  <div id="doc_<%= @document.id.to_s.parameterize %>">
+    <%= render_document_partials @document, blacklight_config.view_config(:show).partials %>
+  </div>
+</div>
+
+<% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
+  <!-- 
+       // COinS, for Zotero among others. 
+       // This document_partial_name(@document) business is not quite right,
+       // but has been there for a while. 
+  -->
+  <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_partial_name(@document)) %>"></span>
+<% end %>

data/app/views/catalog/index.html.erb

@@ -1,8 +1,8 @@
-<div id="sidebar" class="col-md-3 col-sm-4">
+<div id="sidebar" class="<%= sidebar_classes %>">
   <%= render 'search_sidebar' %>
 </div>
 
-<div id="content" class="col-md-9 col-sm-8">
+<div id="content" class="<%= main_content_classes %>">
   <% unless has_search_parameters? %>
     <%# if there are no input/search related params, display the "home" partial -%>
     <%= render 'home' %>

data/app/views/catalog/show.html.erb

@@ -1,34 +1,7 @@
-<div id="content" class="col-md-9 col-sm-8 show-document">
-
-  <%= render 'previous_next_doc' %>
-
-   
-<% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name).html_safe -%>
-<% content_for(:head) { render_link_rel_alternates } -%>
-<%# this should be in a partial -%>
-
-<div id="document" class="document <%= render_document_class %>" itemscope  itemtype="<%= @document.itemtype %>">
-  <div id="doc_<%= @document.id.to_s.parameterize %>">
-  
-    <% # bookmark/folder functions -%>
-    <%= render_document_partials @document, blacklight_config.view_config(:show).partials %>
- 
-  </div>
-</div>
-
-
-
-  <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
-    <!-- 
-         // COinS, for Zotero among others. 
-         // This document_partial_name(@document) business is not quite right,
-         // but has been there for a while. 
-    -->
-    <span class="Z3988" title="<%= @document.export_as_openurl_ctx_kev(document_partial_name(@document)) %>"></span>
-  <% end %>
-
+<div id="content" class="<%= show_content_classes %>">
+  <%= render_document_main_content_partial %>
 </div>
 
-<div id="sidebar" class="col-md-3 col-sm-4">
+<div id="sidebar" class="<%= show_sidebar_classes %>">
    <%= render_document_sidebar_partial %>
 </div>

data/lib/blacklight/abstract_repository.rb

@@ -16,10 +16,9 @@ module Blacklight
       @connection ||= build_connection
     end
 
-
     protected
       def connection_config
-        @connection_config ||= Blacklight.connection_config
+        blacklight_config.connection_config
       end
 
       def logger

data/lib/blacklight/configuration.rb

@@ -76,6 +76,8 @@ module Blacklight
           document_model: nil,
           # document presenter class used by helpers and views
           document_presenter_class: nil,
+          # repository connection configuration
+          connection_config: nil,
           ##
           # == Blacklight view configuration
           ##
@@ -211,6 +213,10 @@ module Blacklight
       super || Blacklight::SolrRepository
     end
 
+    def connection_config
+      super || Blacklight.connection_config
+    end
+
     def search_builder_class
       super || locate_search_builder_class
     end

data/lib/blacklight/request_builders.rb

@@ -90,7 +90,7 @@ module Blacklight
     # @param [Hash] extra_params an optional hash of parameters that should be
     #                            added to the query post processing
     def build_solr_query(user_params, processor_chain, extra_params=nil)
-      search_builder(processor_chain).with(user_params).query(extra_params)
+      search_builder(processor_chain).with(user_params).merge(extra_params)
     end
     deprecation_deprecate build_solr_query: :query
 
@@ -107,7 +107,7 @@ module Blacklight
     # Retrieve the results for a list of document ids
     # @deprecated
     def solr_documents_by_field_values_params(field, values)
-      search_builder([:add_query_to_solr]).with(q: { field => values}).query(fl: '*')
+      search_builder([:add_query_to_solr]).with(q: { field => values}).merge(fl: '*')
     end
     deprecation_deprecate :solr_documents_by_field_values_params
 

data/lib/blacklight/search_builder.rb

@@ -19,11 +19,14 @@ module Blacklight
 
       @scope = scope
       @blacklight_params = {}
+      @merged_params = {}
+      @reverse_merged_params = {}
     end
 
     ##
     # Set the parameters to pass through the processor chain
     def with blacklight_params = {}
+      params_will_change!
       @blacklight_params = blacklight_params.dup
       self
     end
@@ -31,6 +34,7 @@ module Blacklight
     ##
     # Update the :q (query) parameter
     def where conditions
+      params_will_change!
       @blacklight_params[:q] = conditions
       self
     end
@@ -38,16 +42,63 @@ module Blacklight
     ##
     # Append additional processor chain directives
     def append *addl_processor_chain
-      self.class.new(processor_chain + addl_processor_chain, scope).with(blacklight_params)
+      params_will_change!
+      builder = self.class.new(processor_chain + addl_processor_chain, scope)
+          .with(blacklight_params)
+          .merge(@merged_params)
+          .reverse_merge(@reverse_merged_params)
+
+      builder.start(@start) if @start
+      builder.rows(@rows) if @rows
+      builder.page(@page) if @page
+
+      builder
     end
 
+    ##
+    # Merge additional, repository-specific parameters
+    def merge extra_params, &block
+      if extra_params
+        params_will_change!
+        @merged_params.merge!(extra_params.to_hash, &block)
+      end
+      self
+    end
+    
+    ##
+    # "Reverse merge" additional, repository-specific parameters
+    def reverse_merge extra_params, &block
+      if extra_params
+        params_will_change!
+        @reverse_merged_params.reverse_merge!(extra_params.to_hash, &block)
+      end
+      self
+    end
+
+    delegate :[], :key?, to: :to_hash
+
     # a solr query method
     # @param [Hash,HashWithIndifferentAccess] extra_controller_params (nil) extra parameters to add to the search
     # @return [Blacklight::SolrResponse] the solr response object
-    def query(extra_params = nil)
-      extra_params ? processed_parameters.merge(extra_params) : processed_parameters
+    def to_hash method_extra_params = nil
+      unless method_extra_params.nil?
+        Deprecation.warn(Blacklight::SearchBuilder, "Calling SearchBuilder#query with extra parameters is deprecated. Use #merge(Hash) instead")
+        merge(method_extra_params)
+      end
+
+      if params_need_update?
+        @params = processed_parameters.
+                    reverse_merge(@reverse_merged_params).
+                    merge(@merged_params).
+                    tap { self.clear_changes }
+      else
+        @params
+      end
     end
 
+    alias_method :query, :to_hash
+    alias_method :to_h, :to_hash
+
     # @returns a params hash for searching solr.
     # The CatalogController #index action uses this.
     # Solr parameters can come from a number of places. From lowest
@@ -82,6 +133,7 @@ module Blacklight
 
     def start start = nil
       if start
+        params_will_change!
         @start = start.to_i
         self
       else
@@ -96,6 +148,7 @@ module Blacklight
 
     def page page = nil
       if page
+        params_will_change!
         @page = page.to_i
         @page = 1 if @page < 1
         self
@@ -114,6 +167,7 @@ module Blacklight
 
     def rows rows = nil
       if rows
+        params_will_change!
         @rows = rows.to_i
         @rows = blacklight_config.max_per_page if @rows > blacklight_config.max_per_page
         self
@@ -135,11 +189,6 @@ module Blacklight
 
     alias_method :per, :rows
 
-    protected
-    def request
-      Blacklight::Solr::Request.new
-    end
-
     def sort
       field = if blacklight_params[:sort].blank? and sort_field = blacklight_config.default_sort_field
         # no sort param provided, use default
@@ -158,7 +207,12 @@ module Blacklight
     def search_field
       blacklight_config.search_fields[blacklight_params[:search_field]]
     end
-    
+
+    protected
+    def request
+      Blacklight::Solr::Request.new
+    end
+
     def should_add_field_to_request? field_name, field
       field.include_in_request || (field.include_in_request.nil? && blacklight_config.add_field_configuration_to_solr_request)
     end
@@ -166,5 +220,21 @@ module Blacklight
     def scope
       @scope
     end
+
+    def params_will_change!
+      @dirty = true
+    end
+
+    def params_changed?
+      !!@dirty
+    end
+
+    def params_need_update?
+      params_changed? || @params.nil?
+    end
+
+    def clear_changes
+      @dirty = false
+    end
   end
 end

data/lib/blacklight/search_helper.rb

@@ -78,7 +78,7 @@ module Blacklight::SearchHelper
   # Returns a two-element array (aka duple) with first the solr response object,
   # and second an array of SolrDocuments representing the response.docs
   def get_search_results(user_params = params || {}, extra_controller_params = {})
-    query = search_builder.with(user_params).query(extra_controller_params)
+    query = search_builder.with(user_params).merge(extra_controller_params)
     response = repository.search(query)
 
     case
@@ -102,7 +102,7 @@ module Blacklight::SearchHelper
     builder.page(user_params[:page]) if user_params[:page]
     builder.rows(user_params[:per_page] || user_params[:rows]) if user_params[:per_page] or user_params[:rows]
 
-    response = repository.search(builder.query)
+    response = repository.search(builder)
 
     case
     when (response.grouped? && grouped_key_for_results)
@@ -119,7 +119,7 @@ module Blacklight::SearchHelper
   # @param [Hash,HashWithIndifferentAccess] extra_controller_params ({}) extra parameters to add to the search
   # @return [Blacklight::SolrResponse] the solr response object
   def query_solr(user_params = params || {}, extra_controller_params = {})
-    query = search_builder.with(user_params).query(extra_controller_params)
+    query = search_builder.with(user_params).merge(extra_controller_params)
     repository.search(query)
   end
   deprecation_deprecate :query_solr
@@ -145,7 +145,7 @@ module Blacklight::SearchHelper
   # @return [Blacklight::SolrResponse, Array<Blacklight::SolrDocument>] the solr response object and a list of solr documents
   def get_solr_response_for_field_values(field, values, extra_controller_params = {})
     query = Deprecation.silence(Blacklight::RequestBuilders) do
-      search_builder.with(params).query(extra_controller_params.merge(solr_documents_by_field_values_params(field, values)))
+      search_builder.with(params).merge(extra_controller_params).merge(solr_documents_by_field_values_params(field, values))
     end
 
     solr_response = repository.search(query)
@@ -159,7 +159,7 @@ module Blacklight::SearchHelper
   # Get the solr response when retrieving only a single facet field
   # @return [Blacklight::SolrResponse] the solr response
   def get_facet_field_response(facet_field, user_params = params || {}, extra_controller_params = {})
-    query = search_builder.with(user_params).query(extra_controller_params.merge(solr_facet_params(facet_field, user_params, extra_controller_params)))
+    query = search_builder.with(user_params).merge(extra_controller_params).merge(solr_facet_params(facet_field, user_params, extra_controller_params))
     repository.search(query)
   end
 
@@ -191,7 +191,7 @@ module Blacklight::SearchHelper
   # the Blacklight app-level request params that define the search.
   # @return [Blacklight::SolrDocument, nil] the found document or nil if not found
   def get_single_doc_via_search(index, request_params)
-    query = search_builder.with(request_params).start(index - 1).rows(1).query(fl: "*")
+    query = search_builder.with(request_params).start(index - 1).rows(1).merge(fl: "*")
     response = repository.search(query)
     response.documents.first
   end
@@ -202,7 +202,7 @@ module Blacklight::SearchHelper
   def get_previous_and_next_documents_for_search(index, request_params, extra_controller_params={})
     p = previous_and_next_document_params(index)
 
-    query = search_builder.with(request_params).start(p.delete(:start)).rows(p.delete(:rows)).query(extra_controller_params.merge(p))
+    query = search_builder.with(request_params).start(p.delete(:start)).rows(p.delete(:rows)).merge(extra_controller_params).merge(p)
     response = repository.search(query)
 
     document_list = response.documents
@@ -223,7 +223,7 @@ module Blacklight::SearchHelper
   def get_opensearch_response(field=nil, request_params = params || {}, extra_controller_params={})
     field ||= blacklight_config.view_config('opensearch').title_field
 
-    query = search_builder.with(request_params).query(solr_opensearch_params(field).merge(extra_controller_params))
+    query = search_builder.with(request_params).merge(solr_opensearch_params(field)).merge(extra_controller_params)
     response = repository.search(query)
 
     [response.params[:q], response.documents.flat_map {|doc| doc[field] }.uniq]
@@ -273,7 +273,8 @@ module Blacklight::SearchHelper
       query = search_builder.
                 with(user_params).
                 where(blacklight_config.document_model.unique_key => ids).
-                query(extra_controller_params.merge(fl: '*'))
+                merge(extra_controller_params).
+                merge(fl: '*')
       solr_response = repository.search(query)
 
       [solr_response, solr_response.documents]

data/lib/blacklight/solr_repository.rb

@@ -12,8 +12,8 @@ module Blacklight
     # @param [String] document's unique key value
     # @param [Hash] additional solr query parameters
     def find id, params = {}
-      doc_params = params.reverse_merge(qt: blacklight_config.document_solr_request_handler)
-                         .reverse_merge(blacklight_config.default_document_solr_params)
+      doc_params = params.reverse_merge(blacklight_config.default_document_solr_params)
+                         .reverse_merge(qt: blacklight_config.document_solr_request_handler)
                          .merge(blacklight_config.document_unique_id_param => id)
 
       solr_response = send_and_receive blacklight_config.document_solr_path || blacklight_config.solr_path, doc_params

data/lib/blacklight/utils.rb

@@ -26,7 +26,7 @@ module Blacklight
   ##
   # An OpenStruct that responds to common Hash methods
   class OpenStructWithHashAccess < OpenStruct
-    delegate :keys, :each, :map, :has_key?, :empty?, :delete, :length, :reject!, :select!, :include, :fetch, :to_json, :as_json, :to => :to_h
+    delegate :keys, :each, :map, :has_key?, :key?, :include?, :empty?, :length, :delete, :delete_if, :keep_if, :clear, :reject!, :select!, :replace, :fetch, :to_json, :as_json, to: :to_h
 
     if ::RUBY_VERSION < '2.0'
       def []=(key, value)
@@ -53,6 +53,15 @@ module Blacklight
       self.class.new to_h.select(*args, &block)
     end
 
+    def sort_by *args, &block
+      self.class.new Hash[to_h.sort_by(*args, &block)]
+    end
+
+    def sort_by! *args, &block
+      replace Hash[to_h.sort_by(*args, &block)]
+      self
+    end
+
     ##
     # Merge the values of this OpenStruct with another OpenStruct or Hash
     # @param [Hash,#to_h]

data/spec/helpers/blacklight_helper_spec.rb

@@ -539,4 +539,37 @@ describe BlacklightHelper do
       expect(helper.presenter_class).to eq Blacklight::DocumentPresenter
     end
   end
+
+  describe "#render_document_heading" do
+    before do
+      allow(helper).to receive(:presenter).and_return(double(document_heading: "Heading"))
+    end
+
+    let(:document) { double }
+
+    it "should accept no arguments and render the document heading" do
+      expect(helper.render_document_heading).to have_selector "h4", text: "Heading"
+    end
+    
+    it "should accept a tag name and render the document heading" do
+      Deprecation.silence(Blacklight::BlacklightHelperBehavior) do
+        expect(helper.render_document_heading(:h3)).to have_selector "h3", text: "Heading"
+        expect(helper.render_document_heading("h2")).to have_selector "h2", text: "Heading"
+      end
+    end
+
+    it "should accept the tag name as an option" do
+      expect(helper.render_document_heading tag: "h1").to have_selector "h1", text: "Heading"
+    end
+
+    it "should accept an explicit document argument" do
+      allow(helper).to receive(:presenter).with(document).and_return(double(document_heading: "Document Heading"))
+      expect(helper.render_document_heading(document)).to have_selector "h4", text: "Document Heading"
+    end
+    
+    it "should accept the document with a tag option" do
+      allow(helper).to receive(:presenter).with(document).and_return(double(document_heading: "Document Heading"))
+      expect(helper.render_document_heading(document, tag: "h3")).to have_selector "h3", text: "Document Heading"
+    end
+  end
 end

data/spec/helpers/layout_helper_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe LayoutHelper do
+  describe '#show_content_classes' do
+    it 'returns a string of classes' do
+      expect(helper.show_content_classes).to be_an String
+      expect(helper.show_content_classes).to eq 'col-md-9 col-sm-8 show-document'
+    end
+  end
+
+  describe '#show_sidebar_classes' do
+    it 'returns a string of classes' do
+      expect(helper.show_sidebar_classes).to be_an String
+      expect(helper.show_sidebar_classes).to eq 'col-md-3 col-sm-4'
+    end
+  end
+
+  describe '#main_content_classes' do
+    it 'returns a string of classes' do
+      expect(helper.main_content_classes).to be_an String
+      expect(helper.main_content_classes).to eq 'col-md-9 col-sm-8'
+    end
+  end
+
+  describe '#sidebar_classes' do
+    it 'returns a string of classes' do
+      expect(helper.sidebar_classes).to be_an String
+      expect(helper.sidebar_classes).to eq 'col-md-3 col-sm-4'
+    end
+  end
+end

data/spec/lib/blacklight/configuration_spec.rb

@@ -48,6 +48,18 @@ describe "Blacklight::Configuration" do
       expect(@config.search_fields).to be_a_kind_of ActiveSupport::OrderedHash
       expect(@config.sort_fields).to be_a_kind_of ActiveSupport::OrderedHash
     end
+
+  end
+
+  describe "#connection_config" do
+    let(:custom_config) { double }
+    it "should have the global blacklight configuration" do
+      expect(@config.connection_config).to eq Blacklight.connection_config
+    end
+    it "should be overridable with custom configuration" do
+      @config.connection_config = custom_config
+      expect(@config.connection_config).to eq custom_config
+    end
   end
 
   describe "config.index.respond_to" do

data/spec/lib/blacklight/search_builder_spec.rb

@@ -47,10 +47,51 @@ describe Blacklight::SearchBuilder do
     end
   end
 
-  describe "#query" do
+  describe "#to_hash" do
     it "should append the extra parameters to the result" do
-      actual = subject.query({a: 1})
-      expect(actual).to include a: 1
+      Deprecation.silence(Blacklight::SearchBuilder) do
+        actual = subject.to_hash({a: 1})
+        expect(actual).to include a: 1
+      end
+    end
+
+    it "should update if data is changed" do
+      subject.merge(q: 'xyz')
+      expect(subject.to_hash).to include q: 'xyz'
+      subject.merge(q: 'abc')
+      expect(subject.to_hash).to include q: 'abc'
+    end
+  end
+
+  describe "#merge" do
+    let(:processor_chain) { [:pass_through] }
+    before do
+      allow(subject).to receive(:pass_through) do |req_params|
+        req_params.replace subject.blacklight_params
+      end
+    end
+    it "should overwrite the processed parameters" do
+      actual = subject.with(q: 'abc').merge(q: 'xyz')
+      expect(actual[:q]).to eq 'xyz'
+    end
+  end
+  
+  describe "#reverse_merge" do
+    let(:processor_chain) { [:pass_through] }
+    before do
+      allow(subject).to receive(:pass_through) do |req_params|
+        req_params.replace subject.blacklight_params
+      end
+    end
+
+    it "should provide default values for parameters" do
+      actual = subject.reverse_merge(a: 1)
+      expect(actual[:a]).to eq 1
+    end
+
+    it "should not overwrite the processed parameters" do
+      actual = subject.with(q: 'abc').reverse_merge(q: 'xyz')
+      expect(actual[:q]).to eq 'abc'
     end
   end
 
@@ -152,4 +193,51 @@ describe Blacklight::SearchBuilder do
       expect(subject.with(search_field: 'x').send(:search_field)).to eq blacklight_config.search_fields['x']
     end
   end
+
+  describe "#params_changed?" do
+    it "should be false" do
+      expect(subject.send(:params_changed?)).to eq false
+    end
+
+    it "should be marked as changed when with() changes" do
+      subject.with(a: 1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when where() changes" do
+      subject.where(a: 1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when the processor chain changes" do
+      subject.append(:a)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when merged parameters are added" do
+      subject.merge(a: 1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when reverse merged parameters are added" do
+      subject.merge(a: 1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when pagination changes" do
+      subject.page(1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when rows changes" do
+      subject.rows(1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+    it "should be marked as changed when start offset changes" do
+      subject.start(1)
+      expect(subject.send(:params_changed?)).to eq true
+    end
+
+  end
 end

data/spec/lib/blacklight/solr_repository_spec.rb

@@ -42,6 +42,13 @@ describe Blacklight::SolrRepository do
       allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
       expect(subject.find("123", {qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
     end
+    
+    it "should use the :qt parameter from the default_document_solr_params" do
+      blacklight_config.default_document_solr_params[:qt] = 'abc'
+      blacklight_config.document_solr_request_handler = 'xyz'
+      allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
+      expect(subject.find("123")).to be_a_kind_of Blacklight::SolrResponse
+    end
 
     it "should preserve the class of the incoming params" do
       doc_params = HashWithIndifferentAccess.new

data/spec/lib/utils_spec.rb

@@ -48,6 +48,50 @@ describe 'Blacklight::Utils' do
 
     end
 
+    describe "#key?" do
+      subject do
+        h = Blacklight::OpenStructWithHashAccess.new
+        h[:a] = 1
+        h[:b] = 2
+        h
+      end
+
+      it "is true if the key exists" do
+        expect(subject.key? :a).to eq true
+      end
+      
+      it "is false if the key does not exist" do
+        expect(subject.key? :c).to eq false
+      end
+    end
+
+    describe "#replace" do
+      subject { Blacklight::OpenStructWithHashAccess.new a: 1 }
+
+      it "can use #replace to reorder the hash" do
+        subject.replace b: 1
+        expect(subject.b).to eq 1
+      end
+    end
+
+    describe "#sort_by" do
+      subject { Blacklight::OpenStructWithHashAccess.new c: 3, b:1, a: 2 }
+
+      it "should sort the underlying hash" do
+        sorted = subject.sort_by { |k,v| v }
+        expect(sorted.keys).to match_array [:b, :a, :c]
+      end
+    end
+
+    describe "#sort_by!" do
+      subject { Blacklight::OpenStructWithHashAccess.new c: 3, b:1, a: 2 }
+
+      it "should sort the underlying hash" do
+        subject.sort_by! { |k,v| v }
+        expect(subject.keys).to match_array [:b, :a, :c]
+      end
+    end
+
     describe "#merge" do
 
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.12.1
+  version: 5.13.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/helpers/blacklight/configuration_helper_behavior.rb
 - app/helpers/blacklight/facets_helper_behavior.rb
 - app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb
+- app/helpers/blacklight/layout_helper_behavior.rb
 - app/helpers/blacklight/render_constraints_helper_behavior.rb
 - app/helpers/blacklight/render_partials_helper.rb
 - app/helpers/blacklight/search_history_constraints_helper_behavior.rb
@@ -303,6 +304,7 @@ files:
 - app/helpers/component_helper.rb
 - app/helpers/facets_helper.rb
 - app/helpers/hash_as_hidden_fields_helper.rb
+- app/helpers/layout_helper.rb
 - app/helpers/render_constraints_helper.rb
 - app/helpers/search_history_constraints_helper.rb
 - app/models/bookmark.rb
@@ -350,6 +352,7 @@ files:
 - app/views/catalog/_search_sidebar.html.erb
 - app/views/catalog/_show_default.html.erb
 - app/views/catalog/_show_header_default.html.erb
+- app/views/catalog/_show_main_content.html.erb
 - app/views/catalog/_show_more_like_this.html.erb
 - app/views/catalog/_show_sidebar.html.erb
 - app/views/catalog/_show_tools.html.erb
@@ -514,6 +517,7 @@ files:
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
+- spec/helpers/layout_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
@@ -634,6 +638,7 @@ test_files:
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
+- spec/helpers/layout_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb