blacklight 3.5.0 → 3.6.0

data/VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/app/controllers/bookmarks_controller.rb

@@ -23,7 +23,7 @@ class BookmarksController < ApplicationController
     success = bookmark.save
     
     unless request.xhr?
-      if bookmark.save
+      if success
         flash[:notice] = I18n.t('blacklight.bookmarks.add.success')
       else
         flash[:error] = I18n.t('blacklight.bookmarks.add.failure') 

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -260,10 +260,11 @@ module Blacklight::BlacklightHelperBehavior
   
   def render_document_index_label doc, opts
     label = nil
-    label ||= doc.get(opts[:label]) if opts[:label].instance_of? Symbol
+    label ||= doc.get(opts[:label], :sep => nil) if opts[:label].instance_of? Symbol
     label ||= opts[:label].call(doc, opts) if opts[:label].instance_of? Proc
     label ||= opts[:label] if opts[:label].is_a? String
     label ||= doc.id
+    render_field_value label
   end
 
   # link_to_document(doc, :label=>'VIEW', :counter => 3)

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -18,7 +18,10 @@ module Blacklight::CatalogHelperBehavior
   # kaminari paginate, passed on through. 
   # will output HTML pagination controls. 
   def paginate_rsolr_response(response, options = {}, &block)
-    paginate paginate_params(response), options, &block
+    per_page = response.rows
+    per_page = 1 if per_page < 1
+    current_page = (response.start / per_page).ceil + 1
+    paginate Kaminari.paginate_array(response.docs, :total_count => response.total).page(current_page).per(per_page), options, &block
   end
 
   #

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

@@ -23,7 +23,7 @@
       <tr>
     	<td><%= link_to h(bm.title), polymorphic_path(bm.document) %></td>
     	<td><%= button_to t('blacklight.bookmarks.delete'), {:controller => "bookmarks", :action => "destroy", :id => CGI.escape(bm.document_id)}, 
-	  :method => :delete, :confirm => t('blacklight.bookmarks.remove.action_confirm') %></td>
+        :method => :delete, :data => { :confirm => t('blacklight.bookmarks.remove.action_confirm') } %></td>
       </tr>
       <% end %>
     </table>

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

@@ -24,7 +24,7 @@
                   t('blacklight.search.filters.remove.label_value', :label => (options[:escape_label] ? h(label) : label), :value => (options[:escape_value] ? h(value) : value))
                 end              
         %>                
-        <%= link_to(accessible_remove_label,
+        <%= link_to(accessible_remove_label.html_safe,
 					options[:remove],
 					:class=>'btnRemove imgReplace',
           :alt=>'remove'

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

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

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

@@ -1,18 +1,8 @@
     <% # container for a single doc -%>
     <div class="document <%= render_document_class document %>">
       
-      <% # header bar for doc items in index view -%>
-      <div class="documentHeader">
-        
-        <% # bookmark/folder functions for items/docs -%>
-        <%= render_index_doc_actions document %>
-        
-        <% # main title container for doc partial view -%>
-        <div class="yui-u">
-          <h3 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
-        </div>
-      </div>
-      
+      <%= render :partial => 'document_header', :locals => { :document => document, :document_counter => document_counter } %>
+
       <% # main container for doc partial view -%>
       <%= render_document_partial document, :index %>
 

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

@@ -0,0 +1,13 @@
+     
+      <% # header bar for doc items in index view -%>
+      <div class="documentHeader">
+        
+        <% # bookmark/folder functions for items/docs -%>
+        <%= render_index_doc_actions document %>
+        
+        <% # main title container for doc partial view -%>
+        <div class="yui-u">
+          <h3 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field, :counter => (document_counter + 1 + @response.params[:start].to_i) %></h3>
+        </div>
+      </div>
+      

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

@@ -1,4 +1,10 @@
 <% # container for all documents in index view -%>
 <div id="documents">
-  <%= render :partial => 'document', :collection => @document_list, :as => :document %>
+  <% if Rails.version > "3.2.0" %>
+    <%= render @document_list, :as => :document %>
+  <% else %>
+    <% @document_list.each_with_index do |document, document_counter| %>
+      <%= render :partial => document.to_partial_path, :locals => { :document => document, :document_counter => document_counter } %>
+    <% end %>
+  <% end %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="sortAndPerPage">  
-	<% unless @response.response['numFound'] < 2 %>
+	<% unless @response.total < 2 %>
 	  <%-# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {:action=>"index"} but I'm not sure -%>
   	<%= form_tag params[:controller] == "folder" ? folder_index_path : url_for(:action=>'index'), :method=>:get, :class=>'per_page' do %>
       <%= label_tag(:per_page, t('blacklight.search.per_page.label', :select => select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), :title => t('blacklight.search.per_page.title'))).html_safe) %>

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

@@ -10,7 +10,7 @@
   
 <%- else -%>
   <p>
-    <%= link_to t('blacklight.saved_searches.clear.action_title'), clear_saved_searches_path, :method => :delete, :confirm => t('blacklight.saved_searches.clear.action_confirm') %>
+  <%= link_to t('blacklight.saved_searches.clear.action_title'), clear_saved_searches_path, :method => :delete, :data => { :confirm => t('blacklight.saved_searches.clear.action_confirm') } %>
   </p>
 
   <h2><%= t('blacklight.saved_searches.list_title') %></h2>

data/blacklight.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency "marc",      ">= 0.4.3", "< 1.1"  # Marc record parser.
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "rsolr-ext", '~> 1.0.3'  # extension to the above for some rails-ish behaviors - currently embedded in our solr document ojbect.
-  s.add_dependency "kaminari"               # the pagination (page 1,2,3, etc..) of our search results
+  s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "sass-rails"
   s.add_development_dependency "jettywrapper", ">= 1.2.0"
   s.add_dependency "compass-rails", "~> 1.0.0"

data/lib/blacklight.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'blacklight/kaminari_relevant_pages_patch' 
+require 'kaminari'
 require 'rsolr'
 require 'rsolr-ext'
 

data/lib/blacklight/solr/document.rb

@@ -16,85 +16,28 @@ require 'rsolr-ext'
 # It also provides support for Document Extensions, which advertise supported
 # transformation formats.
 #
-# = Document Extensions
-# An Blacklight::Solr::Document extension is simply a ruby module which is mixed
-# in to individual Document instances.  The intended use case is for documents
-# containing some particular format of source material, such as Marc. An
-# extension can be registered with your document class, along with a block
-# containing custom logic for which documents to apply the extension to.
-#
-# SolrDocument.use_extension(MyExtension) {|document| my_logic_on_document(document}
-#
-# MyExtension will be mixed-in (using ruby 'extend') only to those documents
-# where the block results in true.
-#
-# == Transformation conventions
-# The main use case for extensions is for transforming a Document to another
-# format. Either to another type of Ruby object, or to an exportable string in
-# a certain format. 
-#
-# The convention for methods contained in extensions that transform to a ruby
-# object is "to_*".  For instance, "to_marc" would return a Ruby Marc object.
-#
-# The convention for methods contained in extensions that transform to an
-# exportable file of some kind is "export_as_*".  For instance,
-# "export_as_marc21" would return a String object containing valid marc21, and
-# "export_as_marcxml" would return a String object containing valid marcxml.
-#
-# The tokens used after "export_as" should normally be the format names as
-# registered with Rails Mime::Type.
-#
-# == Advertising export formats
-#
-# If an extension advertises what export formats it can provide, than those
-# formats will automatically be delivered by the Blacklight catalog/show
-# controller, and potentially automatically advertised in various places
-# that advertise available formats. (HTML link rel=alternate; Atom 
-# link rel=alterate; etc).
-#
-# Export formats are 'registered' by calling the #will_export_as method
-# on a Document instance. An extension would usually do this in a
-# self.extended method, so it can be called on Documents that have
-# the given extension added to them. For instance:
-#
-#   module DemoMarcExtension
-#     def self.extended(document)
-#       document.will_export_as(:marc21, "application/marc")
-#       document.will_export_as(:marcxml, "application/marcxml+xml")
-#     end
-#
-#     def export_as_marc21 ; something ; end
-#     def export_as_marcxml ; something ; end
-#   end
-#
-# == Extension Parameters
-# Every class that includes Blacklight::Solr::Document gets a
-# #extension_parameters method for saving arbitrary parameters on class-wide
-# level that can be retrieved by extensions. These are arbitrary, just
-# conventions with a given extension. For instance:
-# SolrDocument.extension_parameters[:marc_source_field] = "solr_stored_field_name"
-#
+
 module Blacklight::Solr::Document
   autoload :Marc, 'blacklight/solr/document/marc'
   autoload :MarcExport, 'blacklight/solr/document/marc_export'
   autoload :DublinCore, 'blacklight/solr/document/dublin_core'
   autoload :Email, 'blacklight/solr/document/email'
   autoload :Sms, 'blacklight/solr/document/sms'
-  
-  def self.included(base)      
-    base.send :include, RSolr::Ext::Model
-    base.send :include, InstanceMethods
-    base.send :extend,  ClassMethods
-    base.send :extend, ActiveModel::Naming
-   
-    # after_initialize hook comes from RSolr::Ext::Model, I think.
-    # We need to make sure all extensions get applied.
-    base.after_initialize do 
-       apply_extensions 
-    end
+  autoload :Extensions, 'blacklight/solr/document/extensions'
+  autoload :Export, 'blacklight/solr/document/export'
+
+  extend ActiveSupport::Concern
+  include Blacklight::Solr::Document::Export
+
+  included do
+    extend ActiveModel::Naming
+    include RSolr::Ext::Model
+    include RSolrExtOverrides
+    include Blacklight::Solr::Document::Extensions
+
   end    
 
-  module InstanceMethods
+  module RSolrExtOverrides
     def id
       self[self.class.unique_key]
     end
@@ -104,107 +47,40 @@ module Blacklight::Solr::Document
     end
   end
 
+  def to_partial_path
+    'catalog/document'
+  end
 
-    # Needs to be called in initializer of class including this module, to
-    # apply all registered extensions on a per-document basis
-    def apply_extensions
-      self.class.registered_extensions.each do | registration|
-        self.extend( registration[:module_obj] ) if registration[:condition_proc].nil? || registration[:condition_proc].call( self )
-      end
-    end
-    
-    ##  
-    # Register exportable formats supported by the individual document.
-    # Usually called by an extension in it's self.extended method, to
-    # register the formats that extension can export. 
-    # 
-    # some_document.will_export_as(:some_format, "application/type") means
-    # that the document (usually via an extension) has a method
-    # "export_as_some_format" which returns a String of content that
-    # is described by the mime content_type given. 
-    # 
-    # The format name should ideally _already_ be registered with
-    # Rails Mime::Type, in your application initializer, representing
-    # the content type given.  However, this method will attempt to
-    # register it using Mime::Type.register_alias if it's not previously
-    # registered. This is a bit sketchy though. 
-    def will_export_as(short_name, content_type = nil)
-      #Lookup in Rails Mime::Type, register if needed, otherwise take
-      # content-type from registration if needed. This uses
-      # some 'api' to Mime::Type that may or may not be entirely
-      # public, the fact that a Mime::CONST is registered for every
-      # type. But that's the only way to do the kind of check we need, sorry.
-      if defined?(Mime) && Mime.const_defined?(short_name.to_s.upcase)      
-        mime_type = "Mime::#{short_name.to_s.upcase}".constantize
-        content_type = mime_type.to_s unless content_type      
-      else
-        # not registered, we need to register. Use register_alias to be least
-        # likely to interfere with host app. 
-        Mime::Type.register_alias(content_type, short_name)
-      end
-      
-      # if content_type is nil, look it up from Rails Mime::Type
-      if content_type.nil?
-        # Accurate lookup in Rails Mime::Type is kind of pain, it doesn't
-        # really provide the right API.
-        if defined?(type_const_name)
-          content_type = type_const_name.constantize.to_s
-        end    
-      end    
-      export_formats[short_name] =  {:content_type => content_type}
-    end
-    
-    # Collects formats that this doc can export as.
-    # Returns a hash, keys are format short-names that can
-    # be exported. Hash includes:
-    #  :content-type => mime-content-type
-    #  maybe more later
-    # To see if a given export format is supported by this document,
-    # simply call document.export_formats.keys.include?(:my_format)
-    # Then call #export_as! to do the export. 
-    def export_formats
-      @export_formats ||= {}
-    end
-    
-    # Call with a format shortname, export_as(:marc), simply returns
-    # #export_as_marc . Later we may expand the design to allow you
-    # to register an arbitrary method name instead of insisting
-    # on the convention, so clients should call this method so
-    # they'll still keep working if we do that. 
-    def export_as(short_name)
-      send("export_as_#{short_name.to_s}")
-    end
-    
-    # Returns a hash keyed by semantic tokens (see ExtendableClassMethods#semantic_fields), value is an array of
-    # strings. (Array to handle multi-value fields). If no value(s)
-    # available, empty array is returned. 
-    #
-    # Default implementation here uses ExtendableClassMethods#semantic_fields
-    # to just take values from Solr stored fields. 
-    # Extensions can over-ride this method to provide better/different lookup,
-    # but extensions should call super and modify hash returned, to avoid
-    # unintentionally erasing values provided by other extensions. 
-    def to_semantic_values
-      unless @semantic_value_hash
-        @semantic_value_hash = Hash.new([]) # default to empty array   
-        self.class.field_semantics.each_pair do |key, solr_field|
-          value = self[solr_field]
-          # Make single and multi-values all arrays, so clients
-          # don't have to know.
-          unless value.nil?
-            value = [value] unless value.kind_of?(Array)      
-            @semantic_value_hash[key] = value
-          end
+   
+  # Returns a hash keyed by semantic tokens (see ExtendableClassMethods#semantic_fields), value is an array of
+  # strings. (Array to handle multi-value fields). If no value(s)
+  # available, empty array is returned. 
+  #
+  # Default implementation here uses ExtendableClassMethods#semantic_fields
+  # to just take values from Solr stored fields. 
+  # Extensions can over-ride this method to provide better/different lookup,
+  # but extensions should call super and modify hash returned, to avoid
+  # unintentionally erasing values provided by other extensions. 
+  def to_semantic_values
+    unless @semantic_value_hash
+      @semantic_value_hash = Hash.new([]) # default to empty array   
+      self.class.field_semantics.each_pair do |key, solr_field|
+        value = self[solr_field]
+        # Make single and multi-values all arrays, so clients
+        # don't have to know.
+        unless value.nil?
+          value = [value] unless value.kind_of?(Array)      
+          @semantic_value_hash[key] = value
         end
       end
-      return @semantic_value_hash
     end
+    return @semantic_value_hash
+  end
+  
   
-    
   # Certain class-level methods needed for the document-specific
   # extendability architecture
   module ClassMethods
-    attr_writer :registered_extensions
 
     attr_writer :unique_key
     def unique_key
@@ -222,28 +98,7 @@ module Blacklight::Solr::Document
     # Returns array of hashes of registered extensions. Each hash
     # has a :module_obj key and a :condition_proc key. Usually this
     # method is only used internally in #apply_extensions, but if you
-    # want to zero out all previously registered extensions you can call:
-    # SolrDocument.registered_extensions = nil
-    def registered_extensions
-      @registered_extensions ||= []
-    end
-
-    def extension_parameters
-      @extension_parameters ||= {}
-    end      
-        
-    # Register an extension module with the class. A block taking one
-    # parameter can be supplied; the block will be passed an instance of 
-    # a Document, and the extension will be applied only if the block
-    # evaluates as true. If no condition is given, the extension will
-    # be applied to every instance of the class.
-    #
-    # SolrDocument.use_extension( SomeExtensionModule ) { | document | should_apply_some_extension?(document) }
-    # SolrDocument.use_extension( SomeExtensionModule) # will be applied to all docs
-    def use_extension( module_obj, &condition )
-      registered_extensions << {:module_obj => module_obj, :condition_proc => condition}    
-    end
-
+ 
     # Class-level method for accessing/setting semantic mappings
     # for solr stored fields. Can be set by local app, key is
     # a symbol for a semantic, value is a solr _stored_ field.

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

@@ -0,0 +1,103 @@
+# == Transformation conventions
+# The main use case for extensions is for transforming a Document to another
+# format. Either to another type of Ruby object, or to an exportable string in
+# a certain format. 
+#
+# The convention for methods contained in extensions that transform to a ruby
+# object is "to_*".  For instance, "to_marc" would return a Ruby Marc object.
+#
+# The convention for methods contained in extensions that transform to an
+# exportable file of some kind is "export_as_*".  For instance,
+# "export_as_marc21" would return a String object containing valid marc21, and
+# "export_as_marcxml" would return a String object containing valid marcxml.
+#
+# The tokens used after "export_as" should normally be the format names as
+# registered with Rails Mime::Type.
+#
+# == Advertising export formats
+#
+# If an extension advertises what export formats it can provide, than those
+# formats will automatically be delivered by the Blacklight catalog/show
+# controller, and potentially automatically advertised in various places
+# that advertise available formats. (HTML link rel=alternate; Atom 
+# link rel=alterate; etc).
+#
+# Export formats are 'registered' by calling the #will_export_as method
+# on a Document instance. An extension would usually do this in a
+# self.extended method, so it can be called on Documents that have
+# the given extension added to them. For instance:
+#
+#   module DemoMarcExtension
+#     def self.extended(document)
+#       document.will_export_as(:marc21, "application/marc")
+#       document.will_export_as(:marcxml, "application/marcxml+xml")
+#     end
+#
+#     def export_as_marc21 ; something ; end
+#     def export_as_marcxml ; something ; end
+#   end
+#
+module Blacklight::Solr::Document::Export
+
+  ##  
+  # Register exportable formats supported by the individual document.
+  # Usually called by an extension in it's self.extended method, to
+  # register the formats that extension can export. 
+  # 
+  # some_document.will_export_as(:some_format, "application/type") means
+  # that the document (usually via an extension) has a method
+  # "export_as_some_format" which returns a String of content that
+  # is described by the mime content_type given. 
+  # 
+  # The format name should ideally _already_ be registered with
+  # Rails Mime::Type, in your application initializer, representing
+  # the content type given.  However, this method will attempt to
+  # register it using Mime::Type.register_alias if it's not previously
+  # registered. This is a bit sketchy though. 
+  def will_export_as(short_name, content_type = nil)
+    #Lookup in Rails Mime::Type, register if needed, otherwise take
+    # content-type from registration if needed. This uses
+    # some 'api' to Mime::Type that may or may not be entirely
+    # public, the fact that a Mime::CONST is registered for every
+    # type. But that's the only way to do the kind of check we need, sorry.
+    if defined?(Mime) && Mime.const_defined?(short_name.to_s.upcase)      
+      mime_type = "Mime::#{short_name.to_s.upcase}".constantize
+      content_type = mime_type.to_s unless content_type      
+    else
+      # not registered, we need to register. Use register_alias to be least
+      # likely to interfere with host app. 
+      Mime::Type.register_alias(content_type, short_name)
+    end
+    
+    # if content_type is nil, look it up from Rails Mime::Type
+    if content_type.nil?
+      # Accurate lookup in Rails Mime::Type is kind of pain, it doesn't
+      # really provide the right API.
+      if defined?(type_const_name)
+        content_type = type_const_name.constantize.to_s
+      end    
+    end    
+    export_formats[short_name] =  {:content_type => content_type}
+  end
+  
+  # Collects formats that this doc can export as.
+  # Returns a hash, keys are format short-names that can
+  # be exported. Hash includes:
+  #  :content-type => mime-content-type
+  #  maybe more later
+  # To see if a given export format is supported by this document,
+  # simply call document.export_formats.keys.include?(:my_format)
+  # Then call #export_as! to do the export. 
+  def export_formats
+    @export_formats ||= {}
+  end
+  
+  # Call with a format shortname, export_as(:marc), simply returns
+  # #export_as_marc . Later we may expand the design to allow you
+  # to register an arbitrary method name instead of insisting
+  # on the convention, so clients should call this method so
+  # they'll still keep working if we do that. 
+  def export_as(short_name)
+    send("export_as_#{short_name.to_s}")
+  end
+end

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

@@ -0,0 +1,64 @@
+# = Document Extensions
+# An Blacklight::Solr::Document extension is simply a ruby module which is mixed
+# in to individual Document instances.  The intended use case is for documents
+# containing some particular format of source material, such as Marc. An
+# extension can be registered with your document class, along with a block
+# containing custom logic for which documents to apply the extension to.
+#
+# SolrDocument.use_extension(MyExtension) {|document| my_logic_on_document(document}
+#
+# MyExtension will be mixed-in (using ruby 'extend') only to those documents
+# where the block results in true.
+#
+# == Extension Parameters
+# Every class that includes Blacklight::Solr::Document::Extensions gets a
+# #extension_parameters method for saving arbitrary parameters on class-wide
+# level that can be retrieved by extensions. These are arbitrary, just
+# conventions with a given extension. For instance:
+# SolrDocument.extension_parameters[:marc_source_field] = "solr_stored_field_name"
+#
+module Blacklight::Solr::Document::Extensions
+  extend ActiveSupport::Concern
+
+  included do
+    # after_initialize hook comes from RSolr::Ext::Model, I think.
+    # We need to make sure all extensions get applied.
+    after_initialize do 
+       apply_extensions 
+    end
+  end
+
+  # Needs to be called in initializer of class including this module, to
+  # apply all registered extensions on a per-document basis
+  def apply_extensions
+    self.class.registered_extensions.each do | registration|
+      self.extend( registration[:module_obj] ) if registration[:condition_proc].nil? || registration[:condition_proc].call( self )
+    end
+  end
+
+  module ClassMethods
+    attr_writer :registered_extensions
+
+    # want to zero out all previously registered extensions you can call:
+    # SolrDocument.registered_extensions = nil
+    def registered_extensions
+      @registered_extensions ||= []
+    end
+
+    def extension_parameters
+      @extension_parameters ||= {}
+    end
+
+    # Register an extension module with the class. A block taking one
+    # parameter can be supplied; the block will be passed an instance of 
+    # a Document, and the extension will be applied only if the block
+    # evaluates as true. If no condition is given, the extension will
+    # be applied to every instance of the class.
+    #
+    # SolrDocument.use_extension( SomeExtensionModule ) { | document | should_apply_some_extension?(document) }
+    # SolrDocument.use_extension( SomeExtensionModule) # will be applied to all docs
+    def use_extension( module_obj, &condition )
+      registered_extensions << {:module_obj => module_obj, :condition_proc => condition}    
+    end
+  end
+end

data/lib/blacklight/solr_helper.rb

@@ -317,6 +317,7 @@ module Blacklight::SolrHelper
 
     solr_response = find(blacklight_config.solr_request_handler, self.solr_search_params(user_params).merge(extra_controller_params))  
     document_list = solr_response.docs.collect {|doc| SolrDocument.new(doc, solr_response)}  
+    Rails.logger.debug("Solr response: #{solr_response.inspect}")
     Rails.logger.debug("Solr fetch: #{self.class}#get_search_results (#{'%.1f' % ((Time.now.to_f - bench_start.to_f)*1000)}ms)")
     
     return [solr_response, document_list]

data/test_support/bin/run-tests.sh

@@ -30,6 +30,8 @@ then
   exit 1
 fi
 
+if [[  $# -gt 0 ]]
+then
 # Make certain rvn will work correctly.
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -46,6 +48,7 @@ fi
 
 rvm use "$@" --create
 check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests." 
+fi
 
 cd tmp/test_app
 bundle exec rake blacklight:hudson

data/test_support/bin/test.sh

@@ -38,6 +38,9 @@ rm -rf tmp/test_app
 mkdir -p tmp/test_app
 cd tmp
 
+
+if [[  $# -gt 0 ]]
+then
 # Make certain rvm will work correctly.
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -47,12 +50,13 @@ elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
   # Then try to load from a root install
   source "/usr/local/rvm/scripts/rvm"
 else
-  printf "ERROR: An RVM installation was not found.\n"
+  echo "WARNING: An RVM installation was not found.\n"
   exit 1
 fi
 
 rvm use "$@" --create
 check_errs $? "rvm failed.  please run 'rvm install $@', and then re-run these tests." 
+fi
 
 if ! gem query -n rails -v "$RAILS_VERSION" --installed > /dev/null; then
   gem install --no-rdoc --no-ri 'rails' -v "$RAILS_VERSION"
@@ -62,7 +66,7 @@ if ! gem query -n bundler -v ">=1.0" --installed > /dev/null; then
   gem install --no-rdoc --no-ri 'bundler'
 fi
 
-rails new test_app
+rails "_${RAILS_VERSION}_" new test_app
 
 cd test_app
 rm public/index.html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,17 +126,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,7 @@ files:
 - app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_did_you_mean.html.erb
 - app/views/catalog/_document.html.erb
+- app/views/catalog/_document_header.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facet_layout.html.erb
@@ -357,12 +358,8 @@ files:
 - app/views/saved_searches/index.html.erb
 - app/views/search_history/index.html.erb
 - blacklight.gemspec
-- config.ru
 - config/locales/blacklight.en.yml
 - config/routes.rb
-- db/seeds.rb
-- install.rb
-- install/solr.yml
 - lib/SolrMarc.jar
 - lib/blacklight.rb
 - lib/blacklight/catalog.rb
@@ -375,13 +372,14 @@ files:
 - lib/blacklight/controller.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
-- lib/blacklight/kaminari_relevant_pages_patch.rb
 - lib/blacklight/routes.rb
 - lib/blacklight/search_fields.rb
 - lib/blacklight/solr.rb
 - lib/blacklight/solr/document.rb
 - lib/blacklight/solr/document/dublin_core.rb
 - lib/blacklight/solr/document/email.rb
+- lib/blacklight/solr/document/export.rb
+- lib/blacklight/solr/document/extensions.rb
 - lib/blacklight/solr/document/marc.rb
 - lib/blacklight/solr/document/marc_export.rb
 - lib/blacklight/solr/document/sms.rb
@@ -390,7 +388,6 @@ files:
 - lib/blacklight/user.rb
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb
-- lib/colorize.rb
 - lib/generators/blacklight/assets_generator.rb
 - lib/generators/blacklight/blacklight_generator.rb
 - lib/generators/blacklight/jetty_generator.rb
@@ -424,7 +421,6 @@ files:
 - lib/railties/blacklight_cucumber.rake
 - lib/railties/blacklight_rspec.rake
 - lib/railties/solr_marc.rake
-- tasks/blacklight_tasks.rake
 - test_support/.rspec
 - test_support/alternate_controller.rb
 - test_support/bin/run-tests.sh
@@ -501,7 +497,6 @@ files:
 - test_support/spec/views/catalog/_index_default.erb_spec.rb
 - test_support/spec/views/catalog/_show_default.erb_spec.rb
 - test_support/spec/views/catalog/index.atom.builder_spec.rb
-- uninstall.rb
 homepage: http://projectblacklight.org/
 licenses: []
 post_install_message: 
@@ -516,7 +511,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2302454488615889589
+      hash: -1064158987751751615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -525,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2302454488615889589
+      hash: -1064158987751751615
 requirements: []
 rubyforge_project: blacklight
 rubygems_version: 1.8.24

data/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run BlacklightApp::Application

data/db/seeds.rb

@@ -1,8 +0,0 @@
-# -*- encoding : utf-8 -*-
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)

data/install.rb

@@ -1 +0,0 @@
-# -*- encoding : utf-8 -*-

data/install/solr.yml

@@ -1,8 +0,0 @@
-production:
-    url: http://127.0.0.1:8983/solr
-development:
-    url: http://127.0.0.1:8983/solr
-test: &TEST
-    url: http://127.0.0.1:8983/solr
-cucumber:
-    <<: *TEST

data/lib/blacklight/kaminari_relevant_pages_patch.rb

@@ -1,40 +0,0 @@
-module Blacklight
-  module KaminariRelevantPagesPatch
-    module Windows
-      def relevant_pages options
-        [left_window(options), inside_window(options), right_window(options)].map(&:to_a).flatten.uniq.sort.reject { |x| x < 1 or x > options[:num_pages] }
-      end
-
-      def all_pages options
-        1.upto(options[:num_pages])
-      end
-
-      protected
-      def left_window options
-        1.upto(options[:left] + 1)
-      end
-
-      def right_window options
-        (options[:num_pages] - options[:right]).upto(options[:num_pages])
-      end
-
-      def inside_window options
-        (options[:current_page] - options[:window]).upto(options[:current_page] + options[:window])
-      end
-    end
-
-    include Windows
-    def each_relevant_page
-      return to_enum(:each_relevant_page) unless block_given?
-
-      relevant_pages(@window_options.merge(@options)).each do |i|
-        yield Kaminari::Helpers::Paginator::PageProxy.new(@window_options.merge(@options), i, @last)
-      end
-    end
-  end
-end
-
-require 'kaminari'
-if Gem.loaded_specs['kaminari'].version <= Gem::Version.create('0.12.4')
-  Kaminari::Helpers::Paginator.send(:include, Blacklight::KaminariRelevantPagesPatch)
-end

data/lib/colorize.rb

@@ -1,197 +0,0 @@
-# -*- encoding : utf-8 -*-
-# == colorize
-#     http://colorize.rubyforge.org
-#     http://fazibear.prv.pl
-#     
-
-#
-# Colorize String class extension.
-#
-class String
-
-  #
-  # Colors Hash
-  #
-  COLORS = {
-    :black          => 0,
-    :red            => 1,
-    :green          => 2,
-    :yellow         => 3,
-    :blue           => 4,
-    :magenta        => 5,
-    :cyan           => 6,
-    :white          => 7,
-    :default        => 9,
-    
-    :light_black    => 10,
-    :light_red      => 11,
-    :light_green    => 12,
-    :light_yellow   => 13,
-    :light_blue     => 14,
-    :light_magenta  => 15,
-    :light_cyan     => 16,
-    :light_white    => 17
-  }
-
-  #
-  # Modes Hash
-  #
-  MODES = {
-    :default        => 0, # Turn off all attributes
-    #:bright        => 1, # Set bright mode
-    :underline      => 4, # Set underline mode
-    :blink          => 5, # Set blink mode
-    :swap           => 7, # Exchange foreground and background colors
-    :hide           => 8  # Hide text (foreground color would be the same as background)
-  }
-  
-  protected
-  
-  #
-  # Set color values in new string intance
-  #
-  def set_color_parameters( params )
-    if (params.instance_of?(Hash))
-      @color = params[:color]
-      @background = params[:background]
-      @mode = params[:mode]
-      @uncolorized = params[:uncolorized]
-      self
-    else
-      nil
-    end
-  end
-  
-  public
-
-  #
-  # Change color of string
-  #
-  # Examples:
-  #
-  #   puts "This is blue".colorize( :blue )
-  #   puts "This is light blue".colorize( :light_blue )
-  #   puts "This is also blue".colorize( :color => :blue )
-  #   puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
-  #   puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
-  #   puts "This is blue text on red".blue.on_red
-  #   puts "This is red on blue".colorize( :red ).on_blue
-  #   puts "This is red on blue and underline".colorize( :red ).on_blue.underline
-  #   puts "This is blue text on red".blue.on_red.blink
-  #   puts "This is uncolorized".blue.on_red.uncolorize
-  #
-  def colorize( params )
-    return self unless STDOUT.isatty
-    
-    begin
-      require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
-    rescue LoadError
-      raise 'You must gem install win32console to use colorize on Windows'
-    end
-    
-    color_parameters = {}
-
-    if (params.instance_of?(Hash))
-      color_parameters[:color] = COLORS[params[:color]]
-      color_parameters[:background] = COLORS[params[:background]]
-      color_parameters[:mode] = MODES[params[:mode]]
-    elsif (params.instance_of?(Symbol))
-      color_parameters[:color] = COLORS[params]
-    end
-    
-    color_parameters[:color] ||= @color ||= COLORS[:default]
-    color_parameters[:background] ||= @background ||= COLORS[:default]
-    color_parameters[:mode] ||= @mode ||= MODES[:default]
-
-    color_parameters[:uncolorized] ||= @uncolorized ||= self.dup
-   
-    # calculate bright mode
-    color_parameters[:color] += 50 if color_parameters[:color] > 10
-
-    color_parameters[:background] += 50 if color_parameters[:background] > 10
-
-    "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
-  end
-
-  #
-  # Return uncolorized string
-  #
-  def uncolorize
-    @uncolorized || self
-  end
-  
-  #
-  # Return true if sting is colorized
-  #
-  def colorized?
-    !defined?(@uncolorized).nil?
-  end
-
-  #
-  # Make some color and on_color methods
-  #
-  COLORS.each_key do | key |
-    next if key == :default
-
-    define_method key do
-      self.colorize( :color => key )
-    end
-    
-    define_method "on_#{key}" do
-      self.colorize( :background => key )
-    end
-  end
-
-  #
-  # Methods for modes
-  #
-  MODES.each_key do | key |
-    next if key == :default
-    
-    define_method key do
-      self.colorize( :mode => key )
-    end
-  end
-
-  class << self
-    
-    #
-    # Return array of available modes used by colorize method
-    #
-    def modes
-      keys = []
-      MODES.each_key do | key |
-        keys << key
-      end
-      keys
-    end
-
-    #
-    # Return array of available colors used by colorize method
-    #
-    def colors
-      keys = []
-      COLORS.each_key do | key |
-        keys << key
-      end
-      keys
-    end 
-
-    #
-    # Display color matrix with color names.
-    #
-    def color_matrix( txt = "[X]" )
-      size = String.colors.length
-      String.colors.each do | color |
-        String.colors.each do | back |
-         print txt.colorize( :color => color, :background => back )
-        end
-        puts " < #{color}"
-      end
-      String.colors.reverse.each_with_index do | back, index |
-        puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
-      end 
-      ""
-    end
-  end
-end

data/tasks/blacklight_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :blacklight do
-#   # Task goes here
-# end

data/uninstall.rb

@@ -1,2 +0,0 @@
-# -*- encoding : utf-8 -*-
-# Uninstall hook code here