blacklight 5.0.0.pre3 → 5.0.0.pre4

data/lib/blacklight/user.rb

@@ -12,19 +12,10 @@ module Blacklight::User
     end
   end
 
-  def has_bookmarks?
-    bookmarks.any?
-  end
-    
-  def has_searches?
-    searches.any?
-  end
-    
   def bookmarked_document_ids
     self.bookmarks.pluck(:document_id)
   end
-    
-  # see #current_bookmark_for, is easier
+
   def document_is_bookmarked?(document_id)
     bookmarked_document_ids.include? document_id.to_s
   end
@@ -34,10 +25,4 @@ module Blacklight::User
   def existing_bookmark_for(document_id)
     self.bookmarks.where(:document_id => document_id).first
   end
-    
-  def documents_to_bookmark=(docs)
-    docs.reject { |doc| document_is_bookmarked?(doc[:document_id]) }.each do |doc|
-      self.bookmarks.create(doc) 
-    end
-  end
 end

data/lib/blacklight/utils.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 module Blacklight
   class OpenStructWithHashAccess < OpenStruct
-    delegate :keys, :merge, :to => :to_h
+    delegate :keys, :has_key?, :delete, :length, :reject!, :select!, :include, :fetch, :to => :to_h
 
     def []=(key, value)
       send "#{key}=", value
@@ -14,5 +14,76 @@ module Blacklight
     def to_h
       @table
     end
+
+    def merge other_hash
+      self.class.new to_h.merge((other_hash if other_hash.is_a? Hash) || other_hash.to_h)
+    end
+
+    def merge! other_hash
+      @table.merge!((other_hash if other_hash.is_a? Hash) || other_hash.to_h)
+    end 
+  end
+
+  class NestedOpenStructWithHashAccess < OpenStructWithHashAccess
+    attr_reader :nested_class
+    delegate :default_proc=, :to => :to_h
+
+    def initialize klass, *args
+      @nested_class = klass
+      hash = {}
+
+      hashes_and_keys = args.flatten
+      lazy_configs = hashes_and_keys.extract_options!
+
+      args.each do |v|
+        if v.is_a? Hash
+          key = v.first
+          value = v[key]
+
+          hash[key] = nested_class.new value
+        else
+          hash[v] = nested_class.new
+        end
+      end
+
+      lazy_configs.each do |k,v|
+        hash[k] = nested_class.new v
+      end
+
+      super hash
+      set_default_proc!
+    end
+
+    def << key
+      @table[key]
+    end
+
+    def []=(key, value)
+      if value.is_a? Hash
+        send "#{key}=", nested_class.new(value)
+      else
+        send "#{key}=", value
+      end
+    end
+
+    def marshal_dump
+      h = to_h.dup
+      h.default = nil
+
+      [nested_class, h]
+    end
+
+    def marshal_load x
+      @nested_class = x.first
+      super x.last
+      set_default_proc!
+    end
+
+    private
+    def set_default_proc!
+      self.default_proc = lambda do |hash, key|
+        hash[key] = self.nested_class.new
+      end
+    end
   end
 end

data/lib/generators/blacklight/install_generator.rb

@@ -0,0 +1,92 @@
+module Blacklight
+  class Install < Rails::Generators::Base
+    
+    source_root File.expand_path('../templates', __FILE__)
+    
+    argument     :model_name, :type => :string , :default => "user"
+    class_option :devise    , :type => :boolean, :default => false, :aliases => "-d", :desc => "Use Devise as authentication logic."
+    class_option :marc      , :type => :boolean, :default => false, :aliases => "-m", :desc => "Generate MARC-based demo ."
+
+    desc """
+  This generator makes the following changes to your application:
+   1. Generates blacklight:models
+   2. Creates a number of public assets, including images, stylesheets, and javascript
+   3. Injects behavior into your user application_controller.rb
+   4. Adds example configurations for dealing with MARC-like data
+   5. Adds Blacklight routes to your ./config/routes.rb
+
+
+  Thank you for Installing Blacklight.
+         """ 
+
+    def bundle_install
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+    end
+
+    # Copy all files in templates/public/ directory to public/
+    # Call external generator in AssetsGenerator, so we can
+    # leave that callable seperately too. 
+    def copy_public_assets 
+      generate "blacklight:assets"
+    end
+
+    def generate_blacklight_models
+
+      generator_args = []
+      if options[:devise]
+        generator_args << "--devise #{options[:devise]}"
+      end
+      
+      generate 'blacklight:models', generator_args.join(" ")
+    end
+
+    # Add Blacklight to the application controller
+    def inject_blacklight_controller_behavior    
+  #    prepend_file("app/controllers/application_controller.rb", "require 'blacklight/controller'\n\n")
+      inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
+        "  # Adds a few additional behaviors into the application controller \n " +        
+          "  include Blacklight::Controller\n" + 
+          "  # Please be sure to impelement current_user and user_session. Blacklight depends on \n" +
+          "  # these methods in order to perform user specific actions. \n\n" +
+          "  layout 'blacklight'\n\n"
+      end
+    end
+    
+    # Generate blacklight catalog controller
+    def create_blacklight_catalog
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    end 
+
+    def generate_blacklight_marc_demo
+      if options[:marc]
+        gem "blacklight_marc", ">= 0.0.9"
+
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
+
+        generate 'blacklight_marc:marc'
+      end
+    end
+
+    def inject_blacklight_routes
+      # These will end up in routes.rb file in reverse order
+      # we add em, since each is added at the top of file. 
+      # we want "root" to be FIRST for optimal url generation. 
+      route('blacklight_for :catalog')
+      route('root :to => "catalog#index"')
+    end
+
+    def add_sass_configuration
+
+      insert_into_file "config/application.rb", :after => "config.assets.enabled = true" do <<EOF
+      
+      # Default SASS Configuration, check out https://github.com/rails/sass-rails for details
+      config.assets.compress = !Rails.env.development?
+EOF
+      end
+    end
+  end
+end

data/lib/generators/blacklight/models_generator.rb

@@ -17,20 +17,6 @@ This generator makes the following changes to your application:
  3. Injects behavior into your user model
  4. Creates a blacklight document in your /app/models directory
 """
-    # Implement the required interface for Rails::Generators::Migration.
-    # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-    def self.next_migration_number(path)
-      if @prev_migration_nr
-        @prev_migration_nr += 1
-      else
-        if last_migration = Dir[File.join(path, '*.rb')].sort.last
-          @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-        else
-          @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        end
-      end
-      @prev_migration_nr.to_s
-    end
 
     def check_arguments
       if File.exists?("app/models/#{model_name}.rb") and options[:devise]
@@ -77,11 +63,7 @@ This generator makes the following changes to your application:
 
     # Setup the database migrations
     def copy_migrations
-      # Can't get this any more DRY, because we need this order.
-      better_migration_template "create_searches.rb"
-      better_migration_template "create_bookmarks.rb"
-      better_migration_template "remove_editable_fields_from_bookmarks.rb"
-      better_migration_template "add_user_types_to_bookmarks_searches.rb"
+      rake "blacklight:install:migrations"
     end
 
 
@@ -103,11 +85,5 @@ This generator makes the following changes to your application:
       copy_file "solr_document.rb", "app/models/solr_document.rb"
     end
 
-    private
-
-    def better_migration_template(file)
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    end
-
   end
 end

data/lib/generators/blacklight/templates/catalog_controller.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'blacklight/catalog'
-
+#
 class CatalogController < ApplicationController  
 
   include Blacklight::Catalog
@@ -24,13 +23,12 @@ class CatalogController < ApplicationController
     #}
 
     # solr field configuration for search results/index views
-    config.index.show_link = 'title_display'
-    config.index.record_display_type = 'format'
+    config.index.title_field = 'title_display'
+    config.index.display_type_field = 'format'
 
     # solr field configuration for document/show views
-    config.show.html_title = 'title_display'
-    config.show.heading = 'title_display'
-    config.show.display_type = 'format'
+    #config.show.title_field = 'title_display'
+    #config.show.display_type_field = 'format'
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
@@ -75,32 +73,32 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display 
-    config.add_index_field 'title_display', :label => 'Title:' 
-    config.add_index_field 'title_vern_display', :label => 'Title:' 
-    config.add_index_field 'author_display', :label => 'Author:' 
-    config.add_index_field 'author_vern_display', :label => 'Author:' 
-    config.add_index_field 'format', :label => 'Format:' 
-    config.add_index_field 'language_facet', :label => 'Language:'
-    config.add_index_field 'published_display', :label => 'Published:'
-    config.add_index_field 'published_vern_display', :label => 'Published:'
-    config.add_index_field 'lc_callnum_display', :label => 'Call number:'
+    config.add_index_field 'title_display', :label => 'Title'
+    config.add_index_field 'title_vern_display', :label => 'Title'
+    config.add_index_field 'author_display', :label => 'Author'
+    config.add_index_field 'author_vern_display', :label => 'Author'
+    config.add_index_field 'format', :label => 'Format'
+    config.add_index_field 'language_facet', :label => 'Language'
+    config.add_index_field 'published_display', :label => 'Published'
+    config.add_index_field 'published_vern_display', :label => 'Published'
+    config.add_index_field 'lc_callnum_display', :label => 'Call number'
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display 
-    config.add_show_field 'title_display', :label => 'Title:' 
-    config.add_show_field 'title_vern_display', :label => 'Title:' 
-    config.add_show_field 'subtitle_display', :label => 'Subtitle:' 
-    config.add_show_field 'subtitle_vern_display', :label => 'Subtitle:' 
-    config.add_show_field 'author_display', :label => 'Author:' 
-    config.add_show_field 'author_vern_display', :label => 'Author:' 
-    config.add_show_field 'format', :label => 'Format:' 
-    config.add_show_field 'url_fulltext_display', :label => 'URL:'
-    config.add_show_field 'url_suppl_display', :label => 'More Information:'
-    config.add_show_field 'language_facet', :label => 'Language:'
-    config.add_show_field 'published_display', :label => 'Published:'
-    config.add_show_field 'published_vern_display', :label => 'Published:'
-    config.add_show_field 'lc_callnum_display', :label => 'Call number:'
-    config.add_show_field 'isbn_t', :label => 'ISBN:'
+    config.add_show_field 'title_display', :label => 'Title'
+    config.add_show_field 'title_vern_display', :label => 'Title'
+    config.add_show_field 'subtitle_display', :label => 'Subtitle'
+    config.add_show_field 'subtitle_vern_display', :label => 'Subtitle'
+    config.add_show_field 'author_display', :label => 'Author'
+    config.add_show_field 'author_vern_display', :label => 'Author'
+    config.add_show_field 'format', :label => 'Format'
+    config.add_show_field 'url_fulltext_display', :label => 'URL'
+    config.add_show_field 'url_suppl_display', :label => 'More Information'
+    config.add_show_field 'language_facet', :label => 'Language'
+    config.add_show_field 'published_display', :label => 'Published'
+    config.add_show_field 'published_vern_display', :label => 'Published'
+    config.add_show_field 'lc_callnum_display', :label => 'Call number'
+    config.add_show_field 'isbn_t', :label => 'ISBN'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -175,6 +173,4 @@ class CatalogController < ApplicationController
     config.spell_max = 5
   end
 
-
-
 end 

data/spec/helpers/blacklight_helper_spec.rb

@@ -1,82 +1,14 @@
 require 'spec_helper'
 
-def exportable_record
-"<record>
-  <leader>01828cjm a2200409 a 4500</leader>
-  <controlfield tag=\"001\">a4768316</controlfield>
-  <controlfield tag=\"003\">SIRSI</controlfield>
-  <controlfield tag=\"007\">sd fungnnmmned</controlfield>
-  <controlfield tag=\"008\">020117p20011990xxuzz    h              d</controlfield>
-
-  <datafield tag=\"245\" ind1=\"0\" ind2=\"0\">
-    <subfield code=\"a\">Music for horn</subfield>
-    <subfield code=\"h\">[sound recording] /</subfield>
-    <subfield code=\"c\">Brahms, Beethoven, von Krufft.</subfield>
-  </datafield>
-
-  <datafield tag=\"260\" ind1=\" \" ind2=\" \">
-    <subfield code=\"a\">[United States] :</subfield>
-    <subfield code=\"b\">Harmonia Mundi USA,</subfield>
-    <subfield code=\"c\">p2001.</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
-    <subfield code=\"a\">Greer, Lowell.</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
-    <subfield code=\"a\">Lubin, Steven.</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\" \">
-    <subfield code=\"a\">Chase, Stephanie,</subfield>
-    <subfield code=\"d\">1957-</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
-    <subfield code=\"a\">Brahms, Johannes,</subfield>
-    <subfield code=\"d\">1833-1897.</subfield>
-    <subfield code=\"t\">Trios,</subfield>
-    <subfield code=\"m\">piano, violin, horn,</subfield>
-    <subfield code=\"n\">op. 40,</subfield>
-    <subfield code=\"r\">E? major.</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
-    <subfield code=\"a\">Beethoven, Ludwig van,</subfield>
-    <subfield code=\"d\">1770-1827.</subfield>
-    <subfield code=\"t\">Sonatas,</subfield>
-    <subfield code=\"m\">horn, piano,</subfield>
-    <subfield code=\"n\">op. 17,</subfield>
-    <subfield code=\"r\">F major.</subfield>
-  </datafield>
-
-  <datafield tag=\"700\" ind1=\"1\" ind2=\"2\">
-    <subfield code=\"a\">Krufft, Nikolaus von,</subfield>
-    <subfield code=\"d\">1779-1818.</subfield>
-    <subfield code=\"t\">Sonata,</subfield>
-    <subfield code=\"m\">horn, piano,</subfield>
-    <subfield code=\"r\">F major.</subfield>
-  </datafield>
-</record>"
-end
-
 describe BlacklightHelper do
   include ERB::Util
   include BlacklightHelper
   include Devise::TestHelpers
   def blacklight_config
     @config ||= Blacklight::Configuration.new.configure do |config|
-      config.show.html_title = "title_display"
-      config.show.heading = "title_display"
-      config.show.display_type = 'format'
-
-      config.index.show_link = 'title_display'
-      config.index.record_display_type = 'format'
+      config.index.title_field = 'title_display'
+      config.index.display_type_field = 'format'
     end
-
-    #CatalogController.blacklight_config
-    #@config ||= {:show => {:html_title => 'title_display', :heading => 'title_display', :display_type => 'format'}, :index => { :show_link => 'title_display', :record_display_type => 'format' } }
   end
 
   before(:each) do
@@ -100,344 +32,6 @@ describe BlacklightHelper do
     end
   end
 
-  describe "link_back_to_catalog" do
-    let(:query_params)  {{:q => "query", :f => "facets", :per_page => "10", :page => "2", :controller=>'catalog'}}
-    let(:bookmarks_query_params) {{ :page => "2", :controller=>'bookmarks'}}
-
-    it "should build a link tag to catalog using session[:search] for query params" do
-      helper.stub(:current_search_session).and_return double(:query_params => query_params)
-      tag = helper.link_back_to_catalog
-      expect(tag).to match /q=query/
-      expect(tag).to match /f=facets/
-      expect(tag).to match /per_page=10/
-      expect(tag).to match /page=2/
-    end
-
-    it "should build a link tag to bookmarks using session[:search] for query params" do
-      helper.stub(:current_search_session).and_return double(:query_params => bookmarks_query_params)
-      tag = helper.link_back_to_catalog
-      expect(tag).to match /Back to Bookmarks/
-      expect(tag).to match /\/bookmarks/
-      expect(tag).to match /page=2/
-    end
-
-    describe "when an alternate scope is passed in" do
-      let(:my_engine) { double("Engine") }
-
-      it "should call url_for on the engine scope" do
-        helper.stub(:current_search_session).and_return double(:query_params => query_params)
-        expect(my_engine).to receive(:url_for).and_return(url_for(query_params))
-        tag = helper.link_back_to_catalog(route_set: my_engine)
-        expect(tag).to match /Back to Search/
-        expect(tag).to match /q=query/
-        expect(tag).to match /f=facets/
-        expect(tag).to match /per_page=10/
-        expect(tag).to match /page=2/
-      end
-    end
-  end
-
-  describe "link_to_query" do
-    it "should build a link tag to catalog using query string (no other params)" do
-      query = "brilliant"
-      self.should_receive(:params).and_return({})
-      tag = link_to_query(query)
-      expect(tag).to match /q=#{query}/
-      expect(tag).to match />#{query}<\/a>/
-    end
-    it "should build a link tag to catalog using query string and other existing params" do
-      query = "wonderful"
-      self.should_receive(:params).and_return({:qt => "title_search", :per_page => "50"})
-      tag = link_to_query(query)
-      expect(tag).to match /qt=title_search/
-      expect(tag).to match /per_page=50/
-    end
-    it "should ignore existing :page param" do
-      query = "yes"
-      self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
-      tag = link_to_query(query)
-      expect(tag).to match /qt=author_search/
-      expect(tag).to_not match /page/
-    end
-    it "should be html_safe" do
-      query = "brilliant"
-      self.should_receive(:params).and_return({:page => "2", :qt => "author_search"})
-      tag = link_to_query(query)
-      expect(tag).to be_html_safe
-    end
-  end
-
-  describe "params_for_search" do
-    def params
-      { 'default' => 'params'}
-    end
-
-    it "should default to using the controller's params" do
-      result = params_for_search
-      expect(result).to eq params
-      expect(params.object_id).to_not eq result.object_id
-    end
-
-    it "should let you pass in params to use" do
-      source_params = { :q => 'query'}
-      result = params_for_search(:params => source_params )
-      expect(source_params).to eq result
-      expect(source_params.object_id).to_not eq result.object_id
-    end
-
-    it "should not return blacklisted elements" do
-      source_params = { :action => 'action', :controller => 'controller', :id => "id", :commit => 'commit'}
-      result = params_for_search(:params => source_params )
-      expect(result.keys).to_not include(:action, :controller, :commit, :id)
-    end
-
-    it "should adjust the current page if the per_page changes" do
-      source_params = { :per_page => 20, :page => 5}
-      result = params_for_search(:params => source_params, :per_page => 100)
-      expect(result[:page]).to eq 1
-    end
-
-    it "should not adjust the current page if the per_page is the same as it always was" do
-      source_params = { :per_page => 20, :page => 5}
-      result = params_for_search(:params => source_params, :per_page => 20)
-      expect(result[:page]).to eq 5
-    end
-
-    it "should adjust the current page if the sort changes" do
-      source_params = { :sort => 'field_a', :page => 5}
-      result = params_for_search(:params => source_params, :sort => 'field_b')
-      expect(result[:page]).to eq 1
-    end
-
-    it "should not adjust the current page if the sort is the same as it always was" do
-      source_params = { :sort => 'field_a', :page => 5}
-      result = params_for_search(:params => source_params, :sort => 'field_a')
-      expect(result[:page]).to eq 5
-    end
-
-    describe "omit keys parameter" do
-      it "should omit keys by key name" do
-        source_params = { :a => 1, :b => 2, :c => 3}
-        result = params_for_search(:params => source_params, :omit_keys => [:a, :b] )
-
-        result.keys.should_not include(:a, :b)
-        expect(result[:c]).to eq 3
-      end
-
-      it "should remove keys if a key/value pair was passed and no values are left for that key" do
-        source_params = { :f => ['a']}
-        result = params_for_search(:params => source_params, :omit_keys => [{:f => 'a' }])
-        expect(result.keys).to_not include(:f)
-      end
-
-      it "should only remove keys when a key/value pair is based that are in that pair" do
-
-        source_params = { :f => ['a', 'b']}
-        result = params_for_search(:params => source_params, :omit_keys => [{:f => 'a' }])
-        expect(result[:f]).to_not include('a')
-        expect(result[:f]).to include('b')
-      end
-    end
-
-  end
-
-  describe "search_as_hidden_fields" do
-    def params
-      {:q => "query", :sort => "sort", :per_page => "20", :search_field => "search_field", :page => 100, :arbitrary_key => "arbitrary_value", :f => {"field" => ["value1", "value2"], "other_field" => ['asdf']}, :controller => "catalog", :action => "index", :commit => "search"}
-    end
-    describe "for default arguments" do
-      it "should default to omitting :page" do
-        expect(search_as_hidden_fields).to_not have_selector("input[name='page']")
-      end
-    end
- end
-
-
-   describe "render body class" do
-      it "should include a serialization of the current controller name" do
-        @controller = double("controller")
-        @controller.stub(:controller_name).and_return("123456")
-        @controller.stub(:action_name).and_return("abcdef")
-
-	      expect(render_body_class.split(' ')).to include('blacklight-123456')
-      end
-
-      it "should include a serialization of the current action name" do
-        @controller = double("controller")
-        @controller.stub(:controller_name).and_return("123456")
-        @controller.stub(:action_name).and_return("abcdef")
-
-	      expect(render_body_class.split(' ')).to include('blacklight-123456-abcdef')
-      end
-   end
-
-   describe "document_heading" do
-
-     it "should consist of the show heading field when available" do
-      @document = SolrDocument.new('title_display' => "A Fake Document")
-
-      expect(document_heading).to eq "A Fake Document"
-     end
-
-     it "should fallback on the document id if no title is available" do
-       @document = SolrDocument.new(:id => '123456')
-       expect(document_heading).to eq '123456'
-     end
-   end
-
-   describe "render_document_heading" do
-     it "should consist of #document_heading wrapped in a <h1>" do
-      @document = SolrDocument.new('title_display' => "A Fake Document")
-
-      expect(render_document_heading).to have_selector("h4", :text => "A Fake Document", :count => 1)
-      expect(render_document_heading).to be_html_safe
-     end
-
-     it "should have a schema.org itemprop for name" do
-      @document = SolrDocument.new('title_display' => "A Fake Document")
-
-      expect(render_document_heading).to have_selector("h4[@itemprop='name']", :text => "A Fake Document")
-     end
-
-     it "should join the values if it is an array" do
-      @document = SolrDocument.new('title_display' => ["A Fake Document", 'Something Else'])
-
-      expect(render_document_heading).to have_selector("h4", :text => "A Fake Document, Something Else", :count => 1)
-      expect(render_document_heading).to be_html_safe
-     end
-   end
-
-   describe "document_show_html_title" do
-     it "should join the values if it is an array" do
-      @document = SolrDocument.new('title_display' => ["A Fake Document", 'Something Else'])
-      expect(document_show_html_title).to eq "A Fake Document, Something Else"
-     end
-   end
-
-   describe "document_index_view_type" do
-     it "should default to 'list'" do
-       expect(document_index_view_type).to eq 'list'
-     end
-
-     it "should pluck values out of params" do
-       blacklight_config.stub(:document_index_view_types) { ['list', 'asdf'] }
-       params[:view] = 'asdf'
-       expect(document_index_view_type).to eq 'asdf'
-
-       params[:view] = 'not_in_list'
-       expect(document_index_view_type).to eq 'list'
-     end
-
-     it "should pluck values from supplied params" do
-       blacklight_config.stub(:document_index_view_types) { ['list', 'asdf'] }
-       params[:view] = 'asdf'
-       expect(document_index_view_type(:view => 'list')).to eq 'list'
-     end
-   end
-
-   describe "start_over_path" do
-    it 'should be the catalog path with the current view type' do
-      blacklight_config.stub(:document_index_view_types) { ['list', 'abc'] }
-      helper.stub(:blacklight_config => blacklight_config)
-      expect(helper.start_over_path(:view => 'abc')).to eq catalog_index_url(:view => 'abc')
-    end
-
-    it 'should not include the current view type if it is the default' do
-      blacklight_config.stub(:document_index_view_types) { ['list', 'abc'] }
-      helper.stub(:blacklight_config => blacklight_config)
-      expect(helper.start_over_path(:view => 'list')).to eq catalog_index_url
-    end
-   end
-
-   describe "render_document_index" do
-     it "should render the document_list" do
-       @document_list = ['a', 'b']
-       self.should_receive(:render).with(hash_including(:partial => 'document_gallery'))
-       render_document_index_with_view 'gallery', @document_list
-     end
-
-     it "should fall back on more specific templates" do
-       ex = ActionView::MissingTemplate.new [], '', '', '',''
-       self.should_receive(:render).with(hash_including(:partial => 'document_gallery')).and_raise(ex)
-       self.should_receive(:render).with(hash_including(:partial => 'catalog/document_gallery')).and_raise(ex)
-       self.should_receive(:render).with(hash_including(:partial => 'catalog/document_list'))
-       render_document_index_with_view 'gallery', @document_list
-     end
-   end
-
-   describe "document_partial_name" do
-     it "should default to 'default' when a format blank" do
-       expect(document_partial_name({})).to eq "default"
-     end
-     it "should handle normal formats correctly" do
-       expect(document_partial_name({"format" => "myformat"})).to eq "myformat"
-     end
-     it "should handle spaces correctly" do
-       expect(document_partial_name({"format" => "my format"})).to eq "my_format"
-     end
-     it "should handle capitalization correctly" do
-       expect(document_partial_name({"format" => "MyFormat"})).to eq "myformat"
-     end
-     it "should handle puncuation correctly" do
-       expect(document_partial_name({"format" => "My.Format"})).to eq "my_format"
-     end
-     it "should handle multi-valued fields correctly" do
-       expect(document_partial_name({"format" => ["My Format", "My OtherFormat"]})).to eq "my_format_my_otherformat"
-     end
-     it "should remove - characters because they will throw errors" do
-       expect(document_partial_name({"format" => "My-Format"})).to eq "my_format"
-       expect(document_partial_name({"format" => ["My-Format",["My Other-Format"]]})).to eq "my_format_my_other_format"
-     end
-   end
-
-   describe "link_to_document" do
-     it "should consist of the document title wrapped in a <a>" do
-      data = {'id'=>'123456','title_display'=>['654321'] }
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '654321', :count => 1)
-     end
-
-     it "should accept and return a string label" do
-      data = {'id'=>'123456','title_display'=>['654321'] }
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => "title_display" })).to have_selector("a", :text => 'title_display', :count => 1)
-     end
-
-     it "should accept and return a Proc" do
-      data = {'id'=>'123456','title_display'=>['654321'] }
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => Proc.new { |doc, opts| doc.get(:id) + ": " + doc.get(:title_display) } })).to have_selector("a", :text => '123456: 654321', :count => 1)
-     end
-     it "should return id when label is missing" do
-      data = {'id'=>'123456'}
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => :title_display })).to have_selector("a", :text => '123456', :count => 1)
-     end
-
-     it "should be html safe" do
-      data = {'id'=>'123456'}
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => :title_display })).to be_html_safe
-     end
-
-     it "should convert the counter parameter into a data- attribute" do
-      data = {'id'=>'123456','title_display'=>['654321']}
-      @document = SolrDocument.new(data)
-      expect(link_to_document(@document, { :label => :title_display, :counter => 5  })).to match /data-counter="5"/
-     end
-
-     it "passes on the title attribute to the link_to_with_data method" do
-       @document = SolrDocument.new('id'=>'123456')
-       expect(link_to_document(@document,:label=>"Some crazy long label...",:title=>"Some crazy longer label")).to match(/title=\"Some crazy longer label\"/)
-     end
-
-     it "doesn't add an erroneous title attribute if one isn't provided" do
-       @document = SolrDocument.new('id'=>'123456')
-       expect(link_to_document(@document,:label=>"Some crazy long label...")).to_not match(/title=/)
-     end
-   end
-
-
   describe "render_link_rel_alternates" do
       class MockDocumentAppHelper
         include Blacklight::Solr::Document
@@ -504,12 +98,8 @@ describe BlacklightHelper do
   describe "with a config" do
     before do
       @config = Blacklight::Configuration.new.configure do |config|
-        config.show.html_title = "title_display"
-        config.show.heading = "title_display"
-        config.show.display_type = 'format'
-
-        config.index.show_link = 'title_display'
-        config.index.record_display_type = 'format'
+        config.index.title_field = 'title_display'
+        config.index.display_type_field = 'format'
       end
 
       @document = SolrDocument.new('title_display' => "A Fake Document", 'id'=>'8')
@@ -626,7 +216,6 @@ describe BlacklightHelper do
     end
   end
 
-
   describe "render_document_show_field_value" do
     before do
       @config = Blacklight::Configuration.new.configure do |config|
@@ -757,7 +346,6 @@ describe BlacklightHelper do
     end
   end
 
-
   describe "#should_render_show_field?" do
     it "should if the document has the field value" do
       doc = double()
@@ -783,7 +371,6 @@ describe BlacklightHelper do
     end
   end
 
-
   describe "render_grouped_response?" do
     it "should check if the response ivar contains grouped data" do
       assign(:response, double("SolrResponse", :grouped? => true))
@@ -819,4 +406,24 @@ describe BlacklightHelper do
       expect(helper.render_field_value('a', double(:separator => nil, :itemprop => 'some-prop'))).to have_selector("span[@itemprop='some-prop']", :text => "a") 
     end
   end
+
+  describe "should_show_spellcheck_suggestions?" do
+    before :each do
+      helper.stub spell_check_max: 5
+    end
+    it "should not show suggestions if there are enough results" do
+      response = double(total: 10)
+      expect(helper.should_show_spellcheck_suggestions? response).to be_false
+    end
+
+    it "should only show suggestions if there are very few results" do
+      response = double(total: 4, spelling: double(words: [1]))
+      expect(helper.should_show_spellcheck_suggestions? response).to be_true
+    end
+
+    it "should show suggestions only if there are spelling suggestions available" do
+      response = double(total: 4, spelling: double(words: []))
+      expect(helper.should_show_spellcheck_suggestions? response).to be_false
+    end
+  end
 end