blacklight 5.8.2 → 5.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d10313f3002a4317d920835752d25639bf963a
-  data.tar.gz: 13ab0a0e6cdf3deaab7add1b8f0b4247b340b3c1
+  metadata.gz: fedd8110404760fccc7f451d8c48086a291ee6b5
+  data.tar.gz: 7576a604fa84a87d1c09b4cbede4715eaf28adf8
 SHA512:
-  metadata.gz: 32b593b6bfd432d4fe5fafdbd93d9269f9f63371c963869a086e8914aeb07771996f9660a80208379e6269195a015d8d3d1b0e78d18edcd168ad74d1fa7ab585
-  data.tar.gz: 9632e817084e378269456a84e930ecf0f1fbc95e12b62eb89d277b03fafd8c5b390af304d5409abf85b259284dc096485a25b085dd897a36badfc52076172231
+  metadata.gz: b3fba026879c4a1f690d2998581eec9e89f4cdf9e93d5785b1d23270a2fd67a5e6792122df90c49fb7be802c50ee6a5449f2377a6523c26643ed2c4021d1f963
+  data.tar.gz: 1206489a87d12d763df09ca14b0490860530983b754d3c7c6523f90e7abd5bcf015d3d5fc0384ff638df63e944b15b172d235dc14f2279a058f6b08287b51e09

data/VERSION

@@ -1 +1 @@
-5.8.2
+5.9.0

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

@@ -164,13 +164,13 @@ label.toggle_bookmark
   padding-bottom: $padding-base-vertical;
 }
 
-#sortAndPerPage, #previousNextDocument {
+#sortAndPerPage, .pagination-search-widgets {
   border-bottom: 1px solid $pagination-border;
   margin-bottom: 1em;
   padding-bottom: 1em;
 }
 
-#previousNextDocument {
+.pagination-search-widgets {
   @extend .clearfix;
   padding-top: 1px;
   padding-bottom: $padding-base-vertical;

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -272,7 +272,7 @@ module Blacklight::BlacklightHelperBehavior
   #   @options options [Symbol] :tag
   def render_document_heading(*args)
     options = args.extract_options!
-    if args.first.is_a? SolrDocument
+    if args.first.is_a? blacklight_config.solr_document_model
       document = args.shift
       tag = options[:tag]
     else

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -78,7 +78,7 @@ module Blacklight::CatalogHelperBehavior
   #
   # @return [Blacklight::Configuration::SortField]
   def current_sort_field
-    blacklight_config.sort_fields[params[:sort]] || default_sort_field
+    (blacklight_config.sort_fields.values.find {|f| f.sort == @response.sort} if @response and @response.sort.present?) || blacklight_config.sort_fields[params[:sort]] || default_sort_field
   end
 
   ##

data/app/helpers/blacklight/configuration_helper_behavior.rb

@@ -138,7 +138,14 @@ module Blacklight::ConfigurationHelperBehavior
 
   # Used in the document list partial (search view) for creating a link to the document show action
   def document_show_link_field document=nil
-    blacklight_config.view_config(document_index_view_type).title_field.try(:to_sym) || document.id
+    fields = Array(blacklight_config.view_config(document_index_view_type).title_field)
+
+    field = fields.first if document.nil?
+    field ||= fields.find { |f| document.has? f }
+    field &&= field.try(:to_sym)
+    field ||= document.id
+
+    field
   end
 
   ##

data/app/views/catalog/_document_default.atom.builder

@@ -0,0 +1,56 @@
+xml.entry do
+  
+  
+  xml.title   document.to_semantic_values[:title][0] || presenter(document).render_document_index_label(document_show_link_field(document))
+  
+  # updated is required, for now we'll just set it to now, sorry
+  xml.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
+  
+  xml.link    "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(url_for_document(document))
+  # add other doc-specific formats, atom only lets us have one per
+  # content type, so the first one in the list wins.
+  xml << render_link_rel_alternates(document, :unique => true)      
+  
+  xml.id polymorphic_url(url_for_document(document))
+  
+  
+  if document.to_semantic_values[:author][0]   
+    xml.author { xml.name(document.to_semantic_values[:author][0]) }
+  end
+  
+  with_format("html") do
+    xml.summary "type" => "html" do
+      xml.text! render_document_partial(document,
+      :index,
+      :document_counter => document_counter)
+    end
+  end
+  
+  #If they asked for a format, give it to them. 
+  if (params["content_format"] &&
+    document.export_formats[params["content_format"].to_sym])
+    
+    type = document.export_formats[params["content_format"].to_sym][:content_type]
+    
+    xml.content :type => type do |content_element|
+      data = document.export_as(params["content_format"])
+      
+      # encode properly. See:
+      # http://tools.ietf.org/html/rfc4287#section-4.1.3.3
+      type = type.downcase
+      if (type.downcase =~ /\+|\/xml$/)
+        # xml, just put it right in              
+        content_element << data
+      elsif (type.downcase =~ /text\//)
+        # text, escape
+        content_element.text! data
+      else
+        #something else, base64 encode it
+        content_element << Base64.encode64(data)
+      end
+    end
+    
+  end
+  
+  
+end

data/app/views/catalog/_document_default.rss.builder

@@ -0,0 +1,5 @@
+xml.item do  
+  xml.title( document.to_semantic_values[:title][0] || presenter(document).render_document_index_label(document_show_link_field(document)) )                              
+  xml.link(polymorphic_url(url_for_document(document)))                                   
+  xml.author( document.to_semantic_values[:author][0] ) if document.to_semantic_values[:author][0]       
+end

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

@@ -1,18 +1,20 @@
 <% #Using the Bootstrap Pagination class  -%>
-<% if @previous_document || @next_document %>
-	<div id="previousNextDocument">
+<% #DEPRECATED - using id="previousNextDocument" as a selector is deprecated and will be removed in Blacklight 6.0 %>
+<div id='previousNextDocument' class='pagination-search-widgets'>
+  <% if @previous_document || @next_document %>
     <div class="page_links">
       <%= link_to_previous_document @previous_document %> |
 
       <%= item_page_entry_info %> |
 
       <%= link_to_next_document @next_document %>
-      </div>
-
+    </div>
+  <% end %>
+  <% if current_search_session %>
     <div class="pull-right search-widgets">
-        <%= link_back_to_catalog :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 %>
+      <%= link_back_to_catalog class: 'btn' %>
+
+      <%=link_to t('blacklight.search.start_over'), start_over_path(current_search_session.try(:query_params) || {}), id: 'startOverLink', class: 'btn' %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,4 +1,4 @@
-  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix navbar-form' do %>
+  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form clearfix navbar-form' do %>
     <%= render_hash_as_hidden_fields(params_for_search().except(:q, :search_field, :qt, :page, :utf8)) %>
 
     <% unless search_fields.empty? %>
@@ -7,8 +7,8 @@
       <span class="sr-only"><%= t('blacklight.search.form.search_field.post_label') %></span>
     <% end %>
     <div class="input-group search-input-group">
-        <label for="q" class="sr-only"><%= t('blacklight.search.form.q') %></label>
-         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
+        <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
+         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.search.placeholder'), :class => "search_q q form-control", :id => "q", :autofocus => should_autofocus_on_search_box? %>
 
       <span class="input-group-btn">
         <button type="submit" class="btn btn-primary search-btn" id="search">

data/app/views/catalog/index.atom.builder

@@ -45,63 +45,9 @@ xml.feed("xmlns" => "http://www.w3.org/2005/Atom",
   # updated is required, for now we'll just set it to now, sorry
   xml.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
   
-  @document_list.each_with_index do |doc, document_counter|
-    xml.entry do
-      xml.title   doc.to_semantic_values[:title][0] || doc.id
-
-      # updated is required, for now we'll just set it to now, sorry
-      xml.updated Time.now.strftime("%Y-%m-%dT%H:%M:%SZ")
-      
-      xml.link    "rel" => "alternate", "type" => "text/html", "href" => polymorphic_url(doc)
-      # add other doc-specific formats, atom only lets us have one per
-      # content type, so the first one in the list wins.
-      xml << render_link_rel_alternates(doc, :unique => true)      
-      
-      xml.id      polymorphic_url(doc)
-      
-      
-      if doc.to_semantic_values[:author][0]   
-        xml.author { xml.name(doc.to_semantic_values[:author][0]) }
-      end
-      
-      with_format("html") do
-        xml.summary "type" => "html" do
-          xml.text! render_document_partial(doc,
-                                            :index,
-                                            :document_counter => document_counter)
-        end
-      end
-      
-      #If they asked for a format, give it to them. 
-      if (params["content_format"] &&
-          doc.export_formats[params["content_format"].to_sym])
-          
-          type = doc.export_formats[params["content_format"].to_sym][:content_type]
-          
-          xml.content :type => type do |content_element|
-            data = doc.export_as(params["content_format"])
-                    
-            # encode properly. See:
-            # http://tools.ietf.org/html/rfc4287#section-4.1.3.3
-            type = type.downcase
-            if (type.downcase =~ /\+|\/xml$/)
-              # xml, just put it right in              
-              content_element << data
-            elsif (type.downcase =~ /text\//)
-              # text, escape
-              content_element.text! data
-            else
-              #something else, base64 encode it
-              content_element << Base64.encode64(data)
-            end
-          end
-          
-      end
-
-      
-    end
+  @document_list.each_with_index do |document, document_counter|
+    xml << Nokogiri::XML.fragment(render_document_partials(document, blacklight_config.view_config(:atom).partials, document_counter: document_counter))
   end
-
 end
 
 

data/app/views/catalog/index.rss.builder

@@ -7,12 +7,8 @@ xml.rss(:version=>"2.0") {
     xml.link(search_action_url(params))
     xml.description(t('blacklight.search.title', :application_name => application_name))
     xml.language('en-us')
-    @document_list.each do |doc|
-      xml.item do  
-        xml.title( doc.to_semantic_values[:title][0] || doc.id )                              
-        xml.link(polymorphic_url(doc))                                   
-        xml.author( doc.to_semantic_values[:author][0] ) if doc.to_semantic_values[:author][0]       
-      end
+    @document_list.each_with_index do |document, document_counter|
+      xml << Nokogiri::XML.fragment(render_document_partials(document, blacklight_config.view_config(:rss).partials, document_counter: document_counter))
     end
           
   }

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

@@ -7,6 +7,9 @@
     <!-- Mobile viewport optimization h5bp.com/ad -->
     <meta name="HandheldFriendly" content="True">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    
+    <!-- Internet Explorer use the highest version available -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
     <!--[if IEMobile]>

data/config/locales/blacklight.de.yml

@@ -158,7 +158,11 @@ de:
           label: 'Suchen in'
           title: 'gezeilte Suchoptionen'
           post_label: 'für'
+        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
         q: 'Suchen...'
+        search:
+          label: 'suchen nach'
+          placeholder: 'Suchen...'
         submit: 'Suchen'
       pagination:
         title: 'Ergebnisse Navigation'

data/config/locales/blacklight.en.yml

@@ -158,7 +158,11 @@ en:
           label: 'Search in'
           title: 'Targeted search options'
           post_label: 'for'
+        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
         q: 'Search...'
+        search:
+          label: 'search for'
+          placeholder: 'Search...'
         submit: 'Search'
       pagination:
         title: 'Results navigation'

data/config/locales/blacklight.es.yml

@@ -158,7 +158,11 @@ es:
           label: 'Buscar en'
           title: 'Opciones de Búsqueda temática'
           post_label: 'para'
+        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
         q: 'Buscar...'
+        search:
+          label: 'buscar'
+          placeholder: 'Buscar...'
         submit: 'Buscar'
       pagination:
         title: 'Resultados de navegación'

data/config/locales/blacklight.fr.yml

@@ -171,7 +171,11 @@ fr:
           label: 'dans'
           title: 'Options de recherche'
         post_label: 'pour'
+        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
         q: 'Rechercher '
+        search:
+          label: 'Rechercher'
+          placeholder: 'Rechercher'
         submit: 'Chercher'
       pagination:
         title: 'Navigation dans les résultats'

data/config/locales/blacklight.pt-BR.yml

@@ -178,7 +178,11 @@ pt-BR:
           label: 'Procurar em'
           title: 'Opções da Busca'
           post_label: 'por'
+        # i18n key 'q' is deprecated and will be removed in Blacklight 6.0, use 'search.label' and 'search.placeholder'
         q: 'Busca...'
+        search:
+          label: 'busca'
+          placeholder: 'Busca...'
         submit: 'Buscar'
       pagination:
         title: 'Navegação nos Resultados'

data/lib/blacklight/configuration.rb

@@ -78,7 +78,16 @@ module Blacklight
           ),
           :navbar => OpenStructWithHashAccess.new(partials: { }),
           # Configurations for specific types of index views
-          :view => NestedOpenStructWithHashAccess.new(ViewConfig, 'list'),
+          :view => NestedOpenStructWithHashAccess.new(ViewConfig,
+            'list',
+            atom: {
+              if: false, # by default, atom should not show up as an alternative view
+              partials: [:document]
+            },
+            rss: {
+              if: false, # by default, rss should not show up as an alternative view
+              partials: [:document]
+          }),
           # Maxiumum number of spelling suggestions to offer
           :spell_max => 5,
           # Maximum number of results to show per page

data/lib/blacklight/document_presenter.rb

@@ -20,7 +20,14 @@ module Blacklight
     # @param [SolrDocument] document
     # @return [String]
     def document_heading
-      render_field_value(@document[@configuration.view_config(:show).title_field] || @document.id)
+      fields = Array(@configuration.view_config(:show).title_field)
+      f = fields.find { |field| @document.has? field }
+
+      if f.nil?
+        render_field_value(@document.id)
+      else
+        render_field_value(@document[f])
+      end
     end
 
     ##
@@ -31,7 +38,14 @@ module Blacklight
     # @return [String]
     def document_show_html_title
       if @configuration.view_config(:show).html_title_field
-        render_field_value(@document[@configuration.view_config(:show).html_title_field])
+        fields = Array(@configuration.view_config(:show).html_title_field)
+        f = fields.find { |field| @document.has? field }
+
+        if f.nil?
+          render_field_value(@document.id)
+        else
+          render_field_value(@document[f])
+        end
       else
         document_heading
       end

data/lib/blacklight/solr_response.rb

@@ -41,6 +41,10 @@ class Blacklight::SolrResponse < HashWithIndifferentAccess
       params[:rows].to_i
   end
 
+  def sort
+    params[:sort]
+  end
+
   def docs
     @docs ||= begin
       response['docs'] || []

data/spec/features/search_context_spec.rb

@@ -8,12 +8,12 @@ describe "Search Results context", js: true do
     search_id =  Search.last.id.to_s
     click_on 'Pluvial nectar of blessings'
     expect(page).to have_content "« Previous | 10 of 30 | Next »"
-    prev = page.find("#previousNextDocument .previous")
+    prev = page.find(".pagination-search-widgets .previous")
     expect(prev['data-context-href']).to eq "/catalog/2003546302/track?counter=9&search_id=#{search_id}"
 
     click_on "« Previous"
 
-    prev = page.find("#previousNextDocument .previous")
+    prev = page.find(".pagination-search-widgets .previous")
     expect(prev['data-context-href']).to eq "/catalog/2004310986/track?counter=8&search_id=#{search_id}"
   end
   
@@ -23,6 +23,15 @@ describe "Search Results context", js: true do
     expect(page).to have_content "« Previous | 1 of 30 | Next »"
     expect(page.current_url).to_not have_content "/track"
   end
+
+  it 'should show "Back to Search" and "Start Over links"' do
+    search_for 'Bod kyi naṅ chos ṅo sprod sñiṅ bsdus'
+    first('.index_title a').click
+    within '.pagination-search-widgets' do
+      expect(page).to have_css 'a', text: 'Back to Search'
+      expect(page).to have_css 'a', text: 'Start Over'
+    end
+  end
   
   context "navigating between search results using context pagination" do
     it "should update the back to search link with the current search pagination context" do

data/spec/helpers/configuration_helper_spec.rb

@@ -88,6 +88,28 @@ describe BlacklightConfigurationHelper do
     end
   end
 
+  describe "#document_show_link_field" do
+    let(:document) { SolrDocument.new id: 123, a: 1, b: 2, c: 3 }
+
+    it "should allow single values" do
+      blacklight_config.index.title_field = :a
+      f = helper.document_show_link_field document
+      expect(f).to eq :a
+    end
+    
+    it "should retrieve the first field with data" do
+      blacklight_config.index.title_field = [:zzz, :b]
+      f = helper.document_show_link_field document
+      expect(f).to eq :b
+    end
+
+    it "should fallback on the id" do
+      blacklight_config.index.title_field = [:zzz, :yyy]
+      f = helper.document_show_link_field document
+      expect(f).to eq 123
+    end
+  end
+
   describe "#index_field_label" do
     let(:document) { double }
     it "should look up the label to display for the given document and field" do

data/spec/lib/blacklight/solr_response_spec.rb

@@ -130,13 +130,15 @@ describe Blacklight::SolrResponse do
     raw_response = eval(mock_query_response)
     r = Blacklight::SolrResponse.new(raw_response, {})
     expect(r.params[:rows].to_s).to eq '11'
+    expect(r.params[:sort]).to eq 'title_sort asc, pub_date_sort desc'
   end
 
   it 'should provide the ruby request params if responseHeader["params"] does not exist' do
     raw_response = eval(mock_query_response)
     raw_response.delete 'responseHeader'
-    r = Blacklight::SolrResponse.new(raw_response, :rows => 999)
+    r = Blacklight::SolrResponse.new(raw_response, :rows => 999, :sort => 'score desc, pub_date_sort desc, title_sort asc')
     expect(r.params[:rows].to_s).to eq '999'
+    expect(r.params[:sort]).to eq 'score desc, pub_date_sort desc, title_sort asc'
   end
 
   it 'should provide spelling suggestions for regular spellcheck results' do
@@ -193,7 +195,7 @@ describe Blacklight::SolrResponse do
   end
 
   def mock_query_response
-    %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['cat','manu'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2009-03-20T14:42:49.795Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2],'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2]},'facet_dates'=>{}}})
+    %({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'facet.limit'=>'10','wt'=>'ruby','rows'=>'11','facet'=>'true','facet.field'=>['cat','manu'],'echoParams'=>'EXPLICIT','q'=>'*:*','facet.sort'=>'true', 'sort'=>'title_sort asc, pub_date_sort desc'}},'response'=>{'numFound'=>26,'start'=>0,'docs'=>[{'id'=>'SP2514N','inStock'=>true,'manu'=>'Samsung Electronics Co. Ltd.','name'=>'Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133','popularity'=>6,'price'=>92.0,'sku'=>'SP2514N','timestamp'=>'2009-03-20T14:42:49.795Z','cat'=>['electronics','hard drive'],'spell'=>['Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133'],'features'=>['7200RPM, 8MB cache, IDE Ultra ATA-133','NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor']},{'id'=>'6H500F0','inStock'=>true,'manu'=>'Maxtor Corp.','name'=>'Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300','popularity'=>6,'price'=>350.0,'sku'=>'6H500F0','timestamp'=>'2009-03-20T14:42:49.877Z','cat'=>['electronics','hard drive'],'spell'=>['Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300'],'features'=>['SATA 3.0Gb/s, NCQ','8.5ms seek','16MB cache']},{'id'=>'F8V7067-APL-KIT','inStock'=>false,'manu'=>'Belkin','name'=>'Belkin Mobile Power Cord for iPod w/ Dock','popularity'=>1,'price'=>19.95,'sku'=>'F8V7067-APL-KIT','timestamp'=>'2009-03-20T14:42:49.937Z','weight'=>4.0,'cat'=>['electronics','connector'],'spell'=>['Belkin Mobile Power Cord for iPod w/ Dock'],'features'=>['car power adapter, white']},{'id'=>'IW-02','inStock'=>false,'manu'=>'Belkin','name'=>'iPod & iPod Mini USB 2.0 Cable','popularity'=>1,'price'=>11.5,'sku'=>'IW-02','timestamp'=>'2009-03-20T14:42:49.944Z','weight'=>2.0,'cat'=>['electronics','connector'],'spell'=>['iPod & iPod Mini USB 2.0 Cable'],'features'=>['car power adapter for iPod, white']},{'id'=>'MA147LL/A','inStock'=>true,'includes'=>'earbud headphones, USB cable','manu'=>'Apple Computer Inc.','name'=>'Apple 60 GB iPod with Video Playback Black','popularity'=>10,'price'=>399.0,'sku'=>'MA147LL/A','timestamp'=>'2009-03-20T14:42:49.962Z','weight'=>5.5,'cat'=>['electronics','music'],'spell'=>['Apple 60 GB iPod with Video Playback Black'],'features'=>['iTunes, Podcasts, Audiobooks','Stores up to 15,000 songs, 25,000 photos, or 150 hours of video','2.5-inch, 320x240 color TFT LCD display with LED backlight','Up to 20 hours of battery life','Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video','Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication']},{'id'=>'TWINX2048-3200PRO','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail','popularity'=>5,'price'=>185.0,'sku'=>'TWINX2048-3200PRO','timestamp'=>'2009-03-20T14:42:49.99Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR  XMS 2GB (2 x 1GB) 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) Dual Channel Kit System Memory - Retail'],'features'=>['CAS latency 2,	2-3-3-6 timing, 2.75v, unbuffered, heat-spreader']},{'id'=>'VS1GB400C3','inStock'=>true,'manu'=>'Corsair Microsystems Inc.','name'=>'CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail','popularity'=>7,'price'=>74.99,'sku'=>'VS1GB400C3','timestamp'=>'2009-03-20T14:42:50Z','cat'=>['electronics','memory'],'spell'=>['CORSAIR ValueSelect 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - Retail']},{'id'=>'VDBDB1A16','inStock'=>true,'manu'=>'A-DATA Technology Inc.','name'=>'A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM','popularity'=>5,'sku'=>'VDBDB1A16','timestamp'=>'2009-03-20T14:42:50.004Z','cat'=>['electronics','memory'],'spell'=>['A-DATA V-Series 1GB 184-Pin DDR SDRAM Unbuffered DDR 400 (PC 3200) System Memory - OEM'],'features'=>['CAS latency 3,	 2.7v']},{'id'=>'3007WFP','inStock'=>true,'includes'=>'USB cable','manu'=>'Dell, Inc.','name'=>'Dell Widescreen UltraSharp 3007WFP','popularity'=>6,'price'=>2199.0,'sku'=>'3007WFP','timestamp'=>'2009-03-20T14:42:50.017Z','weight'=>401.6,'cat'=>['electronics','monitor'],'spell'=>['Dell Widescreen UltraSharp 3007WFP'],'features'=>['30" TFT active matrix LCD, 2560 x 1600, .25mm dot pitch, 700:1 contrast']},{'id'=>'VA902B','inStock'=>true,'manu'=>'ViewSonic Corp.','name'=>'ViewSonic VA902B - flat panel display - TFT - 19"','popularity'=>6,'price'=>279.95,'sku'=>'VA902B','timestamp'=>'2009-03-20T14:42:50.034Z','weight'=>190.4,'cat'=>['electronics','monitor'],'spell'=>['ViewSonic VA902B - flat panel display - TFT - 19"'],'features'=>['19" TFT active matrix LCD, 8ms response time, 1280 x 1024 native resolution']},{'id'=>'0579B002','inStock'=>true,'manu'=>'Canon Inc.','name'=>'Canon PIXMA MP500 All-In-One Photo Printer','popularity'=>6,'price'=>179.99,'sku'=>'0579B002','timestamp'=>'2009-03-20T14:42:50.062Z','weight'=>352.0,'cat'=>['electronics','multifunction printer','printer','scanner','copier'],'spell'=>['Canon PIXMA MP500 All-In-One Photo Printer'],'features'=>['Multifunction ink-jet color photo printer','Flatbed scanner, optical scan resolution of 1,200 x 2,400 dpi','2.5" color LCD preview screen','Duplex Copying','Printing speed up to 29ppm black, 19ppm color','Hi-Speed USB','memory card: CompactFlash, Micro Drive, SmartMedia, Memory Stick, Memory Stick Pro, SD Card, and MultiMediaCard']}]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'cat'=>['electronics',14,'memory',3,'card',2,'connector',2,'drive',2,'graphics',2,'hard',2,'monitor',2,'search',2,'software',2],'manu'=>['inc',8,'apach',2,'belkin',2,'canon',2,'comput',2,'corp',2,'corsair',2,'foundat',2,'microsystem',2,'softwar',2]},'facet_dates'=>{}}})
   end
 
   # These spellcheck responses are all Solr 1.4 responses

data/spec/lib/document_presenter_spec.rb

@@ -213,4 +213,48 @@ describe Blacklight::DocumentPresenter do
       expect(subject.render_field_value('a', double(:separator => nil, :itemprop => 'some-prop'))).to have_selector("span[@itemprop='some-prop']", :text => "a") 
     end
   end
+
+  describe "#document_heading" do
+    it "should fallback to an id" do
+      allow(document).to receive(:id).and_return "xyz"
+      expect(subject.document_heading).to eq document.id
+    end
+
+    it "should return the value of the field" do
+      config.show.title_field = :x
+      allow(document).to receive(:has?).with(:x).and_return(true)
+      allow(document).to receive(:[]).with(:x).and_return("value")
+      expect(subject.document_heading).to eq "value"
+    end
+
+    it "should return the first present value" do
+      config.show.title_field = [:x, :y]
+      allow(document).to receive(:has?).with(:x).and_return(false)
+      allow(document).to receive(:has?).with(:y).and_return(true)
+      allow(document).to receive(:[]).with(:y).and_return("value")
+      expect(subject.document_heading).to eq "value"
+    end
+  end
+
+  describe "#document_show_html_title" do
+    it "should fallback to an id" do
+      allow(document).to receive(:id).and_return "xyz"
+      expect(subject.document_show_html_title).to eq document.id
+    end
+
+    it "should return the value of the field" do
+      config.show.html_title_field = :x
+      allow(document).to receive(:has?).with(:x).and_return(true)
+      allow(document).to receive(:[]).with(:x).and_return("value")
+      expect(subject.document_show_html_title).to eq "value"
+    end
+
+    it "should return the first present value" do
+      config.show.html_title_field = [:x, :y]
+      allow(document).to receive(:has?).with(:x).and_return(false)
+      allow(document).to receive(:has?).with(:y).and_return(true)
+      allow(document).to receive(:[]).with(:y).and_return("value")
+      expect(subject.document_show_html_title).to eq "value"
+    end
+  end
 end

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

@@ -13,6 +13,7 @@ describe "catalog/show.html.erb" do
   before :each do
     allow(view).to receive_messages(:has_user_authentication_provider? => false)
     allow(view).to receive_messages(:render_document_sidebar_partial => "Sidebar")
+    allow(view).to receive_messages(current_search_session: nil)
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.8.2
+  version: 5.9.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -323,6 +323,8 @@ files:
 - app/views/catalog/_did_you_mean.html.erb
 - app/views/catalog/_document.html.erb
 - app/views/catalog/_document_action.html.erb
+- app/views/catalog/_document_default.atom.builder
+- app/views/catalog/_document_default.rss.builder
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facet_layout.html.erb
@@ -574,7 +576,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)