blacklight 5.0.0.pre2 → 5.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f3074193519ca823f3af1b5db3d88b3cd42ce0
-  data.tar.gz: 478b01d0e5292996ed40da54ce6fe5a7e1258f60
+  metadata.gz: 4d8794852e683729a57437dab41c12a7f163e935
+  data.tar.gz: 0475c260c2845e478307195be84b6c967e426469
 SHA512:
-  metadata.gz: 4502e598ed76de63d1a36ecffdb2f19b1b5e8c93f6a56ec7fbfb077b30cb56fdf56859368c401c2003bc45bd272d88b3542c2a320b368828e93d490a6cddc1f7
-  data.tar.gz: 7f77de71e7536ebf916dc24a46152b43cd458f1a9d77c1127f9e38720ba85c09f6ad00b8568fdbcb5ae20f8638f36f77aa586c4ad93795313371d8c4d46c289f
+  metadata.gz: 31df124b777472aa9a7f1c04cf66dce546dc61f53d5f7cc6d8f5b7ebd62d122405aa886f504c778a73a9f3976efbb207ff5f840a6ac56acbeb87499c469ab737
+  data.tar.gz: 0d3674651658046314cceed8ccecc82084aa4144eb9198f78bf74f0e3044d97e46436ee921e837edb10845946c51736f6b845f0992a00673c5705122e3eaa78a

data/LICENSE

@@ -1,5 +1,6 @@
 ##########################################################################
-# Copyright 2008 Rector and Visitors of the University of Virginia
+# Copyright 2008-2014 Rector and Visitors of the University of Virginia, The Board of Trustees of the Leland Stanford Junior University, Johns Hopkins Universities, and Data Curation Experts
+# Additional copyright may be held by others, as reflected in the commit log
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-5.0.0.pre2
+5.0.0.pre3

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

@@ -38,10 +38,6 @@
   }
 }
 
-.catalog_startOverLink {
-  @extend .pull-right;
-}
-
 .constraints-container {
   @extend .well;
   line-height: 2.5;
@@ -81,6 +77,7 @@ span.constraints-label {
     margin-top: $padding-base-vertical;
     padding-top: $padding-base-vertical;
     border-bottom:1px dotted $table-border-color;
+    @extend .clearfix;
   }
 } 
 
@@ -131,6 +128,10 @@ span.constraints-label {
 {
   dd {
     margin-bottom: $padding-base-vertical;
+
+    &:after {
+      clear: none;
+    }
   }
 }
 
@@ -185,4 +186,13 @@ label.toggle_bookmark
 .document-thumbnail {
   float: right;
   padding-left: 20px;
+  margin-bottom: $line-height-computed;
+}
+
+.view-type {
+  display: inline-block;
+
+  .caption {
+    @extend .sr-only;
+  }
 }

data/app/assets/stylesheets/blacklight/_header.css.scss

@@ -17,6 +17,8 @@
 }
 
 #search-navbar {
+  z-index: 1;
+
   .search-query-form {
     @extend .col-md-8;
     padding-left: 0;

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -101,7 +101,8 @@ module Blacklight::BlacklightHelperBehavior
 
   def should_render_index_field? document, solr_field
     document.has?(solr_field.field) ||
-      (document.has_highlight_field? solr_field.field if solr_field.highlight)
+      (document.has_highlight_field? solr_field.field if solr_field.highlight) ||
+      solr_field.accessor
   end
 
   def spell_check_max
@@ -281,17 +282,44 @@ module Blacklight::BlacklightHelperBehavior
   end
 
   ##
-  # Get the value of a document's field after applying any value lookups, e.g.:
+  # Get the value for a document's field, and prepare to render it.
+  # - highlight_field
+  # - accessor
+  # - solr field
+  #
+  # Rendering:
   #   - helper_method
   #   - link_to_search
-  #   - highlight
   # TODO : maybe this should be merged with render_field_value, and the ugly signature 
   # simplified by pushing some of this logic into the "model"
   def get_field_values document, field, field_config, options = {}
+    # valuyes
+    value = case    
+      when (field_config and field_config.highlight)
+        # retrieve the document value from the highlighting response
+        document.highlight_field(field_config.field).map { |x| x.html_safe } if document.has_highlight_field? field_config.field
+      when (field_config and field_config.accessor)
+        # implicit method call
+        if field_config.accessor === true
+          document.send(field)
+        # arity-1 method call (include the field name in the call)
+        elsif !field_config.accessor.is_a?(Array) && document.method(field_config.accessor).arity != 0
+          document.send(field_config.accessor, field)
+        # chained method calls
+        else
+          Array(field_config.accessor).inject(document) do |result, method|
+            result.send(method)
+          end
+        end
+      else
+        # regular solr
+        document.get(field, :sep => nil) if field
+    end
 
+    # rendering
     case
       when (field_config and field_config.helper_method)
-        send(field_config.helper_method, options.merge(:document => document, :field => field))
+        send(field_config.helper_method, options.merge(:document => document, :field => field, :value => value))
       when (field_config and field_config.link_to_search)
         link_field = if field_config.link_to_search === true
           field_config.field
@@ -299,19 +327,18 @@ module Blacklight::BlacklightHelperBehavior
           field_config.link_to_search
         end
 
-        Array(document.get(field, :sep => nil)).map do |v|
+        Array(value).map do |v|
           link_to render_field_value(v, field_config), search_action_url(add_facet_params(link_field, v, {}))
         end if field
-      when (field_config and field_config.highlight)
-        document.highlight_field(field_config.field).map { |x| x.html_safe } if document.has_highlight_field? field_config.field
       else
-        document.get(field, :sep => nil) if field
-    end
+        value
+      end
   end
 
   def should_render_show_field? document, solr_field
     document.has?(solr_field.field) ||
-      (document.has_highlight_field? solr_field.field if solr_field.highlight)
+      (document.has_highlight_field? solr_field.field if solr_field.highlight) ||
+      solr_field.accessor
   end
 
   def render_field_value value=nil, field_config=nil
@@ -328,14 +355,18 @@ module Blacklight::BlacklightHelperBehavior
     ', '
   end
 
-  def document_index_view_type
-    if blacklight_config.document_index_view_types.include? params[:view]
-      params[:view]
+  def document_index_view_type query_params=params
+    if blacklight_config.document_index_view_types.include? query_params[:view]
+      query_params[:view]
     else
-      blacklight_config.document_index_view_types.first
+      default_document_index_view_type
     end
   end
 
+  def default_document_index_view_type
+    blacklight_config.document_index_view_types.first
+  end
+
   def render_document_index documents = nil, locals = {}
     documents ||= @document_list
     render_document_index_with_view(document_index_view_type, documents)
@@ -430,6 +461,17 @@ module Blacklight::BlacklightHelperBehavior
     link_to(query, link_url)
   end
 
+  ##
+  # Get the path to the search action with any parameters (e.g. view type)
+  # that should be persisted across search sessions.
+  def start_over_path query_params = params
+    h = { }
+    current_index_view_type = document_index_view_type(query_params)
+    h[:view] = current_index_view_type unless current_index_view_type == default_document_index_view_type
+
+    search_action_url(h)
+  end
+
   def render_document_index_label doc, opts
     label = nil
     label ||= doc.get(opts[:label], :sep => nil) if opts[:label].instance_of? Symbol

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -1,15 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Blacklight::CatalogHelperBehavior
 
-  # Equivalent to kaminari "paginate", but takes an RSolr::Response as first argument.
-  # Will convert it to something kaminari can deal with (using #paginate_params), and
-  # then call kaminari paginate with that. Other arguments (options and block) same as
-  # kaminari paginate, passed on through.
-  # will output HTML pagination controls.
-  def paginate_rsolr_response(response, options = {}, &block)
-    paginate response, options, &block
-  end
-
   # Override the Kaminari page_entries_info helper with our own, blacklight-aware
   # implementation
   #

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -42,10 +42,34 @@ module Blacklight::FacetsHelperBehavior
   # @param [Blacklight::SolrResponse::Facets::FacetField] display_facet 
   def should_render_facet? display_facet
     # display when show is nil or true
-    display = facet_configuration_for_field(display_facet.name).show != false
+    facet_config = facet_configuration_for_field(display_facet.name)
+
+    display = case facet_config.show
+    when Symbol
+      arity = method(facet_config.show).arity
+
+      if arity == 0
+        send(facet_config.show)
+      else 
+        send(facet_config.show, display_facet)
+      end
+    when Proc
+      facet_config.show.call self, facet_config, display_facet
+    else
+      facet_config.show
+    end
+
     return display && display_facet.items.present?
   end
 
+  ##
+  # if the facet is 'active', don't collapse
+  # if the facet is configured to collapse (the default), collapse
+  # if the facet is configured not to collapse, don't collapse
+  def should_collapse_facet? facet_field
+    !facet_field_in_params?(facet_field.field) && facet_field.collapse
+  end
+
   # the name of the partial to use to render a facet field. Can be over-ridden for custom
   # display on a per-facet basis. 
   def facet_partial_name(display_facet = nil)

data/app/views/_user_util_links.html.erb

@@ -23,7 +23,7 @@
       </li>
       <% unless current_user.to_s.blank? -%>
       <li>
-        [<%= link_to current_user, edit_user_registration_path %>]
+        <%= link_to current_user, edit_user_registration_path %>
       </li>
       <% end %>
       <% else %>

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

@@ -1,9 +1,10 @@
 <% if query_has_constraints? %>
-      <div id="appliedParams" class="constraints-container">
-        <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
-  
-        <%=link_to t('blacklight.search.start_over'), url_for(:action=>'index'), :class => "catalog_startOverLink", :id=>"startOverLink" %>
-        <%= render_constraints(params) %>  
 
+      <div id="appliedParams" class="clearfix constraints-container">
+        <div class="pull-right">
+          <%=link_to t('blacklight.search.start_over'), start_over_path, :class => "catalog_startOverLink btn btn-sm btn-text", :id=>"startOverLink" %>
+        </div>
+        <span class="constraints-label"><%= t('blacklight.search.filters.title') %></span>
+        <%= render_constraints(params) %>
       </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <div class="panel panel-default facet_limit blacklight-<%= facet_field.field.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.field) %>">
-  <div class="<%= "collapsed" unless facet_field_in_params?(facet_field.field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#facet-<%= facet_field.label.parameterize %>">
+  <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#facet-<%= facet_field.label.parameterize %>">
     <h5 class="panel-title">
       <%= link_to facet_field.label, "#", :"data-no-turbolink" => true %>
     </h5>
   </div>
-  <div id="facet-<%= facet_field.label.parameterize %>" class="panel-collapse <%=  facet_field_in_params?(facet_field.field) ? 'in' : 'collapse' %>">
+  <div id="facet-<%= facet_field.label.parameterize %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">
     <div class="panel-body">
       <%= yield %>
     </div>

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

@@ -8,7 +8,9 @@
         -%>
          <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, :label=>document_show_link_field(document), :counter => counter %>
         </h5>
 

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

@@ -12,7 +12,7 @@
     <div class="pull-right search-widgets">
         <%= link_back_to_catalog :class => 'btn' %>
         
-        <%=link_to "#{t('blacklight.search.start_over')}", catalog_index_path, :id=>"startOverLink", :class => 'btn' %>
+        <%=link_to "#{t('blacklight.search.start_over')}", start_over_path(current_search_session.try(:query_params) || {}), :id=>"startOverLink", :class => 'btn' %>
   	</div>
   </div>
 <% end %>

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

@@ -3,5 +3,6 @@
   <div class="search-widgets pull-right">
     <%= render :partial => 'sort_widget' %>
     <%= render :partial => 'per_page_widget' %>
+    <%= render :partial => 'view_type_group' %>
   </div>
 </div>

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

@@ -0,0 +1,13 @@
+<% if blacklight_config.document_index_view_types.length > 1 -%>
+<div class="view-type">
+  <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
+  <div class="view-type-group btn-group">
+    <%  blacklight_config.document_index_view_types.each do |view| %>
+    <%= link_to url_for(params.merge(:view => view)), :title => t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: "")), :class => "btn btn-default view-type-#{ view.parameterize } #{"active" if document_index_view_type == view}" do %>
+        <span class="glyphicon glyphicon-<%= view.parameterize %> view-icon-<%= view.parameterize %>"></span>
+        <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
+      <% end %>
+    <% end %>
+  </div>
+</div>
+<% end -%>

data/config/locales/blacklight.en.yml

@@ -1,12 +1,4 @@
 en:
-  active_record:
-    models:
-      feedback: 'Feedback'
-    attributes:
-      feedback:
-        name: 'Your Name'
-        email: 'Your Email'
-        message: 'Your Message'
   views:
     pagination:
       first: '« First'
@@ -56,16 +48,6 @@ en:
       list_title: 'Your Bookmarks'
       delete: 'Remove'
 
-    feedback:
-      valid_name: 'A valid name is required'
-      valid_email: 'A valid email address is required'
-      need_message: 'A message is required'
-      submit: 'Send!'
-      errors:
-        title: 'Please fix the following form errors:'
-      complete:
-        title: 'Thank-you for your feedback'
-
     saved_searches:
       add:
         success: 'Successfully saved your search.'
@@ -225,6 +207,9 @@ en:
         use_fewer_keywords: "Use fewer keywords to start, then refine your search using the links on the left."
         search_fields: "you searched by %{search_fields}"
         search_everything: "try searching everything"
+      view_title: "View results as: "
+      view:
+        list: "List"
 
     entry_name:
       default: 'entry'

data/config/locales/blacklight.fr.yml

@@ -1,12 +1,4 @@
 fr:
-  active_record:
-    models:
-      feedback: 'Vos réactions'
-    attributes:
-      feedback:
-        name: 'Votre nom'
-        email: 'Votre courriel'
-        message: 'Votre message'
   views:
     pagination:
       first: '« Première'
@@ -56,16 +48,6 @@ fr:
       list_title: 'Vos favoris'
       delete: 'Supprimer'
 
-    feedback:
-      valid_name: 'Vous devez saisir votre nom.'
-      valid_email: 'Vous devez saisir votre courriel.'
-      need_message: 'Vous devez saisir un message.'
-      submit: 'Envoyer'
-      errors:
-        title: 'Veuillez corriger les erreurs suivantes :'
-      complete:
-        title: 'Merci pour vos remarques.'
-
     folder:
       title: 'Panier'
       add:
@@ -241,6 +223,10 @@ fr:
         use_fewer_keywords: "Utilisez moins de mots-clés pour commencer, puis affiner votre recherche."
         search_fields: "vous avez cherché par %{search_fields}"
         search_everything: "essayez de rechercher tout"
+      view_title: "Affichage: "
+      view:
+        list: "Liste"
+
 
     entry_name:
       default: 'résultat'

data/lib/blacklight/configuration.rb

@@ -25,7 +25,8 @@ module Blacklight
           :search_history_window => Blacklight::Catalog::SearchHistoryWindow,
           :document_index_view_types => ['list'],
           :add_facet_fields_to_solr_request => false,
-          :add_field_configuration_to_solr_request => false
+          :add_field_configuration_to_solr_request => false,
+          :http_method => :get
           }
         end
       end

data/lib/blacklight/configuration/facet_field.rb

@@ -7,6 +7,10 @@ module Blacklight
         self.tag = "#{self.field}_single"
         self.ex = "#{self.field}_single"
       end
+
+      self.collapse = true if self.collapse.nil?
+      self.show = true if self.show.nil?
+
       super
     end
   end

data/lib/blacklight/engine.rb

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 module Blacklight
   class Engine < Rails::Engine
 
@@ -11,29 +9,6 @@ module Blacklight
     initializer 'blacklight.helpers' do |app|
       ActionView::Base.send :include, BlacklightHelper
     end
-    
-    # Expose Jquery-ui image assets so they are precompiled
-    # to root path so jquery-ui css compiled into asset pipeline
-    # can find them. 
-    # http://bibwild.wordpress.com/2011/12/08/jquery-ui-css-and-images-and-rails-asset-pipeline/
-    #
-    # Sorry, we end up prepending jquery-ui asset path before ALL paths, even
-    # application, no easy way to insert em before the gem paths but after
-    # the app paths. 
-    #
-    # You may want to disable this if you want to supply your own theme, just set
-    #     Blacklight::Engine.config.jquery_ui_images = false
-    # in config/appliction.rb or other pre-initializer control point. 
-    config.before_configuration do
-      config.jquery_ui_images = true
-    end
-    initializer "blacklight.jquery_ui_images",
-            :group => :all,
-            :after => :append_assets_path do
-      if config.jquery_ui_images
-        Rails.application.config.assets.paths.unshift self.class.root.join("app", "assets", "stylesheets", "jquery", "ui-lightness").to_s
-      end
-    end
 
     # This makes our rake tasks visible.
     rake_tasks do
@@ -45,4 +20,4 @@ module Blacklight
     end
 
   end
-end
+end

data/lib/blacklight/rails/routes.rb

@@ -3,7 +3,7 @@ module ActionDispatch::Routing
     # example
     #   blacklight_for :catalog
     #   blacklight_for :catalog, :dashboard
-    #   blacklight_for :catalog, except: [ :saved_searches, :feedback ]
+    #   blacklight_for :catalog, except: [ :saved_searches ]
     #   blacklight_for :catalog, only: [ :saved_searches, :solr_document ]
     #   blacklight_for :catalog, constraints: {id: /[0-9]+/ }
     def blacklight_for(*resources)

data/lib/blacklight/routes.rb

@@ -6,6 +6,26 @@ module Blacklight
 
     attr_reader :resources 
 
+    # adds as class and instance level accessors, default_route_sets
+    # returns an array of symbols for method names that define routes. 
+    # Order is important:.  (e.g. /catalog/email precedes /catalog/:id)
+    #
+    # Add-ons that want to add routes into default routing might
+    # monkey-patch Blacklight::Routes, say:
+    #
+    #     module MyWidget::Routes
+    #       extend ActiveSupport::Concern
+    #       included do |klass|
+    #         klass.default_route_sets += [:widget_routing]
+    #       end
+    #       def widget_routing(primary_resource)
+    #         get "#{primary_resource}/widget", "#{primary_resource}#widget"
+    #       end
+    #     end
+    #     Blacklight::Routes.send(:include, MyWidget::Routes)
+    class_attribute :default_route_sets
+    self.default_route_sets = [:bookmarks, :search_history, :saved_searches, :export, :solr_document]
+
     def initialize(router, options)
       @router = router
       @options = options
@@ -35,10 +55,7 @@ module Blacklight
       (@options[:only] || default_route_sets) - (@options[:except] || [])
     end
 
-    def default_route_sets
-      # Order is important here.  (e.g. /catalog/email precedes /catalog/:id)
-      [:bookmarks, :search_history, :saved_searches, :export, :solr_document, :feedback]
-    end
+
 
     module RouteSets
       def bookmarks(_)
@@ -101,15 +118,6 @@ module Blacklight
           resources primary_resource, args
         end
       end
-  
-    
-      # Feedback
-      def feedback(_)
-        add_routes do |options|
-          get "feedback", :to => "feedback#show"    
-          get "feedback/complete", :to => "feedback#complete"
-        end
-      end
     end
     include RouteSets
   end

data/lib/blacklight/solr_helper.rb

@@ -391,7 +391,8 @@ module Blacklight::SolrHelper
     path = blacklight_config.solr_path
 
     # delete these parameters, otherwise rsolr will pass them through.
-    res = blacklight_solr.send_and_receive(path, params: solr_params.to_hash)
+    key = blacklight_config.http_method == :post ? :data : :params
+    res = blacklight_solr.send_and_receive(path, {key=>solr_params.to_hash, method:blacklight_config.http_method})
     
     solr_response = Blacklight::SolrResponse.new(force_to_utf8(res), solr_params)
 

data/spec/helpers/blacklight_helper_spec.rb

@@ -327,6 +327,26 @@ describe BlacklightHelper do
        params[:view] = 'not_in_list'
        expect(document_index_view_type).to eq 'list'
      end
+
+     it "should pluck values from supplied params" do
+       blacklight_config.stub(:document_index_view_types) { ['list', 'asdf'] }
+       params[:view] = 'asdf'
+       expect(document_index_view_type(:view => 'list')).to eq 'list'
+     end
+   end
+
+   describe "start_over_path" do
+    it 'should be the catalog path with the current view type' do
+      blacklight_config.stub(:document_index_view_types) { ['list', 'abc'] }
+      helper.stub(:blacklight_config => blacklight_config)
+      expect(helper.start_over_path(:view => 'abc')).to eq catalog_index_url(:view => 'abc')
+    end
+
+    it 'should not include the current view type if it is the default' do
+      blacklight_config.stub(:document_index_view_types) { ['list', 'abc'] }
+      helper.stub(:blacklight_config => blacklight_config)
+      expect(helper.start_over_path(:view => 'list')).to eq catalog_index_url
+    end
    end
 
    describe "render_document_index" do
@@ -519,6 +539,9 @@ describe BlacklightHelper do
         config.add_index_field 'link_to_search_true', :link_to_search => true
         config.add_index_field 'link_to_search_named', :link_to_search => :some_field
         config.add_index_field 'highlight', :highlight => true
+        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
       end
       helper.stub(:blacklight_config).and_return(@config)
     end
@@ -532,7 +555,7 @@ describe BlacklightHelper do
 
     it "should check for a helper method to call" do
       doc = double()
-      doc.should_not_receive(:get).with('asdf', :sep => nil)
+      doc.should_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_index_field).and_return('custom asdf value')
       value = helper.render_index_field_value :document => doc, :field => 'asdf'
       expect(value).to eq 'custom asdf value'
@@ -582,6 +605,25 @@ describe BlacklightHelper do
       value = helper.render_index_field_value :document => doc, :field => 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
+
+    it "should call an accessor on the solr document" do
+      doc = double(:solr_doc_accessor => "123")
+      value = helper.render_index_field_value :document => doc, :field => 'solr_doc_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit accessor on the solr document" do
+      doc = double(:solr_doc_accessor => "123")
+      value = helper.render_index_field_value :document => doc, :field => 'explicit_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an implicit accessor on the solr document" do
+      doc = double()
+      expect(doc).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = helper.render_index_field_value :document => doc, :field => 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
+    end
   end
 
 
@@ -593,7 +635,12 @@ describe BlacklightHelper do
         config.add_show_field 'link_to_search_true', :link_to_search => true
         config.add_show_field 'link_to_search_named', :link_to_search => :some_field
         config.add_show_field 'highlight', :highlight => true
+        config.add_show_field 'solr_doc_accessor', :accessor => true
+        config.add_show_field 'explicit_accessor', :accessor => :solr_doc_accessor
+        config.add_show_field 'explicit_array_accessor', :accessor => [:solr_doc_accessor, :some_method]
+        config.add_show_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
       end
+
       helper.stub(:blacklight_config).and_return(@config)
     end
 
@@ -607,7 +654,7 @@ describe BlacklightHelper do
 
     it "should check for a helper method to call" do
       doc = double()
-      doc.should_not_receive(:get).with('asdf', :sep => nil)
+      doc.should_receive(:get).with('asdf', :sep => nil)
       helper.stub(:render_asdf_document_show_field).and_return('custom asdf value')
       value = helper.render_document_show_field_value :document => doc, :field => 'asdf'
       expect(value).to eq 'custom asdf value'
@@ -658,6 +705,31 @@ describe BlacklightHelper do
       value = helper.render_document_show_field_value :document => doc, :field => 'mnbv'
       expect(value).to eq 'document mnbv value'
     end
+
+    it "should call an accessor on the solr document" do
+      doc = double(:solr_doc_accessor => "123")
+      value = helper.render_document_show_field_value :document => doc, :field => 'solr_doc_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit accessor on the solr document" do
+      doc = double(:solr_doc_accessor => "123")
+      value = helper.render_document_show_field_value :document => doc, :field => 'explicit_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an explicit array-style accessor on the solr document" do
+      doc = double(:solr_doc_accessor => double(:some_method => "123"))
+      value = helper.render_document_show_field_value :document => doc, :field => 'explicit_array_accessor'
+      expect(value).to eq "123"
+    end
+
+    it "should call an accessor on the solr document with the field as an argument" do
+      doc = double()
+      expect(doc).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = helper.render_document_show_field_value :document => doc, :field => 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
+    end
   end
 
   describe "#should_render_index_field?" do
@@ -675,6 +747,14 @@ describe BlacklightHelper do
       field_config = double(:field => 'asdf', :highlight => true)
       helper.should_render_index_field?(doc, field_config).should == true
     end
+
+    it "should if the field has a model accessor" do
+      doc = double()
+      doc.stub(:has?).with('asdf').and_return(false)
+      doc.stub(:has_highlight_field?).with('asdf').and_return(false)
+      field_config = double(:field => 'asdf', :highlight => true, :accessor => true)
+      helper.should_render_index_field?(doc, field_config).should == true
+    end
   end
 
 
@@ -693,6 +773,14 @@ describe BlacklightHelper do
       field_config = double(:field => 'asdf', :highlight => true)
       expect(helper.should_render_show_field?(doc, field_config)).to be_true
     end
+
+    it "should if the field has a model accessor" do
+      doc = double()
+      doc.stub(:has?).with('asdf').and_return(false)
+      doc.stub(:has_highlight_field?).with('asdf').and_return(false)
+      field_config = double(:field => 'asdf', :highlight => true, :accessor => true)
+      helper.should_render_show_field?(doc, field_config).should == true
+    end
   end
 
 

data/spec/helpers/facets_helper_spec.rb

@@ -33,11 +33,16 @@ describe FacetsHelper do
     before do
       @config = Blacklight::Configuration.new do |config|
         config.add_facet_field 'basic_field'
-        config.add_facet_field 'no_show', :show=>false
+        config.add_facet_field 'no_show', :show => false
+        config.add_facet_field 'helper_show', :show => :my_helper
+        config.add_facet_field 'helper_with_an_arg_show', :show => :my_helper_with_an_arg
+        config.add_facet_field 'lambda_show', :show => lambda { |context, config, field| true }
+        config.add_facet_field 'lambda_no_show', :show => lambda { |context, config, field| false }
       end
 
       helper.stub(:blacklight_config => @config)
     end
+
     it "should render facets with items" do
       a = double(:items => [1,2], :name=>'basic_field')
       expect(helper.should_render_facet?(a)).to be_true
@@ -51,6 +56,53 @@ describe FacetsHelper do
       a = double(:items => [1,2], :name=>'no_show')
       expect(helper.should_render_facet?(a)).to be_false
     end
+
+    it "should call a helper to determine if it should render a field" do
+      helper.stub(:my_helper => true)
+      a = double(:items => [1,2], :name=>'helper_show')
+      expect(helper.should_render_facet?(a)).to be_true
+    end
+
+    it "should call a helper to determine if it should render a field" do
+      a = double(:items => [1,2], :name=>'helper_with_an_arg_show')
+      helper.should_receive(:my_helper_with_an_arg).with(a).and_return(true)
+      expect(helper.should_render_facet?(a)).to be_true
+    end
+
+
+    it "should evaluate a Proc to determine if it should render a field" do
+      a = double(:items => [1,2], :name=>'lambda_show')
+      expect(helper.should_render_facet?(a)).to be_true
+
+      a = double(:items => [1,2], :name=>'lambda_no_show')
+      expect(helper.should_render_facet?(a)).to be_false
+    end
+  end
+
+  describe "should_collapse_facet?" do
+    before do
+      @config = Blacklight::Configuration.new do |config|
+        config.add_facet_field 'basic_field'
+        config.add_facet_field 'no_collapse', collapse: false
+      end
+
+      helper.stub(blacklight_config: @config)
+    end
+
+    it "should be collapsed by default" do
+      expect(helper.should_collapse_facet?(@config.facet_fields['basic_field'])).to be_true
+    end
+
+    it "should not be collapsed if the configuration says so" do
+      expect(helper.should_collapse_facet?(@config.facet_fields['no_collapse'])).to be_false
+    end
+
+    it "should not be collapsed if it is in the params" do
+      params[:f] = { basic_field: [1], no_collapse: [2] }.with_indifferent_access
+      expect(helper.should_collapse_facet?(@config.facet_fields['basic_field'])).to be_false
+      expect(helper.should_collapse_facet?(@config.facet_fields['no_collapse'])).to be_false
+    end
+
   end
 
   describe "facet_by_field_name" do

data/spec/lib/blacklight/solr_helper_spec.rb

@@ -1146,5 +1146,40 @@ describe 'Blacklight::SolrHelper' do
     end
   end
 
+  describe "http_method configuration" do
+    describe "using default" do
+      let (:blacklight_config) {Blacklight::Configuration.new}
+
+      it "defaults to get" do
+        expect(blacklight_config.http_method).to eq :get
+        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
+          expect(path).to eq 'select'
+          expect(params[:method]).to eq :get
+          expect(params[:params]).to include(:q)
+        end.and_return({'response'=>{'docs'=>[]}})
+        get_search_results(:q => @all_docs_query)
+      end
+    end
+
+    describe "setting to post" do
+      let (:blacklight_config) {config = Blacklight::Configuration.new; config.http_method=:post; config}
+
+      it "keep value set to post" do
+        expect(blacklight_config.http_method).to eq :post
+        Blacklight.solr.should_receive(:send_and_receive) do |path, params|
+          expect(path).to eq 'select'
+          expect(params[:method]).to eq :post
+          expect(params[:data]).to include(:q)
+        end.and_return({'response'=>{'docs'=>[]}})
+        get_search_results(:q => @all_docs_query)
+      end
+
+      it "should send a post request to solr", :integration => true do
+        response, docs = get_search_results(:q => @all_docs_query)
+        expect(docs.length).to be >= 1
+     end
+    end
+  end
+
 end
 

data/spec/routing/routes_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "Blacklight::Routes" do
+  describe "default_route_sets" do
+    around do |example|
+      @original = Blacklight::Routes.default_route_sets.dup.freeze
+
+      example.run
+
+      Blacklight::Routes.default_route_sets = @original
+    end
+
+    it "is settable" do
+      Blacklight::Routes.default_route_sets += [:foo]
+
+      # Order DOES matter. 
+      expect(Blacklight::Routes.default_route_sets).to eq(@original + [:foo])
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "catalog/constraints" do
+  let :blacklight_config do
+    Blacklight::Configuration.new :document_index_view_types => ['list', 'xyz']
+  end
+
+  it "should render nothing if no constraints are set" do
+    view.stub(query_has_constraints?: false)
+    render partial: "catalog/constraints"
+    expect(rendered).to be_empty
+  end
+
+  it "should render a start over link" do
+    view.should_receive(:search_action_url).with({}).and_return('http://xyz')
+    view.stub(query_has_constraints?: true)
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    render partial: "catalog/constraints"
+    expect(rendered).to have_selector("#startOverLink")
+    expect(rendered).to have_link("Start Over", :href => 'http://xyz')
+  end
+
+  it "should render a start over link with the current view type" do
+    view.should_receive(:search_action_url).with(view: 'xyz').and_return('http://xyz?view=xyz')
+    view.stub(query_has_constraints?: true)
+    params[:view] = 'xyz'
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    render partial: "catalog/constraints"
+    expect(rendered).to have_selector("#startOverLink")
+    expect(rendered).to have_link("Start Over", :href => 'http://xyz?view=xyz')
+  end
+
+end

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

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "catalog/facet_layout" do
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  let :facet_field do
+    Blacklight::Configuration::FacetField.new(field: 'some_field').normalize!
+  end
+
+  before do
+    view.stub(blacklight_config: blacklight_config)
+  end
+
+  it "should have a facet-specific class" do
+    render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
+    expect(rendered).to have_selector '.blacklight-some_field' 
+  end
+
+  it "should have a title with a link for a11y" do
+    render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
+    expect(rendered).to have_selector 'h5 a', text: 'Some Field'
+  end
+
+  it "should be collapsable" do
+    render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
+    expect(rendered).to have_selector '.panel-heading.collapsed'
+    expect(rendered).to have_selector '.collapse .panel-body'
+  end
+
+  it "should be configured to be open by default" do
+    facet_field.stub(collapse: false)
+    render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
+    expect(rendered).to_not have_selector '.panel-heading.collapsed'
+    expect(rendered).to have_selector '.in .panel-body'
+
+  end
+
+
+end

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

@@ -47,8 +47,12 @@ describe "catalog/_facets" do
 
     it "should list values" do
       render
-      expect(rendered).to have_selector('a.facet_select')
-      expect(rendered).to have_selector('.facet-count')
+
+      # The .facet-content class is used by blacklight_range_limit js, and
+      # should be applied to the .panel-collapse div that contains the collapsible
+      # facet content. Please make sure it remains if possible. 
+      expect(rendered).to have_selector('.facet-content a.facet_select')
+      expect(rendered).to have_selector('.facet-content .facet-count')    
     end
 
   end

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

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "catalog/_index_header_default" do
+  let :document do
+    SolrDocument.new :id => 'xyz', :format => 'a'
+  end
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  it "should render the document header" do
+    assign :response, double(:params => {})
+    view.stub(:current_search_session).and_return nil
+    view.stub(:render_grouped_response?).and_return false
+    view.stub(:blacklight_config).and_return(blacklight_config)
+    view.stub(:render_bookmarks_control?).and_return false
+    render :partial => "catalog/index_header_default", :locals => {:document => document, :document_counter => 1}
+    expect(rendered).to have_selector('.document-counter', text: "2")
+  end
+
+end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "catalog/_sort_and_per_page" do
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  before do
+    view.stub(blacklight_config: blacklight_config)
+  end
+
+  it "should render the pagination, sort, per page and view type controls" do
+    stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
+    stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
+    stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
+    stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
+    render
+    expect(rendered).to match /paginate_compact/
+    expect(rendered).to match /sort_widget/
+    expect(rendered).to match /per_page_widget/
+    expect(rendered).to match /view_type_group/
+  end
+
+end

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe "catalog/_view_type_group" do
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  before do
+    view.stub(blacklight_config: blacklight_config)
+  end
+
+  it "should not display the group when there's only one option" do
+    blacklight_config.stub document_index_view_types: ['a']
+    render partial: 'catalog/view_type_group'
+    expect(rendered).to be_empty
+  end
+
+  it "should display the group" do
+    blacklight_config.stub document_index_view_types: ['a', 'b', 'c']
+    render partial: 'catalog/view_type_group'
+    expect(rendered).to have_selector('.btn-group.view-type-group')
+    expect(rendered).to have_selector('.view-type-a', :text => 'A')
+    expect(rendered).to have_selector('.view-type-b', :text => 'B')
+    expect(rendered).to have_selector('.view-type-c', :text => 'C')
+  end
+
+
+  it "should set the current view to 'active'" do
+    blacklight_config.stub document_index_view_types: ['a', 'b']
+    render partial: 'catalog/view_type_group'
+    expect(rendered).to have_selector('.active', :text => 'A')
+    expect(rendered).to_not have_selector('.active', :text => 'B')
+    expect(rendered).to have_selector('.btn', :text => 'B')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre2
+  version: 5.0.0.pre3
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,7 +242,6 @@ files:
 - app/assets/stylesheets/blacklight/blacklight_defaults.css.scss
 - app/controllers/bookmarks_controller.rb
 - app/controllers/catalog_controller.rb
-- app/controllers/feedback_controller.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
@@ -300,6 +299,7 @@ files:
 - app/views/catalog/_sort_and_per_page.html.erb
 - app/views/catalog/_sort_widget.html.erb
 - app/views/catalog/_thumbnail_default.html.erb
+- app/views/catalog/_view_type_group.html.erb
 - app/views/catalog/_zero_results.html.erb
 - app/views/catalog/citation.html.erb
 - app/views/catalog/citation.js.erb
@@ -318,8 +318,6 @@ files:
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.html.erb
 - app/views/catalog/sms_sent.html.erb
-- app/views/feedback/complete.html.erb
-- app/views/feedback/show.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
 - app/views/kaminari/blacklight/_last_page.html.erb
@@ -450,6 +448,7 @@ files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/routing/routes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/features.rb
@@ -458,16 +457,21 @@ files:
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/blacklight_test_app.rake
+- spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_index_header_default.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
+- spec/views/catalog/_view_type_group.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb
@@ -546,6 +550,7 @@ test_files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/routing/catalog_routing_spec.rb
+- spec/routing/routes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/features.rb
@@ -554,16 +559,21 @@ test_files:
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/blacklight_test_app.rake
+- spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb
+- spec/views/catalog/_index_header_default.html.erb_spec.rb
 - spec/views/catalog/_paginate_compact.html.erb_spec.rb
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
+- spec/views/catalog/_view_type_group.html.erb_spec.rb
 - spec/views/catalog/index.atom.builder_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/catalog/show.html.erb_spec.rb

data/app/controllers/feedback_controller.rb

@@ -1,38 +0,0 @@
-# -*- encoding : utf-8 -*-
-class FeedbackController < ApplicationController
-  
-  # http://expressica.com/simple_captcha/
-  # include SimpleCaptcha::ControllerHelpers
-  
-  # show the feedback form
-  def show
-    @errors=[]
-    if request.post?
-      if validate
-        Notifier.feedback(params)
-        redirect_to feedback_complete_path
-      end
-    end
-  end
-  
-  protected
-  
-  # validates the incoming params
-  # returns either an empty array or an array with error messages
-  def validate
-    unless params[:name] =~ /\w+/
-      @errors << I18n.t('blacklight.feedback.valid_name') 
-    end
-    unless params[:email] =~ /\w+@\w+\.\w+/
-      @errors << I18n.t('blacklight.feedback.valid_email')
-    end
-    unless params[:message] =~ /\w+/
-      @errors << I18n.t('blacklight.feedback.need_message')
-    end
-    #unless simple_captcha_valid?
-    #  @errors << 'Captcha did not match'
-    #end
-    @errors.empty?
-  end
-  
-end

data/app/views/feedback/complete.html.erb

@@ -1,5 +0,0 @@
-<div id="content" class="col-md-9">
-<h1><%= t('blacklight.feedback.complete.title') %></h1>
-
-<%= link_to t('blacklight.back_to_search'), catalog_index_path %>
-</div>

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

@@ -1,22 +0,0 @@
-<div id="content" class="col-md-9">
-<h1>Send Us Feedback</h1>
-
-<% unless @errors.empty? %>
-  <strong><%= t('blacklight.feedback.errors.title') %></strong>
-  <ul class="errors">
-  <% @errors.each do |msg| %>
-    <li><%= msg %></li>
-  <% end %>
-  </ul>
-<% end %>
-
-<%= form_tag do %>
-  <fieldset>
-    <%= label_tag t('active_record.attributes.feedback.name') %> <%= text_field_tag :name, params[:name] %>
-    <%= label_tag t('active_record.attributes.feedback.email') %> <%= text_field_tag :email, params[:email] %>
-    <%= label_tag t('active_record.attributes.feedback.message')  %> <%= text_area_tag :message, params[:message] %>
-
-    <%= label_tag '' %><%= submit_tag t('blacklight.feedback.submit') %>
-  </fieldset>
-<% end %>
-</div>