blacklight 6.2.0 → 6.3.0

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

@@ -12,19 +12,19 @@ describe 'catalog/facet.html.erb' do
     assign :display_facet, display_facet
   end
 
-  it "should have the facet title" do
+  it "has the facet title" do
     allow(view).to receive(:render_facet_limit)
     render
     expect(rendered).to have_selector 'h3', text: "Facet title"
   end
 
-  it "should render facet pagination" do
+  it "renders facet pagination" do
     allow(view).to receive(:render_facet_limit)
     render
     expect(rendered).to have_content 'pagination'
   end
 
-  it "should render the facet limit" do
+  it "renders the facet limit" do
     allow(view).to receive(:render_facet_limit).with(display_facet, layout: false)
     render
   end

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

@@ -14,6 +14,7 @@ describe "catalog/index" do
   end
 
   before do
+    allow(view).to receive(:action_name).and_return('index')
     params['content_format'] = 'some_format'
     @document_list = document_list
     allow_any_instance_of(SolrDocument).to receive(:export_as_some_format).and_return("")
@@ -31,7 +32,7 @@ describe "catalog/index" do
     REXML::Document.new(rendered)
   end
 
-  it "should have contextual information" do
+  it "has contextual information" do
     expect(rendered).to have_selector("link[rel=self]")
     expect(rendered).to have_selector("link[rel=next]")
     expect(rendered).to have_selector("link[rel=previous]")
@@ -41,14 +42,14 @@ describe "catalog/index" do
     expect(rendered).to have_selector("link[rel=search][type='application/opensearchdescription+xml']")
   end
 
-  it "should get paging data correctly from response" do
+  it "gets paging data correctly from response" do
     # Can't use have_tag for namespaced elements, sorry.
     expect(response_xml.elements["/feed/opensearch:totalResults"].text).to eq "30"
     expect(response_xml.elements["/feed/opensearch:startIndex"].text).to eq "10"
     expect(response_xml.elements["/feed/opensearch:itemsPerPage"].text).to eq "10"
   end
 
-  it "should include an opensearch Query role=request" do
+  it "includes an opensearch Query role=request" do
     expect(response_xml.elements.to_a("/feed/opensearch:itemsPerPage")).to have(1).item
     query_el = response_xml.elements["/feed/opensearch:Query"]
     expect(query_el).to_not be_nil
@@ -57,24 +58,24 @@ describe "catalog/index" do
     expect(query_el.attributes["startPage"]).to eq "2"
   end
 
-  it "should have ten entries" do
+  it "has ten entries" do
     expect(rendered).to have_selector("entry", :count => 10)
   end
 
   describe "entries" do
-    it "should have a title" do
+    it "has a title" do
       expect(rendered).to have_selector("entry > title")
     end
-    it "should have an updated" do
+    it "has an updated" do
       expect(rendered).to have_selector("entry > updated")
     end
-    it "should have html link" do
+    it "has html link" do
       expect(rendered).to have_selector("entry > link[rel=alternate][type='text/html']")
     end
-    it "should have an id" do
+    it "has an id" do
       expect(rendered).to have_selector("entry > id")
     end
-    it "should have a summary" do
+    it "has a summary" do
       expect(rendered).to have_selector("entry > summary")
     end
 
@@ -82,7 +83,7 @@ describe "catalog/index" do
       before do
         @entry = response_xml.elements.to_a("/feed/entry")[0]
       end
-      it "should have author tag" do
+      it "has author tag" do
         expect(@entry.elements["author/name"].text).to eq 'xyz'
       end
     end
@@ -91,7 +92,7 @@ describe "catalog/index" do
       before do
         @entry = response_xml.elements.to_a("/feed/entry")[1]
       end
-      it "should not have an author tag" do
+      it "does not have an author tag" do
         expect(@entry.elements["author/name"]).to be_nil
       end
     end
@@ -102,10 +103,10 @@ describe "catalog/index" do
       let(:entry) do
         response_xml.elements.to_a("/feed/entry")[1].to_s
       end
-      it "should include a link rel tag" do
+      it "includes a link rel tag" do
         expect(entry).to have_selector("link[rel=alternate][type='application/some-format']")
       end
-      it "should have content embedded" do
+      it "has content embedded" do
         expect(entry).to have_selector("content")
       end
     end
@@ -113,7 +114,7 @@ describe "catalog/index" do
       before do
         @entry = response_xml.elements.to_a("/feed/entry")[5]
       end
-      it "should include content" do
+      it "includes content" do
         expect(@entry.to_s).to_not have_selector("content[type='application/some-format']")
       end
     end

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

@@ -8,13 +8,13 @@ describe "catalog/index.html.erb" do
       allow(view).to receive(:has_search_parameters?).and_return(false)
       allow(view).to receive(:blacklight_config).and_return(Blacklight::Configuration.new)
     end
-    it "should render the sidebar and content panes" do
+    it "renders the sidebar and content panes" do
       render
       expect(rendered).to match /id="sidebar"/
       expect(rendered).to match /id="content"/
     end
 
-    it "should render the search_sidebar partial " do
+    it "renders the search_sidebar partial" do
       stub_template "catalog/_search_sidebar.html.erb" => "sidebar_content"
       render
       expect(rendered).to match /sidebar_content/
@@ -31,7 +31,7 @@ describe "catalog/index.html.erb" do
       allow(view).to receive(:render_opensearch_response_metadata).and_return("")
       assign(:response, double(:empty? => true))
     end
-    it "should render the search_header partial " do
+    it "renders the search_header partial" do
       render
       expect(rendered).to match /header_content/
     end

data/spec/views/catalog/opensearch.xml.builder_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe 'catalog/opensearch.xml.builder' do
-  it "should render an OpenSearch description document" do
+  it "renders an OpenSearch description document" do
     render
     doc = Nokogiri::XML.parse(rendered)
     doc.remove_namespaces!

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

@@ -12,6 +12,7 @@ describe "catalog/show.html.erb" do
   end
 
   before :each do
+    allow(view).to receive(:action_name).and_return('show')
     allow(view).to receive_messages(:has_user_authentication_provider? => false)
     allow(view).to receive_messages(:render_document_sidebar_partial => "Sidebar")
     allow(view).to receive_messages(current_search_session: nil)
@@ -19,7 +20,7 @@ describe "catalog/show.html.erb" do
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
-  it "should set the @page_title" do
+  it "sets the @page_title" do
     allow(view).to receive(:document_show_html_title).and_return("Heading")
     render
     page_title = view.instance_variable_get(:@page_title)
@@ -27,7 +28,7 @@ describe "catalog/show.html.erb" do
     expect(page_title).to be_html_safe
   end
 
-  it "should include schema.org itemscope/type properties" do
+  it "includes schema.org itemscope/type properties" do
     allow(view).to receive(:document_show_html_title).and_return("Heading")
     allow(document).to receive_messages(:itemtype => 'some-item-type-uri')
     render
@@ -36,7 +37,7 @@ describe "catalog/show.html.erb" do
     expect(rendered).to have_selector('div#document[@itemtype="some-item-type-uri"]')
   end
 
-  it "should render the show_header and show partials by default" do
+  it "renders the show_header and show partials by default" do
     allow(view).to receive(:render_grouped_response?).and_return(false)
     stub_template "catalog/_show_header_default.html.erb" => "document_header"
     stub_template "catalog/_show_default.html.erb" => "show_default"
@@ -48,7 +49,7 @@ describe "catalog/show.html.erb" do
   end
 
 
-  it "should use the show.partials parameter to determine the partials to render" do
+  it "uses the show.partials parameter to determine the partials to render" do
     allow(view).to receive(:render_grouped_response?).and_return(false)
     blacklight_config.show.partials = ['a', 'b', 'c']
     stub_template "catalog/_a_default.html.erb" => "a_partial"

data/tasks/blacklight.rake

@@ -10,7 +10,7 @@ EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
 desc "Run test suite"
 task :ci => ['blacklight:generate'] do
-  SolrWrapper.wrap(port: '8888') do |solr|
+  SolrWrapper.wrap 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -278,6 +278,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".solr_wrapper"
 - ".travis.yml"
 - ".yardopts"
 - Gemfile
@@ -380,7 +381,19 @@ files:
 - app/models/search.rb
 - app/models/solr_document.rb
 - app/presenters/blacklight/document_presenter.rb
+- app/presenters/blacklight/field_presenter.rb
+- app/presenters/blacklight/index_presenter.rb
 - app/presenters/blacklight/json_presenter.rb
+- app/presenters/blacklight/link_alternate_presenter.rb
+- app/presenters/blacklight/rendering/abstract_step.rb
+- app/presenters/blacklight/rendering/helper_method.rb
+- app/presenters/blacklight/rendering/join.rb
+- app/presenters/blacklight/rendering/link_to_facet.rb
+- app/presenters/blacklight/rendering/microdata.rb
+- app/presenters/blacklight/rendering/pipeline.rb
+- app/presenters/blacklight/rendering/terminator.rb
+- app/presenters/blacklight/show_presenter.rb
+- app/services/blacklight/field_retriever.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/blacklight/nav/_bookmark.html.erb
@@ -469,7 +482,6 @@ files:
 - app/views/shared/_header_navbar.html.erb
 - app/views/shared/_sitelinks_search_box.html.erb
 - blacklight.gemspec
-- config/jetty.yml
 - config/locales/blacklight.de.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.es.yml
@@ -487,6 +499,7 @@ files:
 - lib/blacklight/configuration/facet_field.rb
 - lib/blacklight/configuration/field.rb
 - lib/blacklight/configuration/fields.rb
+- lib/blacklight/configuration/null_field.rb
 - lib/blacklight/configuration/search_field.rb
 - lib/blacklight/configuration/sort_field.rb
 - lib/blacklight/configuration/tool_config.rb
@@ -623,9 +636,13 @@ files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/document_presenter_spec.rb
+- spec/presenters/index_presenter_spec.rb
+- spec/presenters/pipeline_spec.rb
+- spec/presenters/show_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
@@ -678,7 +695,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -756,9 +773,13 @@ test_files:
 - spec/models/search_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/document_presenter_spec.rb
+- spec/presenters/index_presenter_spec.rb
+- spec/presenters/pipeline_spec.rb
+- spec/presenters/show_presenter_spec.rb
 - spec/routing/catalog_routing_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controller_level_helpers.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb

data/config/jetty.yml

@@ -1,13 +0,0 @@
-development:
-  startup_wait: 15
-  jetty_port: 8983 
-  java_version: ">= 1.7"
-test:
-  startup_wait: 60
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
-  <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
-  java_version: ">= 1.7"
-production:
-  startup_wait: 15
-  jetty_port: 8983
-  java_version: ">= 1.7"