blacklight 5.10.3 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d8ff5b59fd2f2f4492d6a334429e34d65eecb73
-  data.tar.gz: 1c5518ceb4bbba537374113d4ba12830276dcb50
+  metadata.gz: 306445f3c792d11626c44500a5b30d974c01f5df
+  data.tar.gz: da7aa72df29cc2dd70ec8779d72928e8916d340a
 SHA512:
-  metadata.gz: 56d549c7e95d7a3bc1aef93b961e8403a9697e07562c5f76e5f16da795d9545de919fec3455b31ee1453a323a16db89486f166774ce7568b84d703b5cce3ad03
-  data.tar.gz: 51b5768632c4336d9b1242d3b3872cd97de4e8e6ecf42b7d01d3e43d052d06d515e7dba26a1d60aba9d7c61d3dfd26851298b86d9254107d7b445c788503dffe
+  metadata.gz: 01e02b3b3605264f5bb0517a6abeec089e4b2eb8d96e604572808e6f805e59dfd448cedd6c35a311d436e2753ef6cc780e0fdf4d3c64e86101a6bab38fae1173
+  data.tar.gz: b95b6dc21666c74b2ba5c6103fc555300a559340efcc5e0b9315cf5f019c8de0d098e33d72cde8bfce43a0330fbab87d226697f6530783ebbd98dc1aa79ef586

data/.travis.yml

@@ -15,8 +15,6 @@ matrix:
       env: "RAILS_VERSION=4.1.9"
     - rvm: 2.1.5
       env: "RAILS_VERSION=4.2.0"
-    - rvm: 2.1.5
-      env: "RAILS_VERSION=4.2.1"
     - rvm: jruby
       env: "RAILS_VERSION=4.2.0 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
     - rvm: 1.9.3

data/VERSION

@@ -1 +1 @@
-5.10.3
+5.11.0

data/app/assets/stylesheets/blacklight/_catalog.scss

@@ -101,7 +101,7 @@ span.constraints-label {
     border-bottom:1px dotted $table-border-color;
     @extend .clearfix;
   }
-} 
+}
 
 // Tools link on documetn show page
 .show-tools {

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -223,6 +223,10 @@ module Blacklight::CatalogHelperBehavior
     response ||= @response
     @current_bookmarks ||= current_or_guest_user.bookmarks_for_documents(response.documents).to_a
   end
+
+  def is_bookmarked? document
+    current_bookmarks.any? { |x| x.document_id == document.id and x.document_type == document.class }
+  end
   
   def render_marc_tools
     return unless defined? Blacklight::Marc
@@ -247,4 +251,5 @@ module Blacklight::CatalogHelperBehavior
   def render_librarian_view_control? config, options = {}
     respond_to? :librarian_view_catalog_path and options[:document] and options[:document].respond_to?(:to_marc)
   end
+
 end

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -29,8 +29,8 @@ module Blacklight
     # @return [String]
     def render_index_doc_actions(document, options={})
       wrapping_class = options.delete(:wrapping_class) || "index-document-functions"
-      rendered = render_filtered_partials(blacklight_config.index.document_actions, { document: document }.merge(options))
-      content_tag("div", rendered, class: wrapping_class)
+      rendered = render_filtered_partials(blacklight_config.view_config(document_index_view_type).document_actions, { document: document }.merge(options))
+      content_tag("div", rendered, class: wrapping_class) unless rendered.blank?
     end
 
     ##
@@ -42,8 +42,8 @@ module Blacklight
     # @return [String]
     def render_results_collection_tools(options = {})
       wrapping_class = options.delete(:wrapping_class) || "search-widgets"
-      rendered = render_filtered_partials(blacklight_config.index.collection_actions, options)
-      content_tag("div", rendered, class: wrapping_class)
+      rendered = render_filtered_partials(blacklight_config.view_config(document_index_view_type).collection_actions, options)
+      content_tag("div", rendered, class: wrapping_class) unless rendered.blank?
     end
 
     def render_filtered_partials(partials, options={}, &block)

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -87,11 +87,24 @@ module Blacklight::ConfigurationHelperBehavior
   # Look up the label for the facet field
   def facet_field_label field
     field_config = blacklight_config.facet_fields[field]
-    defaults = [:"blacklight.search.fields.facet.#{field}", :"blacklight.search.fields.#{field}"]
-    defaults << field_config.label if field_config
-    defaults << field.to_s.humanize
 
-    field_label *defaults
+    field_label(
+      :"blacklight.search.fields.facet.#{field}",
+      :"blacklight.search.fields.#{field}",
+      (field_config.label if field_config),
+      field.to_s.humanize
+    )
+  end
+
+  def view_label view
+    view_config = blacklight_config.view[view]
+    field_label(
+      :"blacklight.search.view_title.#{view}",
+      :"blacklight.search.view.#{view}",
+      view_config.label,
+      view_config.title,
+      view.to_s.humanize
+    )
   end
 
   ##
@@ -107,7 +120,7 @@ module Blacklight::ConfigurationHelperBehavior
   #   @param [Symbol] any number of additional keys
   #   @param [Symbol] ...
   def field_label *i18n_keys
-    first, *rest = i18n_keys.compact
+    first, *rest = i18n_keys
 
     t(first, default: rest)
   end

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -82,15 +82,10 @@ module Blacklight::UrlHelperBehavior
       return {}
     end
   
-    { :data => {:'context-href' => session_tracking_path(document, per_page: params.fetch(:per_page, search_session['per_page']), counter: counter, search_id: current_search_session.try(:id))}}
+    { :data => {:'context-href' => track_solr_document_path(document, per_page: params.fetch(:per_page, search_session['per_page']), counter: counter, search_id: current_search_session.try(:id))}}
   end
   protected :session_tracking_params
   
-  ##
-  # Get the URL for tracking search sessions across pages using polymorphic routing
-  def session_tracking_path document, params = {}
-    polymorphic_path([:track, document], params)
-  end
 
   #
   # link based helpers ->

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

@@ -1,13 +1,13 @@
 <div id="content" class="col-md-12">
-<h1><%= t('blacklight.bookmarks.title') %></h1>
+<h1 class='page-heading'><%= t('blacklight.bookmarks.title') %></h1>
 
 <%- if current_or_guest_user.blank? -%>
 
-  <h2><%= t('blacklight.bookmarks.need_login') %></h2>
+  <h2 class='section-heading'><%= t('blacklight.bookmarks.need_login') %></h2>
 
 <%- elsif @document_list.blank? -%>
 
-  <h3><%= t('blacklight.bookmarks.no_bookmarks') %></h3>
+  <h3 class='section-heading'><%= t('blacklight.bookmarks.no_bookmarks') %></h3>
 <% else %>
   <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'clear-bookmarks btn btn-danger pull-right' %>
   <%= render 'sort_and_per_page' %>

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

@@ -4,7 +4,7 @@
   # but it was simpler to leave them seperate instead of DRYing them, got confusing trying that.
   # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
   -%>
-  <% if current_bookmarks.find { |x| x.document_id == document.id and x.document_type == document.class }.blank? %>
+  <% unless is_bookmarked? document %>
 
       <%= form_tag( bookmark_path( document ), :method => :put, :class => "bookmark_toggle", "data-doc-id" => document.id, :'data-present' => t('blacklight.search.bookmarks.present'), :'data-absent' => t('blacklight.search.bookmarks.absent'), :'data-inprogress' => t('blacklight.search.bookmarks.inprogress')) do %>
         <%= submit_tag(t('blacklight.bookmarks.add.button'), :id => "bookmark_toggle_#{document.id.to_s.parameterize}", :class => "bookmark_add") %>

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

@@ -1,4 +1,4 @@
-<% # container for all documents in index view -%>
-<div id="documents">
+<% # container for all documents in index list view -%>
+<div id="documents" class="documents-<%= document_index_view_type %>">
   <%= render documents, :as => :document %>
 </div>

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

@@ -1,6 +1,7 @@
 <div class="panel panel-default facet_limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.key) %>">
   <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
-    <h5 class="panel-title">
+    <h5 class="panel-title facet-field-heading">
+
       <%= link_to facet_field_label(facet_field.key), "#", :"data-no-turbolink" => true %>
     </h5>
   </div>

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

@@ -10,7 +10,8 @@
       <span class="icon-bar"></span>
     </button>
 
-  <h4>
+  <h4 class='facets-heading'>
+
   	<%= t('blacklight.search.facets.title') %>
   </h4>
     </div>

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

@@ -1,5 +1,5 @@
 <div class="page-header row">
-  <h1 class="col-md-8"><%= t('blacklight.welcome') %></h1>
+  <h1 class="col-md-8 page-heading"><%= t('blacklight.welcome') %></h1>
   
   <ul class="nav nav-pills col-md-4">
     <li><a href="https://github.com/projectblacklight/blacklight/">Github</a></li>
@@ -11,7 +11,7 @@
 </div>
 
 <div id="getting-started">
-  <h2>Here&rsquo;s how to get started:</h2>
+  <h2 class='section-heading'>Here&rsquo;s how to get started:</h2>
   
   <ol>
     <li>To modify this text, you need to <a href="http://guides.rubyonrails.org/engines.html#improving-engine-functionality">override the Blacklight-provided view</a>.
@@ -28,7 +28,7 @@ to your own application: <br />
 
 <%# This is the same panel shown in the Rails welcome template %>
 <div id="about">
-  <h3><a href="/rails/info/properties">About your application&rsquo;s environment</a></h3>
+  <h3 class='section-heading'><a href="/rails/info/properties">About your application&rsquo;s environment</a></h3>
   <div id="about-content" class="well" style="display: none"></div>
 </div>
 

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

@@ -1,19 +1,22 @@
+<%# header bar for doc items in index view -%>
+<div class="documentHeader row">
+  <%# main title container for doc partial view
+      How many bootstrap columns need to be reserved
+      for bookmarks control depends on size.
+  -%>
+  <% document_actions = capture do %>
+    <% # bookmark functions for items/docs -%>
+    <%= render_index_doc_actions document, wrapping_class: "index-document-functions col-sm-3 col-lg-2" %>
+  <% end %>
 
-      <% # header bar for doc items in index view -%>
-      <div class="documentHeader row">
+  <h5 class="index_title document-title-heading <%= document_actions.present? ? "col-sm-9 col-lg-10" : "col-md-12" %>">
+    <% if counter = document_counter_with_offset(document_counter) %>
+      <span class="document-counter">
+        <%= t('blacklight.search.documents.counter', counter: counter) %>
+      </span>
+    <% end %>
+    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+  </h5>
 
-        <%# main title container for doc partial view
-            How many bootstrap columns need to be reserved
-            for bookmarks control depends on size.
-        -%>
-         <h5 class="index_title col-sm-9 col-lg-10">
-         <% counter = document_counter_with_offset(document_counter) %>
-         <span class="document-counter">
-         <%= t('blacklight.search.documents.counter', :counter => counter) if counter %>
-         </span>
-         <%= link_to_document document, document_show_link_field(document), :counter => counter %>
-        </h5>
-
-        <% # bookmark functions for items/docs -%>
-        <%= render_index_doc_actions document, :wrapping_class => "index-document-functions col-sm-3 col-lg-2" %>
-      </div>
+  <%= document_actions %>
+</div>

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

@@ -19,7 +19,7 @@
 
     </div>
     <% @documents.each do |doc| %>
-       <%=hidden_field_tag "id[]", doc.id %>
+       <%=hidden_field_tag "id[]", doc.get(:id)%>
     <% end %>
 </div>
 <div class="modal-footer">

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

@@ -3,9 +3,9 @@
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <%  document_index_views.each do |view, config| %>
-    <%= link_to url_for(params.merge(:view => view)), :title => t(:"blacklight.search.view_title.#{view}", default: [:"blacklight.search.view.#{view}", blacklight_config.view[view].title || view.to_s]), :class => "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
-      <%= render_view_type_group_icon view %>
-        <span class="caption"><%= t(:"blacklight.search.view.#{view}", default: blacklight_config.view[view].title || view.to_s) %></span>
+      <%= link_to url_for(params.merge(view: view)), title: view_label(view), class: "btn btn-default view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+        <%= render_view_type_group_icon view %>
+        <span class="caption"><%= view_label(view) %></span>
       <% end %>
     <% end %>
   </div>

data/app/views/layouts/blacklight.html.erb

@@ -36,6 +36,8 @@
   <%= render partial: 'shared/ajax_modal' %>
 
   <div id="main-container" class="container">
+    <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
+
     <%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %>
 
     <div class="row">

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

@@ -1,20 +1,22 @@
 <div id="content" class="col-md-9">
-<h1><%= t('blacklight.saved_searches.title') %></h1>
+
+<h1 class='page-heading'><%= t('blacklight.saved_searches.title') %></h1>
 
 <%- if current_or_guest_user.blank? -%>
   
-  <h2><%= t('blacklight.saved_searches.need_login') %></h2>
+  <h2 class='section-heading'><%= t('blacklight.saved_searches.need_login') %></h2>
   
 <%- elsif @searches.blank? -%>
   
-  <h2><%= t('blacklight.saved_searches.no_searches') %></h2>
+  <h2 class='section-heading'><%= t('blacklight.saved_searches.no_searches') %></h2>
   
 <%- else -%>
   <p>
   <%= link_to t('blacklight.saved_searches.clear.action_title'), clear_saved_searches_path, :method => :delete, :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>
   </p>
 
-  <h2><%= t('blacklight.saved_searches.list_title') %></h2>
+  <h2 class='section-heading'><%= t('blacklight.saved_searches.list_title') %></h2>
+
   <table class="table table-striped">
   <%- @searches.each do |search| -%>
     <tr>

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

@@ -1,10 +1,10 @@
 <div id="content" class="col-md-12">
-<h1><%=t('blacklight.search_history.title')%></h1>
+<h1 class='page-heading'><%=t('blacklight.search_history.title')%></h1>
 <%- if @searches.blank? -%>
-  <h2><%=t('blacklight.search_history.no_history')%></h2>
+  <h2 class='section-heading'><%=t('blacklight.search_history.no_history')%></h2>
 <%- else -%>
     <%= link_to t('blacklight.search_history.clear.action_title'), clear_search_history_path, :method => :delete, :data => { :confirm => t('blacklight.search_history.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
-  <h3><%=t('blacklight.search_history.recent')%></h3>
+  <h3 class='section-heading'><%=t('blacklight.search_history.recent')%></h3>
   <table class="table table-striped search_history">
     <%-  @searches.each_with_index do |search,index| -%>
     <%= content_tag :tr, :id => "document_#{index + 1}" do %>

data/lib/blacklight/configuration/facet_field.rb

@@ -5,7 +5,7 @@ module Blacklight
 
       self.collapse = true if self.collapse.nil?
       self.show = true if self.show.nil?
-      self.if = self.show if self.if.nil?
+      self.if ||= self.show
 
       super
       

data/lib/blacklight/configuration/search_field.rb

@@ -1,7 +1,7 @@
 module Blacklight
   class Configuration::SearchField < Blacklight::Configuration::Field
     def normalize! blacklight_config = nil
-      self.if = self.include_in_simple_select if self.if.nil?
+      self.if ||= self.include_in_simple_select
 
       super
       self.qt ||= blacklight_config.default_solr_params[:qt] if blacklight_config && blacklight_config.default_solr_params

data/lib/blacklight/document.rb

@@ -31,7 +31,7 @@ module Blacklight::Document
     include Blacklight::Document::Extensions
   end    
 
-  attr_reader :response, :_source
+  attr_reader :response
   alias_method :solr_response, :response
 
   def initialize(source_doc={}, response=nil)
@@ -52,23 +52,11 @@ module Blacklight::Document
   # If a method is missing, it gets sent to @_source
   # with all of the original params and block
   def method_missing(m, *args, &b)
-    if _source and _source.respond_to? m
-      _source.send(m, *args, &b)
-    else
-      super
-    end
-  end
-
-  def respond_to_missing? *args
-    (_source && _source.respond_to?(*args)) || super
+    @_source.send(m, *args, &b)
   end
 
   def [] *args
-    _source.send :[], *args
-  end
-
-  def _read_attribute(attr)
-    self[attr]
+    @_source.send :[], *args
   end
 
   # Helper method to check if value/multi-values exist for a given key.
@@ -93,7 +81,7 @@ module Blacklight::Document
   end
 
   def key? k
-    _source.key? k
+    @_source.key? k
   end
 
   # helper
@@ -124,7 +112,7 @@ module Blacklight::Document
   end
 
   def as_json(options = nil)
-    _source.as_json(options)
+    @_source.as_json(options)
   end
 
   def to_partial_path
@@ -147,12 +135,6 @@ module Blacklight::Document
     nil
   end
 
-  ##
-  # Implementations that support More-Like-This should override this method
-  # to return an array of documents that are like this one.
-  def more_like_this
-    []
-  end
 
   # Certain class-level methods needed for the document-specific
   # extendability architecture
@@ -171,4 +153,4 @@ module Blacklight::Document
       self
     end  
   end
-end
+end

data/lib/blacklight/document_presenter.rb

@@ -155,9 +155,11 @@ module Blacklight
               result.send(method)
             end
           end
-        else
+        when field_config
           # regular solr
-          @document.get(field, :sep => nil) if field
+          @document.get(field_config.field, sep: nil)
+        when field
+          @document.get(field, sep: nil)
       end
 
       # rendering values

data/lib/blacklight/facet.rb

@@ -22,7 +22,7 @@ module Blacklight
     def facet_configuration_for_field(field)
       f = blacklight_config.facet_fields[field]
       f ||= begin
-        _, value = blacklight_config.facet_fields.find { |k,v| v.field == field }
+        _, value = blacklight_config.facet_fields.find { |k,v| v.field.to_s == field.to_s }
         value
       end
       f ||= Blacklight::Configuration::FacetField.new(:field => field).normalize!
@@ -30,29 +30,29 @@ module Blacklight
 
 
     # Get a FacetField object from the @response
-    def facet_by_field_name field
-      case field
+    def facet_by_field_name field_or_field_name
+      case field_or_field_name
         when String, Symbol
-          extract_facet_by_field_name(field)
+          facet_field = facet_configuration_for_field(field_or_field_name)
+          extract_facet_by_field(facet_field)
         when Blacklight::Configuration::FacetField
-          extract_facet_by_field_name(field.key)
+          extract_facet_by_field(field_or_field_name)
         else
-          field
+          field_or_field_name
         end
     end
 
     private
 
     # Get the solr response for the field :field
-    def extract_facet_by_field_name field_name
-      facet_field = facet_configuration_for_field(field_name)
+    def extract_facet_by_field facet_field
       case 
         when (facet_field.respond_to?(:query) and facet_field.query)
-          create_facet_field_response_for_query_facet_field field_name, facet_field 
+          create_facet_field_response_for_query_facet_field facet_field.key, facet_field
         when (facet_field.respond_to?(:pivot) and facet_field.pivot)
-          create_facet_field_response_for_pivot_facet_field field_name, facet_field   
+          create_facet_field_response_for_pivot_facet_field facet_field.key, facet_field
         else
-          @response.facet_by_field_name(field_name)
+          @response.facet_by_field_name(facet_field.field)
       end
     end
 

data/lib/blacklight/search_builder.rb

@@ -3,12 +3,20 @@ module Blacklight
     extend Deprecation
     self.deprecation_horizon = "blacklight 6.0"
 
+    class_attribute :default_processor_chain
+    self.default_processor_chain = []
+
     attr_reader :processor_chain, :blacklight_params
 
-    # @param [List<Symbol>] processor_chain a list of filter methods to run
+    # @param [List<Symbol>,TrueClass] processor_chain a list of filter methods to run or true, to use the default methods
     # @param [Object] scope the scope where the filter methods reside in.
     def initialize(processor_chain, scope)
-      @processor_chain = processor_chain
+      @processor_chain = if processor_chain === true
+        default_processor_chain.dup
+      else
+        processor_chain
+      end
+
       @scope = scope
       @blacklight_params = {}
     end
@@ -56,8 +64,8 @@ module Blacklight
     #
     # Incoming parameter :f is mapped to :fq solr parameter.
     def processed_parameters
-      Blacklight::Solr::Request.new.tap do |request_parameters|
-        @processor_chain.each do |method_name|
+      request.tap do |request_parameters|
+        processor_chain.each do |method_name|
           if scope.respond_to?(method_name, true)
             Deprecation.warn Blacklight::SearchBuilder, "Building search parameters by calling #{method_name} on #{scope.class}. This behavior will be deprecated in Blacklight 6.0. Instead, define #{method_name} on a subclass of #{self.class} and set search_builder_class in the configuration"
             scope.send(method_name, request_parameters, blacklight_params)
@@ -73,6 +81,10 @@ module Blacklight
     end
 
     protected
+    def request
+      Blacklight::Solr::Request.new
+    end
+
     def page
       if blacklight_params[:page].blank?
         1
@@ -121,10 +133,8 @@ module Blacklight
       field.include_in_request || (field.include_in_request.nil? && blacklight_config.add_field_configuration_to_solr_request)
     end
 
-    protected
     def scope
       @scope
     end
-
   end
 end

data/lib/blacklight/solr/search_builder.rb

@@ -1,6 +1,8 @@
 module Blacklight::Solr
   class SearchBuilder < Blacklight::SearchBuilder
-    
+
+    self.default_processor_chain = [:default_solr_parameters, :add_query_to_solr, :add_facet_fq_to_solr, :add_facetting_to_solr, :add_solr_fields_to_query, :add_paging_to_solr, :add_sorting_to_solr, :add_group_config_to_solr ]
+
     ####
     # Start with general defaults from BL config. Need to use custom
     # merge to dup values, to avoid later mutating the original by mistake.

data/spec/helpers/blacklight_helper_spec.rb

@@ -144,6 +144,17 @@ describe BlacklightHelper do
         response = helper.render_index_doc_actions(document)
         expect(response).to have_selector(".bookmark_toggle")
       end
+
+      it "should be nil if no partials are renderable" do
+        allow(helper).to receive(:render_bookmarks_control?).and_return(false)
+        expect(helper.render_index_doc_actions(document)).to be_blank
+      end
+
+      it "should render view type specific actions" do
+        allow(helper).to receive(:document_index_view_type).and_return(:custom)
+        config.view.custom.document_actions = []
+        expect(helper.render_index_doc_actions(document)).to be_blank
+      end
     end
 
     describe "render_show_doc_actions" do
@@ -608,7 +619,7 @@ describe BlacklightHelper do
 
     it "should ignore missing templates" do
       response = helper.render_document_index_with_view :view_type, [obj1, obj1]
-      expect(response).to match /<div id="documents">/
+      expect(response).to have_selector "div#documents"
     end
   end
 

data/spec/helpers/catalog_helper_spec.rb

@@ -305,4 +305,22 @@ describe CatalogHelper do
     end
   end
 
+  describe "#is_bookmarked?" do
+
+    let(:bookmark) { Bookmark.new document: bookmarked_document }
+    let(:bookmarked_document) { SolrDocument.new(id: 'a') }
+
+    before do
+      allow(helper).to receive(:current_bookmarks).and_return([bookmark])
+    end
+
+    it "should be bookmarked if the document is in the bookmarks" do
+      expect(helper.is_bookmarked?(bookmarked_document)).to eq true
+    end
+
+    it "should not be bookmarked if the document is not listed in the bookmarks" do
+      expect(helper.is_bookmarked?(SolrDocument.new(id: 'b'))).to eq false
+    end
+  end
+
 end

data/spec/helpers/configuration_helper_spec.rb

@@ -137,6 +137,15 @@ describe BlacklightConfigurationHelper do
     end
   end
 
+  describe "#view_label" do
+    it "should look up the label to display for the view" do
+      allow(blacklight_config).to receive(:view).and_return({ "my_view" => double(label: "some label", title: nil) })
+      allow(helper).to receive(:field_label).with(:"blacklight.search.view_title.my_view", :"blacklight.search.view.my_view", "some label", nil, "My view")
+
+      helper.view_label "my_view"
+    end
+  end
+
   describe "#field_label" do
     it "should look up the label as an i18n string" do
       allow(helper).to receive(:t).with(:some_key, default: []).and_return "my label"
@@ -150,13 +159,6 @@ describe BlacklightConfigurationHelper do
 
       label = helper.field_label :key_a, :key_b, "default text"
     end
-
-    it "should compact nil keys (fixes rails/rails#19419)" do
-      allow(helper).to receive(:t).with(:key_a, default: [:key_b])
-
-      label = helper.field_label :key_a, nil, :key_b
-
-    end
   end
   
   describe "#default_per_page" do

data/spec/helpers/facets_helper_spec.rb

@@ -107,7 +107,7 @@ describe FacetsHelper do
 
   describe "facet_by_field_name" do
     it "should retrieve the facet from the response given a string" do
-      facet_config = double(:query => nil)
+      facet_config = double(:query => nil, field: 'a')
       facet_field = double()
       allow(helper).to receive(:facet_configuration_for_field).with(anything()).and_return(facet_config)
 
@@ -118,7 +118,7 @@ describe FacetsHelper do
     end
 
     it "should also work for facet query fields" do
-      facet_config = double(:query => {})
+      facet_config = double(:query => {}, key: 'a_query_facet_field')
       allow(helper).to receive(:facet_configuration_for_field).with('a_query_facet_field').and_return(facet_config)
       allow(helper).to receive(:create_facet_field_response_for_query_facet_field).with('a_query_facet_field', facet_config)
 
@@ -128,6 +128,7 @@ describe FacetsHelper do
     describe "query facets" do
       let(:facet_config) { 
         double(
+          key: 'my_query_facet_field',
           :query => {
              'a_simple_query' => { :fq => 'field:search', :label => 'A Human Readable label'},
              'another_query' => { :fq => 'field:different_search', :label => 'Label'},
@@ -165,7 +166,7 @@ describe FacetsHelper do
 
     describe "pivot facets" do
       let(:facet_config) {
-        double(:pivot => ['field_a', 'field_b'])
+        double(key: 'my_pivot_facet_field', pivot: ['field_a', 'field_b'])
       }
 
       before(:each) do 

data/spec/helpers/url_helper_spec.rb

@@ -449,15 +449,4 @@ describe BlacklightUrlHelper do
       expect(url).to eq helper.bookmarks_url(format: :html, encrypted_user_id: 'xyz')
     end
   end
-
-  describe "#session_tracking_path" do
-    let(:document) { SolrDocument.new(id: 1) }
-    it "should determine the correct route for the document class" do
-      expect(helper.session_tracking_path(document)).to eq helper.track_solr_document_path(document)
-    end
-
-    it "should pass through tracking parameters" do
-      expect(helper.session_tracking_path(document, x: 1)).to eq helper.track_solr_document_path(document, x: 1)
-    end
-  end
 end

data/spec/lib/blacklight/configuration_spec.rb

@@ -213,25 +213,11 @@ describe "Blacklight::Configuration" do
         "another_field_facet" => {},
         "a_facet_field" => {},
         })
-      expect { |b| @config.add_facet_field "*_facet", &b }.to yield_control.twice
-      expect(@config.facet_fields.keys).to eq ["some_field_facet", "another_field_facet"]
-    end
-
-    describe "if/unless conditions with legacy show parameter" do
-      it "should be hidden if the if condition is false" do
-        expect(@config.add_facet_field("hidden", if: false).if).to eq false
-        expect(@config.add_facet_field("hidden_with_legacy", if: false, show: true).if).to eq false
-      end
-
-      it "should be true if the if condition is true" do
-        expect(@config.add_facet_field("hidden", if: true).if).to eq true
-        expect(@config.add_facet_field("hidden_with_legacy", if: true, show: false).if).to eq true
-      end
+      expect { |b| @config.add_index_field "*_facet", &b }.to yield_control.twice
 
-      it "should be true if the if condition is missing" do
-        expect(@config.add_facet_field("hidden", show: true).if).to eq true
-      end
+      expect(@config.index_fields.keys).to eq ["some_field_facet", "another_field_facet"]
     end
+
   end
   
   describe "add_index_field" do
@@ -275,6 +261,7 @@ describe "Blacklight::Configuration" do
 
       expect(@config.index_fields.keys).to eq ["some_field_display", "another_field_display"]
     end
+
   end
   
   describe "add_show_field" do
@@ -383,22 +370,8 @@ describe "Blacklight::Configuration" do
       
       expect(@config.search_fields["author_name"].label).to eq "Author Name"
     end
-
-    describe "if/unless conditions with legacy include_in_simple_search" do
-      it "should be hidden if the if condition is false" do
-        expect(@config.add_search_field("hidden", if: false).if).to eq false
-        expect(@config.add_search_field("hidden_with_legacy", if: false, include_in_simple_search: true).if).to eq false
-      end
-
-      it "should be true if the if condition is true" do
-        expect(@config.add_search_field("hidden", if: true).if).to eq true
-        expect(@config.add_search_field("hidden_with_legacy", if: true, include_in_simple_search: false).if).to eq true
-      end
-
-      it "should be true if the if condition is missing" do
-        expect(@config.add_search_field("hidden", include_in_simple_search: true).if).to eq true
-      end
-    end
+                
+        
   end
   
   describe "add_sort_field" do

data/spec/lib/blacklight/facet_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Blacklight::Facet do
+  subject do
+    Class.new do
+      include Blacklight::Facet
+      attr_reader :blacklight_config
+
+      def initialize blacklight_config
+        @blacklight_config = blacklight_config
+      end
+    end.new(blacklight_config)
+  end
+
+  let(:blacklight_config) { Blacklight::Configuration.new }
+
+  describe "#facet_configuration_for_field" do
+    it "should look up fields by key" do
+      blacklight_config.add_facet_field 'a'
+      expect(subject.facet_configuration_for_field('a')).to eq blacklight_config.facet_fields['a']
+    end
+
+    it "should look up fields by field name" do
+      blacklight_config.add_facet_field 'a', field: 'b'
+      expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
+    end
+
+    it "should support both strings and symbols" do
+      blacklight_config.add_facet_field 'a', field: :b
+      expect(subject.facet_configuration_for_field('b')).to eq blacklight_config.facet_fields['a']
+    end
+  end
+
+end

data/spec/lib/blacklight/search_builder_spec.rb

@@ -5,6 +5,14 @@ describe Blacklight::SearchBuilder do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:scope) { double blacklight_config: blacklight_config }
   subject { described_class.new processor_chain, scope }
+
+  context "with default processor chain" do
+    subject { described_class.new true, scope }
+    it "should use the class-level default_processor_chain" do
+      expect(subject.processor_chain).to eq []
+    end
+  end
+
   describe "#with" do
     it "should set the blacklight params" do
       params = {}

data/spec/lib/blacklight/solr/search_builder_spec.rb

@@ -17,6 +17,13 @@ describe Blacklight::Solr::SearchBuilder do
 
   subject { search_builder.with(user_params) }
 
+  context "with default processor chain" do
+    subject { described_class.new true, context }
+    it "should use the class-level default_processor_chain" do
+      expect(subject.processor_chain).to eq described_class.default_processor_chain
+    end
+  end
+
   context "with a complex parameter environment" do
     subject { search_builder.with(user_params).processed_parameters }
 

data/spec/lib/document_presenter_spec.rb

@@ -19,6 +19,7 @@ describe Blacklight::DocumentPresenter do
         config.add_index_field 'solr_doc_accessor', :accessor => true
         config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
         config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
+        config.add_index_field 'alias', field: 'qwer'
       end
     end
     it "should check for an explicit value" do
@@ -96,6 +97,12 @@ describe Blacklight::DocumentPresenter do
       value = subject.render_index_field_value 'explicit_accessor_with_arg'
       expect(value).to eq "123"
     end
+
+    it "should support solr field configuration" do
+      allow(document).to receive(:get).with('qwer', :sep => nil).and_return('document qwer value')
+      value = subject.render_index_field_value 'alias'
+      expect(value).to eq "document qwer value"
+    end
   end
   
   describe "render_document_show_field_value" do

data/spec/views/catalog/_document_list.html.erb_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 
-describe "/catalog/_document_list.html.erb" do  
-  
-
+describe "catalog/_document_list", type: :view do  
 
+  before do
+    allow(view).to receive_messages(document_index_view_type: "some-view", documents: [])
+  end
 
+  it "should include a class for the current view" do
+    render
+    expect(rendered).to have_selector(".documents-some-view")
+  end
 end

data/spec/views/catalog/_facets.html.erb_spec.rb

@@ -31,20 +31,20 @@ describe "catalog/_facets" do
                   :facet_limit_for => 10 )
 
         @response = double()
-        allow(@response).to receive(:facet_by_field_name).with(:facet_field_1) { @mock_display_facet_1 }
+        allow(@response).to receive(:facet_by_field_name).with("facet_field_1") { @mock_display_facet_1 }
     end
 
     it "should have a header" do
       allow(view).to receive_messages(:render_facet_partials => '')
       render
-      expect(rendered).to have_selector('h4')
+      expect(rendered).to have_selector('.facets-heading')
     end
 
 
     describe "facet display" do
       it "should have a(n accessible) header" do
         render
-        expect(rendered).to have_selector('h5')
+        expect(rendered).to have_selector('.facet-field-heading')
       end
 
       it "should list values" do

data/spec/views/catalog/_index_header_default.html.erb_spec.rb

@@ -9,15 +9,31 @@ describe "catalog/_index_header_default" do
     Blacklight::Configuration.new
   end
 
-  it "should render the document header" do
-    assign :response, double(:params => {})
-    allow(view).to receive(:current_search_session).and_return nil
-    allow(view).to receive(:search_session).and_return({})
+  before do
+    assign :response, double(params: {})
     allow(view).to receive(:render_grouped_response?).and_return false
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view).to receive(:render_bookmarks_control?).and_return false
-    render :partial => "catalog/index_header_default", :locals => {:document => document, :document_counter => 1}
+    allow(view).to receive(:current_search_session).and_return nil
+    allow(view).to receive(:search_session).and_return({})
+  end
+
+  it "should render the document header" do
+    allow(view).to receive(:render_index_doc_actions)
+    render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
     expect(rendered).to have_selector('.document-counter', text: "2")
   end
 
+  it "should allow the title to take the whole space if no document tools are rendered" do
+    allow(view).to receive(:render_index_doc_actions)
+    render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
+    expect(rendered).to have_selector '.index_title.col-md-12'
+  end
+  
+  it "should give the document actions space if present" do
+    allow(view).to receive(:render_index_doc_actions).and_return("DOCUMENT ACTIONS")
+    render partial: "catalog/index_header_default", locals: {document: document, document_counter: 1}
+    expect(rendered).to have_selector '.index_title.col-sm-9'
+    expect(rendered).to have_content "DOCUMENT ACTIONS"
+  end
+
 end

data/spec/views/catalog/_view_type_group.html.erb_spec.rb

@@ -7,6 +7,10 @@ describe "catalog/_view_type_group" do
   end
 
   before do
+    allow(view).to receive(:view_label) do |view|
+      view.to_s
+    end
+
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.11.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -519,6 +519,7 @@ files:
 - spec/lib/blacklight/document/email_spec.rb
 - spec/lib/blacklight/document/sms_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
+- spec/lib/blacklight/facet_spec.rb
 - spec/lib/blacklight/routes_spec.rb
 - spec/lib/blacklight/search_builder_spec.rb
 - spec/lib/blacklight/search_fields_spec.rb
@@ -637,6 +638,7 @@ test_files:
 - spec/lib/blacklight/document/email_spec.rb
 - spec/lib/blacklight/document/sms_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
+- spec/lib/blacklight/facet_spec.rb
 - spec/lib/blacklight/routes_spec.rb
 - spec/lib/blacklight/search_builder_spec.rb
 - spec/lib/blacklight/search_fields_spec.rb