Merge f14f1f0 into a43a0b1

.rubocop_todo.yml

@@ -202,8 +202,6 @@ Lint/UselessAssignment:
     - 'spec/helpers/blacklight/configuration_helper_behavior_spec.rb'
     - 'spec/helpers/catalog_helper_spec.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
-    - 'spec/presenters/index_presenter_spec.rb'
-    - 'spec/presenters/show_presenter_spec.rb'
     - 'spec/services/blacklight/search_service_spec.rb'
     - 'spec/support/features/session_helpers.rb'
 
@@ -399,7 +397,7 @@ RSpec/IteratedExpectation:
 RSpec/MessageChain:
   Exclude:
     - 'spec/controllers/bookmarks_controller_spec.rb'
-    - 'spec/presenters/show_presenter_spec.rb'
+    - 'spec/presenters/blacklight/show_presenter_spec.rb'
     - 'spec/views/shared/_user_util_links.html.erb_spec.rb'
 
 # Offense count: 52
@@ -428,7 +426,7 @@ RSpec/RepeatedDescription:
     - 'spec/helpers/blacklight/facets_helper_behavior_spec.rb'
     - 'spec/helpers/catalog_helper_spec.rb'
     - 'spec/models/blacklight/solr/search_builder_spec.rb'
-    - 'spec/presenters/show_presenter_spec.rb'
+    - 'spec/presenters/blacklight/show_presenter_spec.rb'
 
 # Offense count: 4
 RSpec/RepeatedExample:

app/helpers/blacklight/configuration_helper_behavior.rb

@@ -6,6 +6,7 @@ module Blacklight::ConfigurationHelperBehavior
   # @param [SolrDocument] document
   # @return [Array<Blacklight::Configuration::Field>]
   def index_fields _document = nil
+    Deprecation.warn(self, "index_fields is deprecated and will be removed in Blacklight 8. Use IndexPresenter#fields instead")
     blacklight_config.index_fields
   end
 
@@ -27,8 +28,9 @@ def search_field_options_for_select
     end.compact
   end
 
-  # used in the catalog/_show/_default partial
+  # used in the catalog/_show partial
   def document_show_fields _document = nil
+    Deprecation.warn(self, "document_show_fields is deprecated and will be removed in Blacklight 8. Use ShowPresenter#fields instead")
     blacklight_config.show_fields
   end
 
@@ -53,7 +55,7 @@ def default_search_field?(selected_search_field)
   ##
   # Look up the label for the index field
   def index_field_label document, field
-    field_config = index_fields(document)[field]
+    field_config = blacklight_config.index_fields_for(document)[field]
     field_config ||= Blacklight::Configuration::NullField.new(key: field)
 
     field_config.display_label('index')
@@ -62,7 +64,7 @@ def index_field_label document, field
   ##
   # Look up the label for the show field
   def document_show_field_label document, field
-    field_config = document_show_fields(document)[field]
+    field_config = blacklight_config.show_fields_for(document)[field]
     field_config ||= Blacklight::Configuration::NullField.new(key: field)
 
     field_config.display_label('show')

app/presenters/blacklight/index_presenter.rb

@@ -16,6 +16,11 @@ def initialize(document, view_context, configuration = view_context.blacklight_c
       @view_config = configuration.view_config(view_context.document_index_view_type)
     end
 
+    # @return [Hash<String,Configuration::Field>]
+    def fields
+      configuration.index_fields_for(document)
+    end
+
     ##
     # Render the document index heading
     #

app/presenters/blacklight/show_presenter.rb

@@ -12,6 +12,11 @@ def initialize(document, view_context, configuration = view_context.blacklight_c
       @configuration = configuration
     end
 
+    # @return [Hash<String,Configuration::Field>]
+    def fields
+      configuration.show_fields_for(document)
+    end
+
     ##
     # Create <link rel="alternate"> links from a documents dynamically
     # provided export formats. Returns empty string if no links available.

app/views/catalog/_index.html.erb

@@ -1,8 +1,8 @@
-<% doc_presenter = index_presenter(document) %> 
+<% doc_presenter = index_presenter(document) %>
 <%# default partial to display solr document fields in catalog index view -%>
 <dl class="document-metadata dl-invert row">
-  
-  <% index_fields(document).each do |field_name, field| -%>
+
+  <% doc_presenter.fields.each do |field_name, field| -%>
     <% if should_render_index_field? document, field %>
 	    <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
 	    <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field_name %></dd>

app/views/catalog/_show.html.erb

@@ -1,7 +1,7 @@
 <% doc_presenter = show_presenter(document) %>
 <%# default partial to display solr document fields in catalog show view -%>
 <dl class="row dl-invert document-metadata">
-  <% document_show_fields(document).each do |field_name, field| -%>
+  <% doc_presenter.fields.each do |field_name, field| -%>
     <% if should_render_show_field? document, field %>
 	    <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_document_show_field_label document, field: field_name %></dt>
 	    <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field_name %></dd>

app/views/catalog/index.json.jbuilder

@@ -18,7 +18,7 @@ json.data do
     json.attributes do
       doc_presenter = index_presenter(document)
 
-      index_fields(document).each do |field_name, field|
+      doc_presenter.fields.each do |field_name, field|
         next unless should_render_index_field? document, field
         json.set!(field_name) do
           json.id "#{document_url}##{field_name}"

app/views/catalog/show.json.jbuilder

@@ -10,7 +10,7 @@ json.data do
   json.attributes do
     doc_presenter = show_presenter(@document)
 
-    document_show_fields(@document).each do |field_name, field|
+    doc_presenter.fields.each do |field_name, field|
       if should_render_show_field? @document, field
         json.set! field_name, doc_presenter.field_value(field_name)
       end

lib/blacklight/configuration.rb

@@ -81,6 +81,7 @@ def default_values
           show: ViewConfig::Show.new(
             # document presenter class used by helpers and views
             document_presenter_class: nil,
+            display_type_field: 'format',
             # Default route parameters for 'show' requests.
             # Set this to a hash with additional arguments to merge into the route,
             # or set `controller: :current` to route to the current controller.
@@ -336,16 +337,30 @@ def add_nav_action(name, opts = {})
 
     ##
     # Add a section of config that only applies to documents with a matching display type
-    def for_display_type display_type, &block
+    def for_display_type display_type, &_block
       self.fields_for_type ||= {}
-      fields_for_type[display_type] ||= self.class.new(&block)
+
+      (fields_for_type[display_type] ||= self.class.new).tap do |conf|
+        yield(conf) if block_given?
+      end
     end
 
+    ##
+    # Return a list of fields for the index display that should be used for the
+    # provided document.  This respects any configuration made using for_display_type
     def index_fields_for(document)
       display_type = document.first(index.display_type_field)
       for_display_type(display_type).index_fields.merge(index_fields)
     end
 
+    ##
+    # Return a list of fields for the show page that should be used for the
+    # provided document.  This respects any configuration made using for_display_type
+    def show_fields_for(document)
+      display_type = document.first(show.display_type_field)
+      for_display_type(display_type).show_fields.merge(show_fields)
+    end
+
     private
 
     def add_action(config_hash, name, opts)

lib/generators/blacklight/templates/catalog_controller.rb

@@ -27,7 +27,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # solr field configuration for search results/index views
     config.index.title_field = 'title_tsim'
-    config.index.display_type_field = 'format'
+    #config.index.display_type_field = 'format'
     #config.index.thumbnail_field = 'thumbnail_path_ss'
 
     config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
@@ -194,7 +194,7 @@ class <%= controller_name.classify %>Controller < ApplicationController
     # Configuration for autocomplete suggestor
     config.autocomplete_enabled = true
     config.autocomplete_path = 'suggest'
-    # if the name of the solr.SuggestComponent provided in your solrcongig.xml is not the 
+    # if the name of the solr.SuggestComponent provided in your solrcongig.xml is not the
     # default 'mySuggester', uncomment and provide it below
     # config.autocomplete_suggester = 'mySuggester'
   end

spec/models/blacklight/configuration_spec.rb

@@ -84,11 +84,10 @@
   end
 
   describe "for_display_type" do
-    let(:mock_field) { Blacklight::Configuration::IndexField.new }
     let(:image) { SolrDocument.new(format: 'Image') }
     let(:sound) { SolrDocument.new(format: 'Sound') }
 
-    it "adds fields just for a certain type" do
+    it "adds index fields just for a certain type" do
       config.for_display_type "Image" do |c|
         c.add_index_field :dimensions
       end
@@ -100,6 +99,31 @@
       expect(config.index_fields_for(image)).to have_key 'title'
       expect(config.index_fields).not_to have_key 'dimensions'
     end
+
+    it "adds show fields just for a certain type" do
+      config.for_display_type "Image" do |c|
+        c.add_show_field :dimensions
+      end
+      config.add_show_field :title
+
+      expect(config.show_fields_for(image)).to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'title'
+      expect(config.show_fields_for(sound)).not_to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'title'
+      expect(config.show_fields).not_to have_key 'dimensions'
+    end
+
+    it 'calls the block on subsequent invocations' do
+      config.for_display_type "Image" do |c|
+        c.add_show_field :dimensions
+      end
+      config.for_display_type "Image" do |c|
+        c.add_show_field :photographer
+      end
+
+      expect(config.show_fields_for(image)).to have_key 'dimensions'
+      expect(config.show_fields_for(image)).to have_key 'photographer'
+    end
   end
 
   describe "inheritable_copy" do

spec/presenters/index_presenter_spec.rb → spec/presenters/blacklight/index_presenter_spec.rb

@@ -131,8 +131,6 @@
           args.first
         end
 
-        render_options = { a: 1 }
-
         options = subject.send(:field_values, field_config, a: 1)
 
         expect(options).to include :document, :field, :value, :config, :a
@@ -145,6 +143,18 @@
     end
   end
 
+  describe '#fields' do
+    let(:field) { instance_double(Blacklight::Configuration::Field) }
+
+    before do
+      allow(config).to receive(:index_fields_for).and_return(title: field)
+    end
+
+    it 'returns the list from the configs' do
+      expect(subject.fields).to eq(title: field)
+    end
+  end
+
   describe "#thumbnail" do
     subject { presenter.thumbnail }
 

spec/presenters/show_presenter_spec.rb → spec/presenters/blacklight/show_presenter_spec.rb

@@ -225,6 +225,18 @@ def mock_document_app_helper_url *args
     end
   end
 
+  describe '#fields' do
+    let(:field) { instance_double(Blacklight::Configuration::Field) }
+
+    before do
+      allow(config).to receive(:show_fields_for).and_return(title: field)
+    end
+
+    it 'returns the list from the configs' do
+      expect(subject.fields).to eq(title: field)
+    end
+  end
+
   describe "#heading" do
     it "falls back to an id" do
       allow(document).to receive(:[]).with('id').and_return "xyz"
@@ -282,8 +294,6 @@ def mock_document_app_helper_url *args
           args.first
         end
 
-        render_options = { a: 1 }
-
         options = subject.send(:field_values, field_config, a: 1)
 
         expect(options).to include :document, :field, :value, :config, :a