blacklight 5.0.0.pre1 → 5.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5631f0f750bdf8d5e7976d0b0a771537d1aa06d6
-  data.tar.gz: bbacc4edb12e35515e736b2c9affcae1f77be44a
+  metadata.gz: c7f3074193519ca823f3af1b5db3d88b3cd42ce0
+  data.tar.gz: 478b01d0e5292996ed40da54ce6fe5a7e1258f60
 SHA512:
-  metadata.gz: be0707d62ef0c9a16c9a16d5de6bc621f4e1ea4bfb1528a7a8731c71ccf94f76ec7728d4d7b67b38ee5c91ddf4d082019922dce72f72db4286d440f5ad6a2307
-  data.tar.gz: 9b3b49fa307537ba8e5efee64a683292641a6d9477795e54b038a7d493bb74e205d239f3bfd1f5bbef3a27861737ece82d102c582857577d91c77f2d8024714b
+  metadata.gz: 4502e598ed76de63d1a36ecffdb2f19b1b5e8c93f6a56ec7fbfb077b30cb56fdf56859368c401c2003bc45bd272d88b3542c2a320b368828e93d490a6cddc1f7
+  data.tar.gz: 7f77de71e7536ebf916dc24a46152b43cd458f1a9d77c1127f9e38720ba85c09f6ad00b8568fdbcb5ae20f8638f36f77aa586c4ad93795313371d8c4d46c289f

data/.travis.yml

@@ -10,10 +10,6 @@ rvm:
 before_install:
   - gem install bundler 
 
-matrix:
-  allow_failures:
-    - rvm: 2.1.0
-
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile

data/VERSION

@@ -1 +1 @@
-5.0.0.pre1
+5.0.0.pre2

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

@@ -2,3 +2,7 @@
 #refworks-form .btn {
   padding: $nav-link-padding;
 }
+
+.clear-bookmarks {
+  margin-left: 4px;
+}

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

@@ -82,15 +82,6 @@ span.constraints-label {
     padding-top: $padding-base-vertical;
     border-bottom:1px dotted $table-border-color;
   }
-
-  .documentFunctions {
-    @extend .pull-right;
-
-    .bookmark_toggle
-    {
-      display:inline;
-    }
-  }
 } 
 
 // Tools link on documetn show page
@@ -100,6 +91,15 @@ span.constraints-label {
   }
 }
 
+// bookmarks checkbox on index, give it some
+// lower margin when it collapses
+.index-document-functions {
+  margin-bottom: ($line-height-computed / 2);
+  @media (min-width: $screen-sm-min) {
+    margin-bottom: 0;
+  }
+}
+
 
 #sidebar form {
   margin: 0;
@@ -182,10 +182,6 @@ label.toggle_bookmark
 
 }
 
-.index_title {
-  float: left;
-}
-
 .document-thumbnail {
   float: right;
   padding-left: 20px;

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -72,12 +72,12 @@ module Blacklight::BlacklightHelperBehavior
   # Save function area for search results 'index' view, normally
   # renders next to title.
   def render_index_doc_actions(document, options={})
-    wrapping_class = options.delete(:wrapping_class) || "documentFunctions"
+    wrapping_class = options.delete(:wrapping_class) || "index-document-functions"
 
     content = []
     content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if render_bookmarks_control?
 
-    content_tag("div", safe_join(content, "\n".html_safe), :class=> wrapping_class)
+    content_tag("div", safe_join(content, "\n"), :class=> wrapping_class)
   end
 
   # Save function area for item detail 'show' view, normally
@@ -90,7 +90,7 @@ module Blacklight::BlacklightHelperBehavior
     content = []
     content << render(:partial => 'catalog/bookmark_control', :locals => {:document=> document}.merge(options)) if render_bookmarks_control?
 
-    content_tag("div", safe_join(content, "\n".html_safe), :class=> wrapping_class)
+    content_tag("div", safe_join(content, "\n"), :class=> wrapping_class)
   end
 
   ##
@@ -189,7 +189,7 @@ module Blacklight::BlacklightHelperBehavior
 
     tag ||= :h4
 
-    content_tag(tag, render_field_value(document_heading(document)))
+    content_tag(tag, render_field_value(document_heading(document)), :itemprop => "name")
   end
 
   # Used in the show view for setting the main html document title
@@ -316,6 +316,11 @@ module Blacklight::BlacklightHelperBehavior
 
   def render_field_value value=nil, field_config=nil
     safe_values = Array(value).collect { |x| x.respond_to?(:force_encoding) ? x.force_encoding("UTF-8") : x }
+
+    if field_config and field_config.itemprop
+      safe_values = safe_values.map { |x| content_tag :span, x, :itemprop => field_config.itemprop }
+    end
+
     safe_join(safe_values, (field_config.separator if field_config) || field_value_separator)
   end
 
@@ -371,6 +376,12 @@ module Blacklight::BlacklightHelperBehavior
     "#{display_type.gsub("-"," ")}".parameterize("_").to_s
   end
 
+  def render_document_partials(doc, actions = [], locals ={})
+    safe_join(actions.map do |action_name|
+      render_document_partial(doc, action_name, locals)
+    end, "\n")
+  end
+
   # given a doc and action_name, this method attempts to render a partial template
   # based on the value of doc[:format]
   # if this value is blank (nil/empty) the "default" is used
@@ -405,11 +416,6 @@ module Blacklight::BlacklightHelperBehavior
     link_to(raw(render_search_to_s(params)), catalog_index_path(params)).html_safe
   end
 
-  #
-  # shortcut for built-in Rails helper, "number_with_delimiter"
-  #
-  def format_num(num); number_with_delimiter(num) end
-
   #
   # link based helpers ->
   #

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -1,13 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Blacklight::CatalogHelperBehavior
 
-  # Pass in an RSolr::Response (or duck-typed similar) object,
-  # it translates to a Kaminari-paginatable
-  # object, with the keys Kaminari views expect.
-  def paginate_params(response)
-    response
-  end
-
   # 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
@@ -17,11 +10,6 @@ module Blacklight::CatalogHelperBehavior
     paginate response, options, &block
   end
 
-  #
-  # shortcut for built-in Rails helper, "number_with_delimiter"
-  #
-  def format_num(num); number_with_delimiter(num) end
-
   # Override the Kaminari page_entries_info helper with our own, blacklight-aware
   # implementation
   #
@@ -30,9 +18,9 @@ module Blacklight::CatalogHelperBehavior
     entry_name = if options[:entry_name]
       options[:entry_name]
     elsif collection.respond_to? :model  # DataMapper
-        collection.model.model_name.humanize.downcase
+        collection.model.model_name.human.downcase
     elsif collection.respond_to? :model_name and !collection.model_name.nil? # AR, Blacklight::PaginationMethods
-        collection.model_name.humanize.downcase
+        collection.model_name.human.downcase
     elsif collection.is_a?(::Kaminari::PaginatableArray)
       'entry'
     else
@@ -49,15 +37,15 @@ module Blacklight::CatalogHelperBehavior
     end
 
     end_num = if collection.offset_value + end_num <= collection.total_count
-      format_num(collection.offset_value + end_num)
+      collection.offset_value + end_num
     else
-      format_num(collection.total_count)
+      collection.total_count
     end
       
     case collection.total_count
       when 0; t('blacklight.search.pagination_info.no_items_found', :entry_name => entry_name ).html_safe
       when 1; t('blacklight.search.pagination_info.single_item_found', :entry_name => entry_name).html_safe
-      else; t('blacklight.search.pagination_info.pages', :entry_name => entry_name, :current_page => collection.current_page, :num_pages => collection.total_pages, :start_num => format_num(collection.offset_value + 1) , :end_num => end_num, :total_num => collection.total_count, :count => collection.total_pages).html_safe
+      else; t('blacklight.search.pagination_info.pages', :entry_name => entry_name, :current_page => collection.current_page, :num_pages => collection.total_pages, :start_num => number_with_delimiter(collection.offset_value + 1) , :end_num => number_with_delimiter(end_num), :total_num => number_with_delimiter(collection.total_count), :count => collection.total_pages).html_safe
     end
   end
 
@@ -73,7 +61,7 @@ module Blacklight::CatalogHelperBehavior
   # Code should call this method rather than interrogating session directly,
   # because implementation of where this data is stored/retrieved may change.
   def item_page_entry_info
-    t('blacklight.search.entry_pagination_info.other', :current => format_num(search_session[:counter]), :total => format_num(search_session[:total]), :count => search_session[:total].to_i).html_safe
+    t('blacklight.search.entry_pagination_info.other', :current => number_with_delimiter(search_session[:counter]), :total => number_with_delimiter(search_session[:total]), :count => search_session[:total].to_i).html_safe
   end
 
   # Look up search field user-displayable label
@@ -109,14 +97,13 @@ module Blacklight::CatalogHelperBehavior
 
   def show_sort_and_per_page? response = nil
     response ||= @response
-    response.total > 1
+    !response.empty?
   end
 
   def should_autofocus_on_search_box?
     controller.is_a? Blacklight::Catalog and
       action_name == "index" and
-      params[:q].to_s.empty? and
-      params[:f].to_s.empty?
+      !has_search_parameters?
   end
 
   def has_thumbnail? document
@@ -145,8 +132,4 @@ module Blacklight::CatalogHelperBehavior
   def add_group_facet_params_and_redirect group
     add_facet_params_and_redirect(group.field, group.key)
   end
-
-  def response_has_no_search_results?
-    @response.total == 0 
-  end
 end

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -10,7 +10,7 @@ module Blacklight::FacetsHelperBehavior
   def render_facet_partials fields = facet_field_names, options = {}
     safe_join(facets_from_request(fields).map do |display_facet|
       render_facet_limit(display_facet, options)
-    end.compact, "\n".html_safe)
+    end.compact, "\n")
   end
 
 

data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb

@@ -24,7 +24,7 @@ module Blacklight::HashAsHiddenFieldsHelperBehavior
       end
     end
     
-    safe_join(hidden_fields, "\n".html_safe)
+    safe_join(hidden_fields, "\n")
   end
 
   protected

data/app/helpers/blacklight/render_constraints_helper_behavior.rb

@@ -43,7 +43,7 @@ module Blacklight::RenderConstraintsHelperBehavior
        content << render_filter_element(facet, values, localized_params)
      end
 
-     safe_join(content.flatten, "\n".html_safe)    
+     safe_join(content.flatten, "\n")    
   end
 
   def render_filter_element(facet, values, localized_params)
@@ -55,7 +55,7 @@ module Blacklight::RenderConstraintsHelperBehavior
                   :remove => url_for(remove_facet_params(facet, val, localized_params)),
                   :classes => ["filter", "filter-" + facet.parameterize]
                 )
-    end, "\n".html_safe)
+    end, "\n")
   end
 
   # Render a label/value constraint on the screen. Can be called

data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb

@@ -35,7 +35,7 @@ module Blacklight::SearchHistoryConstraintsHelperBehavior
           render_filter_value(value, facet_field)
         end, content_tag(:span, " #{t('blacklight.and')} ", :class =>'filterSeparator'))
       )    
-    end, " \n ".html_safe)
+    end, " \n ")
   end
 
   # value can be Array, in which case elements are joined with

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

@@ -9,7 +9,7 @@
 
   <h3><%= t('blacklight.bookmarks.no_bookmarks') %></h3>
 <% else %>
-  <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'btn btn-danger pull-right' %>
+  <%= link_to t('blacklight.bookmarks.clear.action_title'), clear_bookmarks_path, :method => :delete, :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') }, :class => 'clear-bookmarks btn btn-danger pull-right' %>
   <%= render 'sort_and_per_page' %>
   <%= render 'tools' %>
 

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

@@ -1,5 +1,5 @@
 <% if @response.total <= spell_check_max and @response.spelling.words.size > 0 %>
   <div id="spell">
-    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ".html_safe)).html_safe %></em></h4>
+    <h4 class="suggest"><em><%= t('blacklight.did_you_mean', :options => safe_join(@response.spelling.words.map { |word| link_to_query(word) }, " #{t('blacklight.or')} ")).html_safe %></em></h4>
   </div>
 <% end %>

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

@@ -1,10 +1,4 @@
-    <% # container for a single doc -%>
-    <div class="document <%= render_document_class document %>">
-      <%= render :partial => 'document_header', :locals => { :document => document, :document_counter => document_counter } %>
-
-      <%= render_document_partial document, :thumbnail, :document_counter => document_counter %>
-
-      <% # main container for doc partial view -%>
-      <%= render_document_partial document, :index, :document_counter => document_counter %>
-
-    </div>
+<% # container for a single doc -%>
+<div class="document <%= render_document_class document %>" itemscope itemtype="<%= document.itemtype %>">
+  <%= render_document_partials document, blacklight_config.index.partials, :document_counter => document_counter %>
+</div>

data/app/views/catalog/{_document_header.html.erb → _index_header_default.html.erb}

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

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

@@ -1 +1,6 @@
+<%# Call with a Blacklight::SolrResponse or any other kaminari-compatible collection
+    to render Blacklight's compact pagination info component:
+
+        <%= render :partial => "paginate_compact", :object => @response
+-%>
 <%= paginate paginate_compact, :page_entries_info => page_entries_info(paginate_compact), :theme => :blacklight_compact %>

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

@@ -0,0 +1,2 @@
+<% # bookmark/folder functions -%>
+<%= render_document_heading(document, :tag => :h1) %>

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

@@ -25,7 +25,7 @@
 
       <h2 class="sr-only"><%= t('blacklight.search.search_results') %></h2>
 
-      <%- if response_has_no_search_results? %>
+      <%- if @response.empty? %>
         <%= render "zero_results" %>
       <%- elsif render_grouped_response? %>
         <%= render_grouped_document_index %>

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

@@ -5,20 +5,14 @@
    
 <% @page_title = t('blacklight.search.show.title', :document_title => document_show_html_title, :application_name => application_name) -%>
 <% content_for(:head) { render_link_rel_alternates } -%>
-
 <%# this should be in a partial -%>
-<div id="document" class="<%= render_document_class %>">
+
+<div id="document" class="document <%= render_document_class %>" itemscope  itemtype="<%= @document.itemtype %>">
   <div id="doc_<%= @document.id.to_s.parameterize %>">
   
-
     <% # bookmark/folder functions -%>
-    <%= render_document_heading(:h1) %>
-
-    <div class="document">
-      <%= render_document_partial @document, :show %>
-    </div>
-
-   
+    <%= render_document_partials @document, blacklight_config.show.partials %>
+ 
   </div>
 </div>
 

data/lib/blacklight.rb

@@ -17,7 +17,6 @@ module Blacklight
   autoload :User, 'blacklight/user'
 
   autoload :Controller, 'blacklight/controller'
-  autoload :LegacyControllerMethods, 'blacklight/legacy_controller_methods'
   autoload :Base, 'blacklight/base'
   autoload :Catalog,    'blacklight/catalog'
 

data/lib/blacklight/configuration.rb

@@ -17,8 +17,8 @@ module Blacklight
           :default_solr_params => {},
           :document_solr_request_handler => nil,
           :default_document_solr_params => {},
-          :show => OpenStructWithHashAccess.new(:html_title => unique_key, :heading => unique_key),
-          :index => OpenStructWithHashAccess.new(:show_link => unique_key, :record_display_type => 'format', :group => false),
+          :show => OpenStructWithHashAccess.new(:partials => [:show_header, :show], :html_title => unique_key, :heading => unique_key),
+          :index => OpenStructWithHashAccess.new(:partials => [:index_header, :thumbnail, :index], :show_link => unique_key, :record_display_type => 'format', :group => false),
           :spell_max => 5,
           :max_per_page => 100,
           :per_page => [10,20,50,100],

data/lib/blacklight/controller.rb

@@ -5,7 +5,6 @@
 module Blacklight::Controller 
 
   extend ActiveSupport::Concern
-  include Blacklight::LegacyControllerMethods
   
   included do
     include Blacklight::SearchFields

data/lib/blacklight/solr/document.rb

@@ -16,6 +16,7 @@ require 'rsolr'
 #
 
 module Blacklight::Solr::Document
+  autoload :SchemaOrg, 'blacklight/solr/document/schema_org'
   autoload :DublinCore, 'blacklight/solr/document/dublin_core'
   autoload :Email, 'blacklight/solr/document/email'
   autoload :Sms, 'blacklight/solr/document/sms'
@@ -24,6 +25,7 @@ module Blacklight::Solr::Document
   autoload :MoreLikeThis, 'blacklight/solr/document/more_like_this'
 
   extend ActiveSupport::Concern
+  include Blacklight::Solr::Document::SchemaOrg
   include Blacklight::Solr::Document::Export
   include Blacklight::Solr::Document::MoreLikeThis
 

data/lib/blacklight/solr/document/schema_org.rb

@@ -0,0 +1,7 @@
+module Blacklight::Solr::Document::SchemaOrg
+
+  def itemtype
+    "http://schema.org/Thing"
+  end
+
+end