blacklight 5.19.2 → 6.0.0.pre1

data/spec/routing/catalog_routing_spec.rb

@@ -18,40 +18,36 @@ describe "Routing" do
     it "should map { :controller => 'catalog', :action => 'show', :id => 666 } to /catalog/666" do
       expect(:get => "/catalog/666").to route_to(:controller => 'catalog', :action => 'show', :id => "666")
     end
-    it "should map {:controller => 'catalog', :id => '111', :action => 'librarian_view'} to /catalog/111/librarian_view" do
-      expect(:get => "/catalog/111/librarian_view").to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
-      expect(:get => librarian_view_catalog_path('111')).to route_to(:controller => 'catalog', :action => 'librarian_view', :id => "111")
-    end
   end
 
 
-  describe "catalog_path for SolrDocument", :test => true do
+  describe "solr_document_path for SolrDocument", :test => true do
     it "should route correctly" do
-      expect(:get => catalog_path(SolrDocument.new(:id => 'asdf'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
+      expect(:get => solr_document_path(SolrDocument.new(:id => 'asdf'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'asdf')
     end
 
     context "should escape solr document ids" do
 
       it "should pass-through url-valid ids" do
-        expect(:get => catalog_path(SolrDocument.new(:id => 'qwerty'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
+        expect(:get => solr_document_path(SolrDocument.new(:id => 'qwerty'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'qwerty')
       end
 
       it "should route url-like ids" do
         skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        expect(:get => catalog_path(SolrDocument.new(:id => 'http://example.com'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
+        expect(:get => solr_document_path(SolrDocument.new(:id => 'http://example.com'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'http://example.com')
       end
 
       it "should route ids with whitespace" do
-        expect(:get => catalog_path(SolrDocument.new(:id => 'mm 123'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
+        expect(:get => solr_document_path(SolrDocument.new(:id => 'mm 123'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'mm 123')
       end
 
       it "should route ids with a literal '+'" do
-        expect(:get => catalog_path(SolrDocument.new(:id => 'this+that'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
+        expect(:get => solr_document_path(SolrDocument.new(:id => 'this+that'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'this+that')
       end
 
       it "should route ids with a literal '/" do
         skip "This works if you configure your routing to have very liberal constraints on :id.. not sure how to go about testing it though"
-        expect(:get => catalog_path(SolrDocument.new(:id => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
+        expect(:get => solr_document_path(SolrDocument.new(:id => 'and/or'))).to route_to(:controller => 'catalog', :action => 'show', :id => 'and/or')
       end
     end
   end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ end
 
 require 'rsolr'
 require 'blacklight'
-require 'blacklight/marc'
 
 require 'engine_cart'
 EngineCart.load_application!
@@ -57,46 +56,9 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, type: :controller
   config.infer_spec_type_from_file_location!
 
-  config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  config.default_formatter = 'doc' if config.files_to_run.one?
-
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
-  config.example_status_persistence_file_path = 'spec/examples.txt'
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
+  config.include(ControllerLevelHelpers, type: :helper)
+  config.before(:each, type: :helper) { initialize_controller_helpers(helper) }
 
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
+  config.include(ControllerLevelHelpers, type: :view)
+  config.before(:each, type: :view) { initialize_controller_helpers(view) }
 end

data/spec/support/controller_level_helpers.rb

@@ -0,0 +1,17 @@
+module ControllerLevelHelpers
+  module ControllerViewHelpers
+    include Blacklight::Facet
+
+    def blacklight_path
+      @blacklight_path ||= Blacklight::Path.new(params, blacklight_config)
+    end
+
+    def blacklight_configuration_context
+      @blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
+    end
+  end
+
+  def initialize_controller_helpers(helper)
+    helper.extend ControllerViewHelpers
+  end
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -17,13 +17,12 @@ class TestAppGenerator < Rails::Generators::Base
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
-    gem 'blacklight-marc', "~> 5.0"
 
     Bundler.with_clean_env do
       run "bundle install"
     end
 
-    generate 'blacklight:install', '--devise --marc --jettywrapper'
+    generate 'blacklight:install', '--devise --jettywrapper'
   end
 
   def run_test_support_generator

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -12,7 +12,7 @@ describe "_user_util_links" do
   it "should render the correct bookmark count" do
     count = rand(99)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view).to receive(:render_bookmarks_control?).and_return true
+    allow(controller).to receive(:render_bookmarks_control?).and_return true
     allow(view).to receive(:has_user_authentication_provider?).and_return false
     allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
     render :partial => "user_util_links"

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

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe 'catalog/_facet_index_navigation.html.erb', type: :view do
+  let(:pagination) { Blacklight::Solr::FacetPaginator.new([]) }
+  let(:facet) { Blacklight::Configuration::FacetField.new({ index_range: '0'..'9' })}
+
+  before do
+    assign(:pagination, pagination)
+    assign(:facet, facet)
+  end
+
+  it 'renders the facet index navigation range' do
+    render
+
+    expect(rendered).to have_selector '.pagination'
+    expect(rendered).to have_link '0', href: '/?facet.prefix=0&facet.sort=index'
+    expect(rendered).to have_link '1'
+    expect(rendered).to have_link '8'
+    expect(rendered).to have_link '9'
+  end
+
+  it 'renders a "clear filter" button' do
+    render
+    expect(rendered).to have_selector '.btn.disabled', text: 'Clear Filter'
+  end
+
+  context 'with a selected index' do
+    let(:pagination) { Blacklight::Solr::FacetPaginator.new([], prefix: '5') }
+
+    it 'highlights the selected index' do
+      render
+      expect(rendered).to have_selector '.active', text: '5'
+    end
+
+    it 'enables the clear facets button' do
+      render
+      expect(rendered).to have_link 'Clear Filter'
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ describe "catalog/facet_layout" do
 
   it "should have a title with a link for a11y" do
     render partial: 'catalog/facet_layout', locals: { facet_field: facet_field }
-    expect(rendered).to have_selector 'h5 a', text: 'Some Field'
+    expect(rendered).to have_selector 'h3 a', text: 'Some Field'
   end
 
   it "should be collapsable" do

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

@@ -6,7 +6,7 @@ describe "catalog/_facets" do
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config)
     allow(view).to receive(:search_action_path) do |*args|
-      catalog_index_url *args
+      search_catalog_url *args
     end
   end
 
@@ -26,7 +26,7 @@ describe "catalog/_facets" do
     before do
       blacklight_config.facet_fields['facet_field_1'] = facet_field
 
-        @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
+        @mock_display_facet_1 = double(:name => 'facet_field_1', sort: nil, offset: nil, prefix: nil, :items => [Blacklight::Solr::Response::Facets::FacetItem.new(:value => 'Value', :hits => 1234)])
         allow(view).to receive_messages(:facet_field_names => [:facet_field_1],
                   :facet_limit_for => 10 )
 

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

@@ -18,7 +18,7 @@ describe "catalog/_paginate_compact.html.erb" do
     include Blacklight::SearchHelper
 
     it "should render solr responses" do
-      solr_response, document_list = search_results({ q: '' }, CatalogController.search_params_logic)
+      solr_response, document_list = search_results(q: '')
 
       render :partial => 'catalog/paginate_compact', :object => solr_response
       expect(rendered).to have_selector ".page_entries"

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

@@ -24,56 +24,56 @@ describe "catalog/_show_tools.html.erb" do
 
 
     it "should render a document action" do
-      allow(view).to receive(:some_action_test_path).with(id: document).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).with(document).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link "Some action", href: "x"
     end
 
     it "should use the provided label" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new label: "Some label", partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action', text: "Some label"
     end
 
     it "should evaluate a document action's if configurations" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new if: false, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "should evaluate a document action's if configuration with a proc" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', if: Proc.new { |config, doc| doc.id == "xyz" }
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "should evaluate a document action's unless configurations" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', unless: true
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "should allow the tool to have a custom id" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', id: "some_action"
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '#some_action', text: "Some action"
     end
 
     it "should default to modal behavior" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"
     end
 
     it "should allow configuration to opt out of modal behavior" do
-      allow(view).to receive(:some_action_test_path).and_return "x"
+      allow(view).to receive(:some_action_solr_document_path).and_return "x"
       document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', modal: false
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"

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

@@ -14,7 +14,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should render the pagination, sort, per page and view type controls" do
-    assign(:response, double("Solr::Response", limit_value: 1))
+    assign(:response, double("SolrResponse", limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
@@ -27,7 +27,7 @@ describe "catalog/_sort_and_per_page" do
   end
 
   it "should not render the pagination controls with bad limit values" do
-    assign(:response, double("Solr::Response", limit_value: 0))
+    assign(:response, double("SolrResponse", limit_value: 0))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"

data/tasks/blacklight.rake

@@ -1,6 +1,6 @@
 ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
 
-require 'jettywrapper'
+require 'solr_wrapper'
 require 'engine_cart/rake_task'
 
 require 'rspec/core/rake_task'
@@ -11,40 +11,39 @@ end
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"
-task :ci => ['blacklight:generate', 'blacklight:clean'] do
-  jetty_params = Jettywrapper.load_config('test')
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task["blacklight:fixtures"].invoke
-    Rake::Task['blacklight:coverage'].invoke
+task :ci => ['blacklight:generate'] do
+  SolrWrapper.wrap(port: '8888') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
+      within_test_app do
+        system "RAILS_ENV=test rake blacklight:index:seed"
+      end
+      Rake::Task['blacklight:coverage'].invoke
+    end
   end
-  raise "test failures: #{error}" if error
 end
 
 namespace :blacklight do
-  desc "Load fixtures"
-  task :fixtures => [:generate] do
-    within_test_app do
-      system "rake solr:marc:index_test_data RAILS_ENV=test"
-      abort "Error running fixtures" unless $?.success?
-    end
-  end
-
   desc "Run tests with coverage"
   task :coverage do
     ENV['COVERAGE'] = 'true'
     Rake::Task["spec"].invoke
   end
 
-  desc "Clean out the test jetty"
-  task :clean => ['jetty:clean'] do
-  end
-
   desc "Create the test rails app"
   task :generate => ['engine_cart:generate'] do
   end
 
+  namespace :internal do
+    task :seed => ['engine_cart:generate'] do
+      within_test_app do
+        system "bundle exec rake blacklight:index:seed"
+      end
+    end
+  end
+
+  desc 'Run Solr and Blacklight for interactive development'
   task :server do
-    if File.exists? 'spec/internal'
+    if File.exists? EngineCart.destination
       within_test_app do
         system "bundle update"
       end
@@ -52,17 +51,13 @@ namespace :blacklight do
       Rake::Task['engine_cart:generate'].invoke
     end
 
-    unless File.exists? 'jetty'
-      Rake::Task['jetty:clean'].invoke
-    end
-
-    jetty_params = Jettywrapper.load_config
-    jetty_params[:startup_wait]= 60
+    SolrWrapper.wrap(port: '8983') do |solr|
+      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path("..", File.dirname(__FILE__)), "solr", "conf")) do
+        Rake::Task['blacklight:internal:seed'].invoke
 
-    Jettywrapper.wrap(jetty_params) do
-      within_test_app do
-        system "rake solr:marc:index_test_data"
-        system "bundle exec rails s"
+        within_test_app do
+          system "bundle exec rails s"
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.19.2
+  version: 6.0.0.pre1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -35,10 +35,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -72,9 +86,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
@@ -82,9 +93,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
 - !ruby/object:Gem::Dependency
@@ -116,33 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: blacklight-marc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -219,14 +213,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +246,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".jshintrc"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_hound.yml"
@@ -272,16 +267,21 @@ files:
 - app/assets/javascripts/blacklight/checkbox_submit.js
 - app/assets/javascripts/blacklight/collapsable.js
 - app/assets/javascripts/blacklight/core.js
+- app/assets/javascripts/blacklight/facet_load.js
 - app/assets/javascripts/blacklight/search_context.js
+- app/assets/stylesheets/blacklight/_balanced_list.scss
 - app/assets/stylesheets/blacklight/_blacklight_base.scss
 - app/assets/stylesheets/blacklight/_bookmark.scss
-- app/assets/stylesheets/blacklight/_catalog.scss
+- app/assets/stylesheets/blacklight/_constraints.scss
+- app/assets/stylesheets/blacklight/_controls.scss
 - app/assets/stylesheets/blacklight/_facets.scss
 - app/assets/stylesheets/blacklight/_group.scss
 - app/assets/stylesheets/blacklight/_header.scss
 - app/assets/stylesheets/blacklight/_layout.scss
 - app/assets/stylesheets/blacklight/_modal.scss
+- app/assets/stylesheets/blacklight/_pagination.scss
 - app/assets/stylesheets/blacklight/_search_history.scss
+- app/assets/stylesheets/blacklight/_search_results.scss
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
 - app/controllers/bookmarks_controller.rb
@@ -296,7 +296,6 @@ files:
 - app/controllers/concerns/blacklight/search_context.rb
 - app/controllers/concerns/blacklight/search_fields.rb
 - app/controllers/concerns/blacklight/search_helper.rb
-- app/controllers/concerns/blacklight/search_history.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
@@ -320,8 +319,31 @@ files:
 - app/helpers/layout_helper.rb
 - app/helpers/render_constraints_helper.rb
 - app/helpers/search_history_constraints_helper.rb
+- app/models/blacklight/abstract_repository.rb
+- app/models/blacklight/configuration.rb
+- app/models/blacklight/configuration/context.rb
+- app/models/blacklight/configuration/facet_field.rb
+- app/models/blacklight/configuration/field.rb
+- app/models/blacklight/configuration/fields.rb
+- app/models/blacklight/configuration/search_field.rb
+- app/models/blacklight/configuration/solr_field.rb
+- app/models/blacklight/configuration/sort_field.rb
+- app/models/blacklight/configuration/tool_config.rb
+- app/models/blacklight/configuration/view_config.rb
 - app/models/blacklight/facet_paginator.rb
+- app/models/blacklight/search_builder.rb
 - app/models/blacklight/solr/facet_paginator.rb
+- app/models/blacklight/solr/repository.rb
+- app/models/blacklight/solr/request.rb
+- app/models/blacklight/solr/response.rb
+- app/models/blacklight/solr/response/facets.rb
+- app/models/blacklight/solr/response/group.rb
+- app/models/blacklight/solr/response/group_response.rb
+- app/models/blacklight/solr/response/more_like_this.rb
+- app/models/blacklight/solr/response/pagination_methods.rb
+- app/models/blacklight/solr/response/response.rb
+- app/models/blacklight/solr/response/spelling.rb
+- app/models/blacklight/solr/search_builder.rb
 - app/models/bookmark.rb
 - app/models/concerns/blacklight/configurable.rb
 - app/models/concerns/blacklight/document.rb
@@ -342,6 +364,7 @@ files:
 - app/models/concerns/blacklight/solr/document/more_like_this.rb
 - app/models/concerns/blacklight/solr/document/schema_org.rb
 - app/models/concerns/blacklight/solr/document/sms.rb
+- app/models/concerns/blacklight/solr/search_builder_behavior.rb
 - app/models/concerns/blacklight/token_based_user.rb
 - app/models/concerns/blacklight/user.rb
 - app/models/record_mailer.rb
@@ -367,6 +390,7 @@ files:
 - 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_index_navigation.html.erb
 - app/views/catalog/_facet_layout.html.erb
 - app/views/catalog/_facet_limit.html.erb
 - app/views/catalog/_facet_pagination.html.erb
@@ -381,7 +405,6 @@ files:
 - app/views/catalog/_paginate_compact.html.erb
 - app/views/catalog/_per_page_widget.html.erb
 - app/views/catalog/_previous_next_doc.html.erb
-- app/views/catalog/_refworks_form.html.erb
 - app/views/catalog/_results_pagination.html.erb
 - app/views/catalog/_search_form.html.erb
 - app/views/catalog/_search_header.html.erb
@@ -444,39 +467,19 @@ files:
 - config/locales/blacklight.fr.yml
 - config/locales/blacklight.it.yml
 - config/locales/blacklight.pt-BR.yml
+- config/routes.rb
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
 - lib/blacklight.rb
-- lib/blacklight/abstract_repository.rb
-- lib/blacklight/configuration.rb
-- lib/blacklight/configuration/facet_field.rb
-- lib/blacklight/configuration/field.rb
-- lib/blacklight/configuration/fields.rb
-- lib/blacklight/configuration/search_field.rb
-- lib/blacklight/configuration/solr_field.rb
-- lib/blacklight/configuration/sort_field.rb
-- lib/blacklight/configuration/tool_config.rb
-- lib/blacklight/configuration/view_config.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
-- lib/blacklight/rails/routes.rb
+- lib/blacklight/parameters.rb
+- lib/blacklight/path.rb
 - lib/blacklight/routes.rb
-- lib/blacklight/search_builder.rb
+- lib/blacklight/routes/exportable.rb
+- lib/blacklight/routes/searchable.rb
 - lib/blacklight/solr.rb
-- lib/blacklight/solr/repository.rb
-- lib/blacklight/solr/request.rb
-- lib/blacklight/solr/response.rb
-- lib/blacklight/solr/response/facets.rb
-- lib/blacklight/solr/response/group.rb
-- lib/blacklight/solr/response/group_response.rb
-- lib/blacklight/solr/response/more_like_this.rb
-- lib/blacklight/solr/response/pagination_methods.rb
-- lib/blacklight/solr/response/response.rb
-- lib/blacklight/solr/response/spelling.rb
-- lib/blacklight/solr/search_builder.rb
-- lib/blacklight/solr/search_builder_behavior.rb
-- lib/blacklight/solr_helper.rb
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets_generator.rb
@@ -490,16 +493,32 @@ files:
 - lib/generators/blacklight/templates/blacklight.en.yml
 - lib/generators/blacklight/templates/catalog_controller.rb
 - lib/generators/blacklight/templates/config/blacklight.yml
-- lib/generators/blacklight/templates/config/initializers/blacklight_initializer.rb
 - lib/generators/blacklight/templates/config/jetty.yml
 - lib/generators/blacklight/templates/search_builder.rb
 - lib/generators/blacklight/templates/solr_document.rb
 - lib/generators/blacklight/test_support_generator.rb
 - lib/generators/blacklight/user_generator.rb
 - lib/railties/blacklight.rake
+- solr/conf/_rest_managed.json
+- solr/conf/admin-extra.html
+- solr/conf/elevate.xml
+- solr/conf/mapping-ISOLatin1Accent.txt
+- solr/conf/protwords.txt
+- solr/conf/schema.xml
+- solr/conf/scripts.conf
+- solr/conf/solrconfig.xml
+- solr/conf/spellings.txt
+- solr/conf/stopwords.txt
+- solr/conf/stopwords_en.txt
+- solr/conf/synonyms.txt
+- solr/conf/xslt/example.xsl
+- solr/conf/xslt/example_atom.xsl
+- solr/conf/xslt/example_rss.xsl
+- solr/conf/xslt/luke.xsl
 - solr/sample_solr_documents.yml
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/blacklight/base_spec.rb
 - spec/controllers/blacklight/catalog/component_configuration_spec.rb
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
@@ -525,7 +544,6 @@ files:
 - spec/features/sitelinks_search_box.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/component_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
@@ -533,13 +551,15 @@ files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
-- spec/lib/blacklight/routes_spec.rb
-- spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/parameters_spec.rb
+- spec/lib/blacklight/path_spec.rb
 - spec/lib/blacklight/utils_spec.rb
 - spec/lib/blacklight_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/models/blacklight/configurable_spec.rb
+- spec/models/blacklight/configuration/context_spec.rb
 - spec/models/blacklight/configuration_spec.rb
+- spec/models/blacklight/document/active_model_shim_spec.rb
 - spec/models/blacklight/document/cache_key_spec.rb
 - spec/models/blacklight/document/dublin_core_spec.rb
 - spec/models/blacklight/document/email_spec.rb
@@ -564,9 +584,9 @@ files:
 - spec/models/solr_document_spec.rb
 - spec/presenters/document_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
-- spec/routing/routes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -574,8 +594,8 @@ files:
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
-- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb
@@ -610,12 +630,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -623,6 +643,7 @@ summary: Blacklight provides a discovery interface for any Solr (http://lucene.a
 test_files:
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/blacklight/base_spec.rb
 - spec/controllers/blacklight/catalog/component_configuration_spec.rb
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
@@ -648,7 +669,6 @@ test_files:
 - spec/features/sitelinks_search_box.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/component_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/facets_helper_spec.rb
 - spec/helpers/hash_as_hidden_fields_spec.rb
@@ -656,13 +676,15 @@ test_files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
-- spec/lib/blacklight/routes_spec.rb
-- spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/parameters_spec.rb
+- spec/lib/blacklight/path_spec.rb
 - spec/lib/blacklight/utils_spec.rb
 - spec/lib/blacklight_spec.rb
 - spec/lib/tasks/blacklight_task_spec.rb
 - spec/models/blacklight/configurable_spec.rb
+- spec/models/blacklight/configuration/context_spec.rb
 - spec/models/blacklight/configuration_spec.rb
+- spec/models/blacklight/document/active_model_shim_spec.rb
 - spec/models/blacklight/document/cache_key_spec.rb
 - spec/models/blacklight/document/dublin_core_spec.rb
 - spec/models/blacklight/document/email_spec.rb
@@ -687,9 +709,9 @@ test_files:
 - spec/models/solr_document_spec.rb
 - spec/presenters/document_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
-- spec/routing/routes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -697,8 +719,8 @@ test_files:
 - spec/views/catalog/_constraints.html.erb_spec.rb
 - spec/views/catalog/_constraints_element.html.erb_spec.rb
 - spec/views/catalog/_document.html.erb_spec.rb
-- spec/views/catalog/_document_action.html.erb_spec.rb
 - spec/views/catalog/_document_list.html.erb_spec.rb
+- spec/views/catalog/_facet_index_navigation.html.erb_spec.rb
 - spec/views/catalog/_facet_layout.html.erb_spec.rb
 - spec/views/catalog/_facets.html.erb_spec.rb
 - spec/views/catalog/_index_default.erb_spec.rb