blacklight 5.9.4 → 5.10.0

data/spec/lib/blacklight/solr_repository_spec.rb

@@ -22,30 +22,30 @@ describe Blacklight::SolrRepository do
     it "should use the document-specific solr path" do
       blacklight_config.document_solr_path = 'abc'
       blacklight_config.solr_path = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('abc', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('abc', anything).and_return(mock_response)
       expect(subject.find("123")).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use the default solr path" do
       blacklight_config.solr_path = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
       expect(subject.find("123")).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use a default :qt param" do
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'document'})).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'document'})).and_return(mock_response)
       expect(subject.find("123", {})).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use the provided :qt param" do
       blacklight_config.document_solr_request_handler = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
       expect(subject.find("123", {qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should preserve the class of the incoming params" do
       doc_params = HashWithIndifferentAccess.new
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
       response = subject.find("123", doc_params)
       expect(response).to be_a_kind_of Blacklight::SolrResponse
       expect(response.params).to be_a_kind_of HashWithIndifferentAccess
@@ -55,31 +55,31 @@ describe Blacklight::SolrRepository do
   describe "#search" do
     it "should use the search-specific solr path" do
       blacklight_config.solr_path = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
       expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use the default solr path" do
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
       expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use a default :qt param" do
       blacklight_config.qt = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'xyz'})).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'xyz'})).and_return(mock_response)
       expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
     end
 
     it "should use the provided :qt param" do
       blacklight_config.qt = 'xyz'
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc'})).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc'})).and_return(mock_response)
       expect(subject.search({qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
     end
     
     it "should preserve the class of the incoming params" do
       search_params = HashWithIndifferentAccess.new
       search_params[:q] = "query"
-      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      allow(subject.connection).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
       
       response = subject.search(search_params)
       expect(response).to be_a_kind_of Blacklight::SolrResponse
@@ -93,7 +93,7 @@ describe Blacklight::SolrRepository do
 
         it "defaults to get" do
           expect(blacklight_config.http_method).to eq :get
-          allow(subject.blacklight_solr).to receive(:send_and_receive) do |path, params|
+          allow(subject.connection).to receive(:send_and_receive) do |path, params|
             expect(path).to eq 'select'
             expect(params[:method]).to eq :get
             expect(params[:params]).to include(:q)
@@ -107,7 +107,7 @@ describe Blacklight::SolrRepository do
 
         it "keep value set to post" do
           expect(blacklight_config.http_method).to eq :post
-          allow(subject.blacklight_solr).to receive(:send_and_receive) do |path, params|
+          allow(subject.connection).to receive(:send_and_receive) do |path, params|
             expect(path).to eq 'select'
             expect(params[:method]).to eq :post
             expect(params[:data]).to include(:q)
@@ -128,4 +128,4 @@ describe Blacklight::SolrRepository do
   end
 
 
-end
+end

data/spec/models/record_mailer_spec.rb

@@ -5,8 +5,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe RecordMailer do
   before(:each) do
     allow(RecordMailer).to receive(:default) { { :from => 'no-reply@projectblacklight.org' } }
-    SolrDocument.use_extension( Blacklight::Solr::Document::Email )
-    SolrDocument.use_extension( Blacklight::Solr::Document::Sms )
+    SolrDocument.use_extension( Blacklight::Document::Email )
+    SolrDocument.use_extension( Blacklight::Document::Sms )
     document = SolrDocument.new({:id=>"123456", :format=>["book"], :title_display => "The horn", :language_facet => "English", :author_display => "Janetzky, Kurt"})
     @documents = [document]
   end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ if ENV["COVERAGE"] or ENV["CI"]
   end
 end
 
+require 'rsolr'
 require 'blacklight'
 require 'blacklight/marc'
 

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

@@ -17,7 +17,7 @@ class TestAppGenerator < Rails::Generators::Base
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
-    gem 'blacklight-marc', "5.5.0"
+    gem 'blacklight-marc', "~> 5.0", :github => 'projectblacklight/blacklight_marc'
 
     Bundler.with_clean_env do
       run "bundle install"

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

@@ -32,4 +32,4 @@ describe "catalog/constraints" do
     expect(rendered).to have_link("Start Over", :href => 'http://xyz?view=xyz')
   end
 
-end
+end

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

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

data/spec/views/catalog/index.atom.builder_spec.rb

@@ -15,7 +15,7 @@ describe "catalog/index" do
     # run a solr query to get our data
     c = CatalogController.new
     c.blacklight_config = @config
-    @response, @document_list = c.get_search_results(@params)
+    @response, @document_list = c.search_results(@params, c.search_params_logic)
 
     # munge the solr response to match test expectations
     @document_list[1] = SolrDocument.new(@document_list[1].with_indifferent_access.reject! { |k,v| k == "author_display" })

data/tasks/blacklight.rake

@@ -1,4 +1,4 @@
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'

data/template.demo.rb

@@ -16,6 +16,6 @@ rake "db:migrate"
 if options =~ /jettywrapper/
   rake "jetty:clean"
   rake "jetty:start"
-  rake "blacklight:solr:seed"
+  rake "blacklight:index:seed"
   rake "jetty:stop"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.9.4
+  version: 5.10.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -404,41 +404,8 @@ files:
 - db/migrate/20140202020201_create_searches.rb
 - db/migrate/20140202020202_create_bookmarks.rb
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
-- doc/Adding-new-document-actions.md
-- doc/Atom-Responses.md
-- doc/Blacklight-Add-ons.md
-- doc/Blacklight-configuration.md
-- doc/Blacklight-on-Heroku.md
-- doc/Blacklight-out-of-the-box.md
-- doc/Bookmarks.md
-- doc/Code4Lib-2014.md
-- doc/Configuration---Facet-Fields.md
-- doc/Configuration---Results-View.md
-- doc/Configuration---Solr-fields.md
-- doc/Configuring-and-Customizing-Blacklight.md
-- doc/Configuring-rails-routes.md
-- doc/Contributing-to-Blacklight.md
-- doc/Examples.md
-- doc/Extending-or-Modifying-Blacklight-Search-Behavior.md
-- doc/Home.md
-- doc/How-to-release-a-version.md
-- doc/Indexing-your-data-into-solr.md
-- doc/Internationalization.md
-- doc/JSON-API.md
-- doc/Pagination.md
-- doc/Providing-your-own-view-templates.md
-- doc/Quickstart.md
-- doc/README_SOLR.md
-- doc/Saved-Searches.md
-- doc/Solr-Configuration.md
-- doc/Sunspot-for-indexing.md
-- doc/Support.md
-- doc/Theming.md
-- doc/Understanding-Rails-and-Blacklight.md
-- doc/User-Authentication.md
-- doc/_Sidebar.md
-- doc/testing.md
 - lib/blacklight.rb
+- lib/blacklight/abstract_repository.rb
 - lib/blacklight/base.rb
 - lib/blacklight/bookmarks.rb
 - lib/blacklight/catalog.rb
@@ -447,6 +414,7 @@ files:
 - lib/blacklight/configurable.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
@@ -454,6 +422,14 @@ files:
 - lib/blacklight/configuration/tool_config.rb
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/controller.rb
+- lib/blacklight/document.rb
+- lib/blacklight/document/dublin_core.rb
+- lib/blacklight/document/email.rb
+- lib/blacklight/document/export.rb
+- lib/blacklight/document/extensions.rb
+- lib/blacklight/document/schema_org.rb
+- lib/blacklight/document/semantic_fields.rb
+- lib/blacklight/document/sms.rb
 - lib/blacklight/document_presenter.rb
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
@@ -461,7 +437,9 @@ files:
 - lib/blacklight/rails/routes.rb
 - lib/blacklight/request_builders.rb
 - lib/blacklight/routes.rb
+- lib/blacklight/search_builder.rb
 - lib/blacklight/search_fields.rb
+- lib/blacklight/search_helper.rb
 - lib/blacklight/solr.rb
 - lib/blacklight/solr/document.rb
 - lib/blacklight/solr/document/dublin_core.rb
@@ -473,6 +451,7 @@ files:
 - lib/blacklight/solr/document/sms.rb
 - lib/blacklight/solr/facet_paginator.rb
 - lib/blacklight/solr/request.rb
+- lib/blacklight/solr/search_builder.rb
 - lib/blacklight/solr_helper.rb
 - lib/blacklight/solr_repository.rb
 - lib/blacklight/solr_response.rb
@@ -488,17 +467,20 @@ files:
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb
 - lib/generators/blacklight/assets_generator.rb
+- lib/generators/blacklight/controller_generator.rb
+- lib/generators/blacklight/document_generator.rb
 - lib/generators/blacklight/install_generator.rb
 - lib/generators/blacklight/models_generator.rb
 - lib/generators/blacklight/templates/alternate_controller.rb
 - lib/generators/blacklight/templates/blacklight.css.scss
 - 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/config/solr.yml
 - 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/sample_solr_documents.yml
 - spec/controllers/alternate_controller_spec.rb
@@ -533,15 +515,18 @@ files:
 - spec/lib/blacklight/catalog/component_configuration_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
+- spec/lib/blacklight/document/dublin_core_spec.rb
+- spec/lib/blacklight/document/email_spec.rb
+- spec/lib/blacklight/document/sms_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
 - spec/lib/blacklight/routes_spec.rb
+- spec/lib/blacklight/search_builder_spec.rb
 - spec/lib/blacklight/search_fields_spec.rb
-- spec/lib/blacklight/solr/document/dublin_core_spec.rb
-- spec/lib/blacklight/solr/document/email_spec.rb
+- spec/lib/blacklight/search_helper_spec.rb
 - spec/lib/blacklight/solr/document/more_like_this_spec.rb
-- spec/lib/blacklight/solr/document/sms_spec.rb
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
+- spec/lib/blacklight/solr/search_builder_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
 - spec/lib/blacklight/solr_repository_spec.rb
 - spec/lib/blacklight/solr_response/facets_spec.rb
@@ -648,15 +633,18 @@ test_files:
 - spec/lib/blacklight/catalog/component_configuration_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
+- spec/lib/blacklight/document/dublin_core_spec.rb
+- spec/lib/blacklight/document/email_spec.rb
+- spec/lib/blacklight/document/sms_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
 - spec/lib/blacklight/routes_spec.rb
+- spec/lib/blacklight/search_builder_spec.rb
 - spec/lib/blacklight/search_fields_spec.rb
-- spec/lib/blacklight/solr/document/dublin_core_spec.rb
-- spec/lib/blacklight/solr/document/email_spec.rb
+- spec/lib/blacklight/search_helper_spec.rb
 - spec/lib/blacklight/solr/document/more_like_this_spec.rb
-- spec/lib/blacklight/solr/document/sms_spec.rb
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
+- spec/lib/blacklight/solr/search_builder_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
 - spec/lib/blacklight/solr_repository_spec.rb
 - spec/lib/blacklight/solr_response/facets_spec.rb

data/doc/Adding-new-document-actions.md

@@ -1,94 +0,0 @@
-In your `CatalogController`, you can register document actions that display in various places within the default Blacklight UI:
-
-- `add_show_tools_partial`: displays on the `catalog#show` page, using the `render_show_doc_actions` helper
-- `add_results_document_tool`: displays on every search result, using the `render_index_doc_actions` helper
-- `add_results_collection_tool`: displays at the top of a search result page, using the `render_results_collection_tools` helper
-- `add_nav_action`: displays in the top application navbar, using the `render_nav_actions` helper
-
-All types of actions take the same parameters, e.g.:
-
-```ruby
-      ##
-      # Add a partial to the tools for rendering a document
-      # @param partial [String] the name of the document partial
-      # @param opts [Hash]
-      # @option opts [String] :partial render this action using the provided partial
-      # @option opts [Symbol,Proc] :if render this action if the method identified by the symbol or the proc evaluates to true.
-      #                             The proc will receive the action configuration and the document or documents for the action.
-      # @option opts [Symbol,Proc] :unless render this action unless the method identified by the symbol or the proc evaluates to true
-      #                             The proc will receive the action configuration and the document or documents for the action.
-      def add_show_tools_partial name, opts = {}
-```
-
-Examples:
-
-```
-class CatalogController
-  ...
-
-  # only show patron information if a user is logged in. Note that `current_user?` has to be defined as a helper method
-  add_nav_action :patron_information, if: :current_user?
-
-  # In Rails 4+, this can also be defined using an inline proc:
-  add_nav_action :patron_information, if: Proc.new { |context, config, options| context.current_user? }
-
-  # Actions can also trigger based on properties of the document:
-  add_show_tools_partial :download_image_widget, if: Proc.new { |context, config, options| options[:document].image? }
- 
-  ...
-end
-```
-
-
-## Show Tools
-You can register an action that displays on the document show page using the `add_show_tools_partial` controller method. In addition to the functionality offered by the other types of tools and actions, show tools also offer conventional defaults.
-
-Here is a trivial example of registering a new type of action:
-
-```ruby
-# app/controllers/catalog_controller.rb
-class CatalogController
-   add_show_tools_partial :my_custom_action
-
-  ## OPTIONAL
-  # def my_custom_action
-  #   # render some content..
-  #   # by default, Blacklight will try to render the partial of the same name (i.e. `app/views/catalog/my_custom_action.html.erb`)
-  # end
-end
-
-# config/routes
-Rails.application.routes.draw do
-   ...
-  get '/catalog/:id/my_custom_action' => 'catalog#my_custom_action', as: 'my_custom_action_catalog'
-end
-```
-
-
-If the action will receive form data from a `POST` request, you can also register a callback for handling that request. Optionally, the `POST` params can be validated using a helper method.
-
-```ruby
-class CatalogController
-  include Blacklight::Catalog
-  ...
-
-  # Register a new action called "email".
-  # On a POST request, validate the params using the `#validate_email_params` method
-  # and process the request using `#email_action`.
-  add_show_tools_partial :email, callback: :email_action, validator: :validate_email_params
-
-  def validate_email_params
-    # validate that the posted params are suitable for the action
-  end
-
-  def email_action documents
-    # send an email with the attached documents
-  end
- 
-  ...
-end
-```
-
-By convention, the action name is used to determine the route name for the action. For this email action, Blacklight will link to `email_catalog_path`.
-
-The action will render the template [`catalog/email.html.erb`](https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/email.html.erb) template when the action is selected. This template provides a form, which, when submitted, will trigger the `email_action` method and will render the [`catalog/email_success.html.erb`](https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/email_success.html.erb) template.