blacklight 5.14.0 → 5.15.0

data/spec/lib/blacklight/search_builder_spec.rb

@@ -47,6 +47,17 @@ describe Blacklight::SearchBuilder do
     end
   end
 
+  describe "#except" do
+    let(:processor_chain) { [:a, :b, :c, :d, :e] }
+    it "should provide a new search builder excepting arguments" do
+      builder = subject.except(:b, :d, :does_not_exist)
+      expect(builder).not_to equal(subject)
+      expect(subject.processor_chain).to eq processor_chain
+      expect(builder.processor_chain).not_to eq subject.processor_chain
+      expect(builder.processor_chain).to match_array [:a, :c, :e]
+    end
+  end
+
   describe "#to_hash" do
     it "should append the extra parameters to the result" do
       Deprecation.silence(Blacklight::SearchBuilder) do

data/spec/lib/blacklight/search_helper_spec.rb

@@ -118,6 +118,27 @@ describe Blacklight::SearchHelper do
       end
     end
 
+    describe "with SearchBuilder replacement block" do
+      it "should pass configured SearchBuilder and use returned SearchBuilder" do
+        replacement_search_builder = subject.search_builder([:new_chain])
+
+        # Sorry, have to use mocks to make sure method really passes the
+        # block return value to the repository search, couldn't figure
+        # out a better way to test. 
+        expect(subject.repository).to receive(:search) do |arg_search_builder|
+          expect(arg_search_builder).to equal(replacement_search_builder)
+        end.and_return(
+          blacklight_config.response_model.new({'response'=>{'docs'=>[]}}, {}, document_model: blacklight_config.document_model, blacklight_config: blacklight_config)
+        )
+
+        subject.search_results({q: @no_docs_query}, [:one, :two]) do |arg_search_builder|
+          expect(arg_search_builder.processor_chain).to eq([:one, :two])
+
+          replacement_search_builder
+        end
+      end
+    end
+
     describe "#get_search_results " do
       it "should be deprecated and return results" do
         expect(Deprecation).to receive(:warn)

data/spec/lib/blacklight/solr/facet_paginator_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Blacklight::Solr::FacetPaginator do
+  let(:f1) { Blacklight::SolrResponse::Facets::FacetItem.new(hits: '792', value: 'Book') }
+  describe "#as_json" do
+    subject { described_class.new([f1], offset: 0, limit: nil).as_json }
+    it "should be well structured" do
+      expect(subject).to eq("items" => [{"hits"=>"792", "value"=>"Book"}], "limit" => nil,
+       "offset" => 0, "sort" => "count")
+    end
+  end
+end

data/spec/lib/blacklight/solr_response_spec.rb

@@ -153,17 +153,34 @@ describe Blacklight::SolrResponse do
     expect(r.spelling.words).to eq []
   end
 
-  it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
-    raw_response = eval(mock_response_with_spellcheck_collation)
-    r = Blacklight::SolrResponse.new(raw_response, {})
-    expect(r.spelling.words).to include("dell")
-    expect(r.spelling.words).to include("ultrasharp")
+  context "pre solr 5 spellcheck collation syntax" do
+    it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation)
+      r = Blacklight::SolrResponse.new(raw_response, {})
+      expect(r.spelling.words).to include("dell")
+      expect(r.spelling.words).to include("ultrasharp")
+    end
+
+    it 'should provide spelling suggestion collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation)
+      r = Blacklight::SolrResponse.new(raw_response, {})
+      expect(r.spelling.collation).to eq 'dell ultrasharp'
+    end
   end
 
-  it 'should provide spelling suggestion collation' do
-    raw_response = eval(mock_response_with_spellcheck_collation)
-    r = Blacklight::SolrResponse.new(raw_response, {})
-    expect(r.spelling.collation).to eq 'dell ultrasharp'
+  context "solr 5 spellcheck collation syntax" do
+    it 'should provide spelling suggestions for a regular spellcheck results with a collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation_solr5)
+      r = Blacklight::SolrResponse.new(raw_response, {})
+      expect(r.spelling.words).to include("dell")
+      expect(r.spelling.words).to include("ultrasharp")
+    end
+
+    it 'should provide spelling suggestion collation' do
+      raw_response = eval(mock_response_with_spellcheck_collation_solr5)
+      r = Blacklight::SolrResponse.new(raw_response, {})
+      expect(r.spelling.collation).to eq 'dell ultrasharp'
+    end
   end
 
   it "should provide MoreLikeThis suggestions" do
@@ -207,6 +224,10 @@ describe Blacklight::SolrResponse do
   def mock_response_with_spellcheck_collation
     %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']},'collation','dell ultrasharp']}}|
   end
+
+  def mock_response_with_spellcheck_collation_solr5
+    %|{'responseHeader'=>{'status'=>0,'QTime'=>3,'params'=>{'spellspellcheck.build'=>'true','spellcheck'=>'true','q'=>'hell','spellcheck.q'=>'hell ultrashar','wt'=>'ruby','spellcheck.collate'=>'true'}},'response'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'spellcheck'=>{'suggestions'=>['hell',{'numFound'=>1,'startOffset'=>0,'endOffset'=>4,'suggestion'=>['dell']},'ultrashar',{'numFound'=>1,'startOffset'=>5,'endOffset'=>14,'suggestion'=>['ultrasharp']}],'collations'=>['collation','dell ultrasharp']}}|
+  end
   
   def mock_response_with_more_like_this
     %({'responseHeader'=>{'status'=>0,'QTime'=>8,'params'=>{'facet'=>'false','mlt.mindf'=>'1','mlt.fl'=>'subject_t','fl'=>'id','mlt.count'=>'3','mlt.mintf'=>'0','mlt'=>'true','q.alt'=>'*:*','qt'=>'search','wt'=>'ruby'}},'response'=>{'numFound'=>30,'start'=>0,'docs'=>[{'id'=>'00282214'},{'id'=>'00282371'},{'id'=>'00313831'},{'id'=>'00314247'},{'id'=>'43037890'},{'id'=>'53029833'},{'id'=>'77826928'},{'id'=>'78908283'},{'id'=>'79930185'},{'id'=>'85910001'}]},'moreLikeThis'=>{'00282214'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00282371'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'00313831'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'96933325'}]},'00314247'=>{'numFound'=>3,'start'=>0,'docs'=>[{'id'=>'2008543486'},{'id'=>'96933325'},{'id'=>'2009373513'}]},'43037890'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'53029833'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'77826928'=>{'numFound'=>1,'start'=>0,'docs'=>[{'id'=>'94120425'}]},'78908283'=>{'numFound'=>0,'start'=>0,'docs'=>[]},'79930185'=>{'numFound'=>2,'start'=>0,'docs'=>[{'id'=>'94120425'},{'id'=>'2007020969'}]},'85910001'=>{'numFound'=>0,'start'=>0,'docs'=>[]}}})

data/spec/lib/document_presenter_spec.rb

@@ -5,8 +5,9 @@ describe Blacklight::DocumentPresenter do
   let(:request_context) { double(:add_facet_params => '') }
   let(:config) { Blacklight::Configuration.new }
 
-  subject { Blacklight::DocumentPresenter.new(document, request_context, config) }
-  
+  subject { presenter }
+  let(:presenter) { Blacklight::DocumentPresenter.new(document, request_context, config) }
+
   let(:document) do
     SolrDocument.new(id: 1, 
                      'link_to_search_true' => 'x', 
@@ -15,6 +16,79 @@ describe Blacklight::DocumentPresenter do
                      'mnbv' => 'document mnbv value')
   end
 
+  describe "link_rel_alternates" do
+    before do
+      class MockDocument
+        include Blacklight::Solr::Document
+      end
+
+      module MockExtension
+         def self.extended(document)
+           document.will_export_as(:weird, "application/weird")
+           document.will_export_as(:weirder, "application/weirder")
+           document.will_export_as(:weird_dup, "application/weird")
+         end
+         def export_as_weird ; "weird" ; end
+         def export_as_weirder ; "weirder" ; end
+         def export_as_weird_dup ; "weird_dup" ; end
+      end
+
+      MockDocument.use_extension(MockExtension)
+
+      def mock_document_app_helper_url *args
+        solr_document_url(*args)
+      end
+
+      allow(request_context).to receive(:polymorphic_url) do |_, opts|
+        "url.#{opts[:format]}"
+      end
+    end
+
+    let(:document) { MockDocument.new(id: "MOCK_ID1") }
+
+    context "with no arguments" do
+      subject { presenter.link_rel_alternates }
+
+      it "generates <link rel=alternate> tags" do
+        tmp_value = Capybara.ignore_hidden_elements
+        Capybara.ignore_hidden_elements = false
+        document.export_formats.each_pair do |format, spec|
+          expect(subject).to have_selector("link[href$='.#{ format  }']") do |matches|
+            expect(matches).to have(1).match
+            tag = matches[0]
+            expect(tag.attributes["rel"].value).to eq "alternate"
+            expect(tag.attributes["title"].value).to eq format.to_s
+            expect(tag.attributes["href"].value).to eq mock_document_app_helper_url(document, format: format)
+          end
+        end
+        Capybara.ignore_hidden_elements = tmp_value
+      end
+
+      it { is_expected.to be_html_safe }
+    end
+
+    context "with unique: true" do
+      subject { presenter.link_rel_alternates(unique: true) }
+
+      it "respects unique: true" do
+        tmp_value = Capybara.ignore_hidden_elements
+        Capybara.ignore_hidden_elements = false
+        expect(subject).to have_selector("link[type='application/weird']", count: 1)
+        Capybara.ignore_hidden_elements = tmp_value
+      end
+    end
+
+    context "with exclude" do
+      subject { presenter.link_rel_alternates(unique: true) }
+      it "excludes formats from :exclude" do
+        tmp_value = Capybara.ignore_hidden_elements
+        Capybara.ignore_hidden_elements = false
+        expect(subject).to_not have_selector("link[href$='.weird_dup']")
+        Capybara.ignore_hidden_elements = tmp_value
+      end
+    end
+  end
+
   describe "render_index_field_value" do
     let(:config) do 
       Blacklight::Configuration.new.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.14.0
+  version: 5.15.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,6 +394,7 @@ files:
 - app/views/shared/_flash_messages.html.erb
 - app/views/shared/_footer.html.erb
 - 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
@@ -437,6 +438,7 @@ files:
 - lib/blacklight/engine.rb
 - lib/blacklight/exceptions.rb
 - lib/blacklight/facet.rb
+- lib/blacklight/facet_paginator.rb
 - lib/blacklight/rails/routes.rb
 - lib/blacklight/request_builders.rb
 - lib/blacklight/routes.rb
@@ -509,6 +511,7 @@ files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
+- spec/features/sitelinks_search_box.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/component_helper_spec.rb
@@ -535,6 +538,7 @@ files:
 - spec/lib/blacklight/search_helper_spec.rb
 - spec/lib/blacklight/solr/document/more_like_this_spec.rb
 - spec/lib/blacklight/solr/document_spec.rb
+- spec/lib/blacklight/solr/facet_paginator_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr/search_builder_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
@@ -631,6 +635,7 @@ test_files:
 - spec/features/search_results_spec.rb
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
+- spec/features/sitelinks_search_box.rb
 - spec/helpers/blacklight_helper_spec.rb
 - spec/helpers/catalog_helper_spec.rb
 - spec/helpers/component_helper_spec.rb
@@ -657,6 +662,7 @@ test_files:
 - spec/lib/blacklight/search_helper_spec.rb
 - spec/lib/blacklight/solr/document/more_like_this_spec.rb
 - spec/lib/blacklight/solr/document_spec.rb
+- spec/lib/blacklight/solr/facet_paginator_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr/search_builder_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb