blacklight 6.25.0 → 7.0.0.rc1

data/spec/presenters/index_presenter_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-describe Blacklight::IndexPresenter do
+RSpec.describe Blacklight::IndexPresenter do
   include Capybara::RSpecMatchers
-  let(:request_context) { double }
+  let(:request_context) { double(document_index_view_type: 'list') }
   let(:config) { Blacklight::Configuration.new }
 
   subject { presenter }
@@ -14,156 +14,105 @@ describe Blacklight::IndexPresenter do
 
   let(:document) do
     SolrDocument.new(id: 1,
-                     'link_to_search_true' => 'x',
-                     'link_to_search_named' => 'x',
-                     'qwer' => 'document qwer value')
+                     'link_to_facet_true' => 'x',
+                     'link_to_facet_named' => 'x',
+                     'qwer' => 'document qwer value',
+                     'mnbv' => 'document mnbv value')
   end
 
   before do
     allow(request_context).to receive(:search_state).and_return(search_state)
   end
 
-  describe '#field_value' do
-    subject { presenter.field_value field }
-
-    let(:field) { config.index_fields[field_name] }
-    let(:field_name) { 'asdf' }
+  describe "field_value" do
     let(:config) do
       Blacklight::Configuration.new.configure do |config|
         config.add_index_field 'qwer'
-        config.add_index_field 'asdf', helper_method: :render_asdf_index_field
-        config.add_index_field 'link_to_search_true', link_to_search: true
-        config.add_index_field 'link_to_search_named', link_to_search: :some_field
-        config.add_index_field 'highlight', highlight: true
-        config.add_index_field 'solr_doc_accessor', accessor: true
-        config.add_index_field 'explicit_accessor', accessor: :solr_doc_accessor
+        config.add_index_field 'asdf', :helper_method => :render_asdf_index_field
+        config.add_index_field 'link_to_facet_true', :link_to_facet => true
+        config.add_index_field 'link_to_facet_named', :link_to_facet => :some_field
+        config.add_index_field 'highlight', :highlight => true
+        config.add_index_field 'solr_doc_accessor', :accessor => true
+        config.add_index_field 'explicit_accessor', :accessor => :solr_doc_accessor
+        config.add_index_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
         config.add_index_field 'alias', field: 'qwer'
         config.add_index_field 'with_default', default: 'value'
       end
     end
-
-    context 'when a name is provided' do
-      subject { presenter.field_value 'qwer' }
-
-      it 'raises a deprecation' do
-        expect(Deprecation).to receive(:warn)
-        expect(subject).to eq 'document qwer value'
-      end
-
-      context 'with a name as a symbol' do
-        subject { presenter.field_value :qwer }
-
-        it 'raises a deprecation' do
-          expect(Deprecation).to receive(:warn)
-          expect(subject).to eq 'document qwer value'
-        end
-      end
-
-      context 'with a name as an integer' do
-        subject { presenter.field_value 123 }
-
-        it 'raises a deprecation' do
-          expect(Deprecation).to receive(:warn)
-          expect(subject).to eq ''
-        end
-      end
+    it "checks for an explicit value" do
+      value = subject.field_value 'asdf', :value => 'asdf'
+      expect(value).to eq 'asdf'
     end
 
-    context 'when an explicit value is provided' do
-      subject { presenter.field_value field, value: 'asdf' }
-
-      it { is_expected.to eq 'asdf' }
+    it "checks for a helper method to call" do
+      allow(request_context).to receive(:render_asdf_index_field).and_return('custom asdf value')
+      value = subject.field_value 'asdf'
+      expect(value).to eq 'custom asdf value'
     end
 
-    context 'when field has a helper method' do
-      before do
-        allow(request_context).to receive(:render_asdf_index_field).and_return('custom asdf value')
-      end
-
-      it { is_expected.to eq 'custom asdf value' }
+    it "checks for a link_to_facet" do
+      allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_facet_true' => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.field_value 'link_to_facet_true'
+      expect(value).to eq 'bar'
     end
 
-    context 'when field has link_to_search with true' do
-      before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_search_true' => ['x'] }).and_return('/foo')
-        allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      end
-
-      let(:field_name) { 'link_to_search_true' }
-
-      it { is_expected.to eq 'bar' }
+    it "checks for a link_to_facet with a field name" do
+      allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.field_value 'link_to_facet_named'
+      expect(value).to eq 'bar'
     end
 
-    context 'when field has link_to_search with a field name' do
-      before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
-        allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      end
-
-      let(:field_name) { 'link_to_search_named' }
-
-      it { is_expected.to eq 'bar' }
+    it "gracefully handles when no highlight field is available" do
+      allow(document).to receive(:has_highlight_field?).and_return(false)
+      value = subject.field_value 'highlight'
+      expect(value).to be_blank
     end
 
-    context 'when no highlight field is available' do
-      before do
-        allow(document).to receive(:has_highlight_field?).and_return(false)
-      end
-
-      let(:field_name) { 'highlight' }
-
-      it { is_expected.to be_blank }
+    it "checks for a highlighted field" do
+      allow(document).to receive(:has_highlight_field?).and_return(true)
+      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = subject.field_value 'highlight'
+      expect(value).to eq '<em>highlight</em>'
     end
 
-    context 'when highlight field is available' do
-      before do
-        allow(document).to receive(:has_highlight_field?).and_return(true)
-        allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
-      end
-
-      let(:field_name) { 'highlight' }
-
-      it { is_expected.to eq '<em>highlight</em>' }
+    it "checks the document field value" do
+      value = subject.field_value 'qwer'
+      expect(value).to eq 'document qwer value'
     end
 
-    context 'when no options are provided' do
-      let(:field_name) { 'qwer' }
-
-      it "checks the document field value" do
-        expect(subject).to eq 'document qwer value'
-      end
+    it "works with index fields that aren't explicitly defined" do
+      value = subject.field_value 'mnbv'
+      expect(value).to eq 'document mnbv value'
     end
 
-    context 'when accessor is true' do
-      before do
-        allow(document).to receive_messages(solr_doc_accessor: "123")
-      end
-
-      let(:field_name) { 'solr_doc_accessor' }
-
-      it { is_expected.to eq '123' }
+    it "calls an accessor on the solr document" do
+      allow(document).to receive_messages(solr_doc_accessor: "123")
+      value = subject.field_value 'solr_doc_accessor'
+      expect(value).to eq "123"
     end
 
-    context 'when accessor is set to a value' do
-      let(:field_name) { 'explicit_accessor' }
-
-      it 'calls the accessor with the field_name as the argument' do
-        expect(document).to receive(:solr_doc_accessor).with('explicit_accessor').and_return("123")
-
-        expect(subject).to eq '123'
-      end
+    it "calls an explicit accessor on the solr document" do
+      allow(document).to receive_messages(solr_doc_accessor: "123")
+      value = subject.field_value 'explicit_accessor'
+      expect(value).to eq "123"
     end
 
-    context 'when the field is an alias' do
-      let(:field_name) { 'alias' }
-
-      it { is_expected.to eq 'document qwer value' }
+    it "calls an accessor on the solr document with the field as an argument" do
+      allow(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = subject.field_value 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
     end
 
-    context 'when the field has a default' do
-      let(:field_name) { 'with_default' }
+    it "supports solr field configuration" do
+      value = subject.field_value 'alias'
+      expect(value).to eq "document qwer value"
+    end
 
-      it { is_expected.to eq 'value' }
+    it "supports default values in the field configuration" do
+      value = subject.field_value 'with_default'
+      expect(value).to eq "value"
     end
   end
 
@@ -171,9 +120,8 @@ describe Blacklight::IndexPresenter do
     context 'for a field with the helper_method option' do
       let(:field_name) { 'field_with_helper' }
       let(:field_config) { config.add_facet_field 'field_with_helper', helper_method: 'render_field_with_helper' }
-
-      before do
-        document['field_with_helper'] = 'value'
+      let(:document) do
+        SolrDocument.new(id: 1, 'field_with_helper' => 'value')
       end
 
       it "checks call the helper method with arguments" do
@@ -195,29 +143,8 @@ describe Blacklight::IndexPresenter do
     end
   end
 
-  describe 'deprecated methods' do
-    before do
-      allow(Deprecation).to receive(:warn)
-    end
-
-    let(:field_config) { config.add_index_field 'qwerty' }
-
-    describe '#get_field_values' do
-      it 'renders values for the given field' do
-        expect(subject.get_field_values(field_config, value: ['x', 'y'])).to eq 'x and y'
-      end
-    end
-
-    describe '#render_field_values' do
-      it 'renders values for the given field' do
-        expect(subject.render_field_values('x')).to eq 'x'
-      end
-    end
-
-    describe '#render_values' do
-      it 'renders values for the given field' do
-        expect(subject.render_values(['x', 'y', 'z'])).to eq 'x, y, and z'
-      end
-    end
+  describe "#thumbnail" do
+    subject { presenter.thumbnail }
+    it { is_expected.to be_instance_of Blacklight::ThumbnailPresenter }
   end
 end

data/spec/presenters/pipeline_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::Rendering::Pipeline do
+RSpec.describe Blacklight::Rendering::Pipeline do
   include Capybara::RSpecMatchers
   let(:document) { instance_double(SolrDocument) }
   let(:context) { double }
@@ -10,18 +10,18 @@ describe Blacklight::Rendering::Pipeline do
   describe "render" do
     subject { presenter.render }
     let(:values) { ['a', 'b'] }
-    let(:field_config) { Blacklight::Configuration::NullField.new } 
+    let(:field_config) { Blacklight::Configuration::NullField.new }
     it { is_expected.to eq "a and b" }
 
     context "when separator_options are in the config" do
       let(:values) { ['c', 'd'] }
-      let(:field_config) { Blacklight::Configuration::NullField.new(separator: nil, itemprop: nil, separator_options: { two_words_connector: '; '}) } 
+      let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: nil, separator_options: { two_words_connector: '; '}) }
       it { is_expected.to eq "c; d" }
     end
 
     context "when itemprop is in the config" do
       let(:values) { ['a'] }
-      let(:field_config) { Blacklight::Configuration::NullField.new(separator: nil, itemprop: 'some-prop', separator_options: nil) } 
+      let(:field_config) { Blacklight::Configuration::NullField.new(itemprop: 'some-prop', separator_options: nil) }
       it { is_expected.to have_selector("span[@itemprop='some-prop']", :text => "a") }
     end
   end

data/spec/presenters/show_presenter_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Blacklight::ShowPresenter do
+RSpec.describe Blacklight::ShowPresenter do
   include Capybara::RSpecMatchers
   let(:request_context) { double }
   let(:config) { Blacklight::Configuration.new }
@@ -14,9 +14,10 @@ describe Blacklight::ShowPresenter do
 
   let(:document) do
     SolrDocument.new(id: 1,
-                     'link_to_search_true' => 'x',
-                     'link_to_search_named' => 'x',
-                     'qwer' => 'document qwer value')
+                     'link_to_facet_true' => 'x',
+                     'link_to_facet_named' => 'x',
+                     'qwer' => 'document qwer value',
+                     'mnbv' => 'document mnbv value')
   end
 
   before do
@@ -96,155 +97,118 @@ describe Blacklight::ShowPresenter do
     end
   end
 
-  describe '#field_value' do
-    subject { presenter.field_value field }
-
-    let(:field) { config.show_fields[field_name] }
-    let(:field_name) { 'asdf' }
+  describe "field_value" do
     let(:config) do
       Blacklight::Configuration.new.configure do |config|
         config.add_show_field 'qwer'
-        config.add_show_field 'asdf', helper_method: :render_asdf_document_show_field
-        config.add_show_field 'link_to_search_true', link_to_search: true
-        config.add_show_field 'link_to_search_named', link_to_search: :some_field
-        config.add_show_field 'highlight', highlight: true
-        config.add_show_field 'solr_doc_accessor', accessor: true
-        config.add_show_field 'explicit_accessor', accessor: :solr_doc_accessor
-        config.add_show_field 'explicit_array_accessor', accessor: [:solr_doc_accessor, :some_method]
+        config.add_show_field 'asdf', :helper_method => :render_asdf_document_show_field
+        config.add_show_field 'link_to_facet_true', :link_to_facet => true
+        config.add_show_field 'link_to_facet_named', :link_to_facet => :some_field
+        config.add_show_field 'highlight', :highlight => true
+        config.add_show_field 'solr_doc_accessor', :accessor => true
+        config.add_show_field 'explicit_accessor', :accessor => :solr_doc_accessor
+        config.add_show_field 'explicit_array_accessor', :accessor => [:solr_doc_accessor, :some_method]
+        config.add_show_field 'explicit_accessor_with_arg', :accessor => :solr_doc_accessor_with_arg
       end
     end
 
-    context 'when a name is provided' do
-      subject { presenter.field_value 'qwer' }
-
-      it 'raises a deprecation' do
-        expect(Deprecation).to receive(:warn)
-        expect(subject).to eq 'document qwer value'
-      end
+    it 'html-escapes values' do
+      value = subject.field_value 'asdf', value: '<b>val1</b>'
+      expect(value).to eq '&lt;b&gt;val1&lt;/b&gt;'
     end
 
-    context 'when an explicit html value is provided' do
-      subject { presenter.field_value field, value: '<b>val1</b>' }
-
-      it { is_expected.to eq '&lt;b&gt;val1&lt;/b&gt;' }
+    it 'joins multivalued valued fields' do
+      value = subject.field_value 'asdf', value: ['<a', 'b']
+      expect(value).to eq '&lt;a and b'
     end
 
-    context 'when an explicit array value with unsafe characters is provided' do
-      subject { presenter.field_value field, value: ['<a', 'b'] }
-
-      it { is_expected.to eq '&lt;a and b' }
+    it 'joins multivalued valued fields' do
+      value = subject.field_value 'asdf', value: ['a', 'b', 'c']
+      expect(value).to eq 'a, b, and c'
     end
 
-    context 'when an explicit array value is provided' do
-      subject { presenter.field_value field, value: %w[a b c] }
-
-      it { is_expected.to eq 'a, b, and c' }
+    it "checks for an explicit value" do
+      expect(request_context).to_not receive(:render_asdf_document_show_field)
+      value = subject.field_value 'asdf', :value => 'val1'
+      expect(value).to eq 'val1'
     end
 
-    context 'when an explicit value is provided' do
-      subject { presenter.field_value field, value: 'val1' }
-
-      it { is_expected.to eq 'val1' }
+    it "checks for a helper method to call" do
+      allow(request_context).to receive(:render_asdf_document_show_field).and_return('custom asdf value')
+      value = subject.field_value 'asdf'
+      expect(value).to eq 'custom asdf value'
     end
 
-    context 'when field has a helper method' do
-      before do
-        allow(request_context).to receive(:render_asdf_document_show_field).and_return('custom asdf value')
-      end
-
-      it { is_expected.to eq 'custom asdf value' }
-    end
-
-    context 'when field has link_to_search with true' do
-      before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'link_to_search_true' => ['x'] }).and_return('/foo')
-        allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      end
-
-      let(:field_name) { 'link_to_search_true' }
-
-      it { is_expected.to eq 'bar' }
+    it "checks for a link_to_facet" do
+      allow(request_context).to receive(:search_action_path).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.field_value 'link_to_facet_true'
+      expect(value).to eq 'bar'
     end
 
-    context 'when field has link_to_search with a field name' do
-      before do
-        allow(request_context).to receive(:search_action_path).with('f' => { 'some_field' => ['x'] }).and_return('/foo')
-        allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
-      end
-
-      let(:field_name) { 'link_to_search_named' }
-
-      it { is_expected.to eq 'bar' }
+    it "checks for a link_to_facet with a field name" do
+      allow(request_context).to receive(:search_action_path).and_return('/foo')
+      allow(request_context).to receive(:link_to).with("x", '/foo').and_return('bar')
+      value = subject.field_value 'link_to_facet_named'
+      expect(value).to eq 'bar'
     end
 
-    context 'when no highlight field is available' do
+    context "when no highlight field is available" do
       before do
         allow(document).to receive(:has_highlight_field?).and_return(false)
       end
-
-      let(:field_name) { 'highlight' }
-
-      it { is_expected.to be_blank }
-    end
-
-    context 'when highlight field is available' do
-      before do
-        allow(document).to receive(:has_highlight_field?).and_return(true)
-        allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      let(:value) { subject.field_value 'highlight' }
+      it "is blank" do
+        expect(value).to be_blank
       end
-
-      let(:field_name) { 'highlight' }
-
-      it { is_expected.to eq '<em>highlight</em>' }
     end
 
-    context 'when highlight returns multiple values' do
-      before do
-        allow(document).to receive(:has_highlight_field?).and_return(true)
-        allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe, '<em>other highlight</em>'.html_safe])
-      end
-
-      let(:field_name) { 'highlight' }
-
-      it { is_expected.to eq '<em>highlight</em> and <em>other highlight</em>' }
+    it "checks for a highlighted field" do
+      allow(document).to receive(:has_highlight_field?).and_return(true)
+      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe])
+      value = subject.field_value 'highlight'
+      expect(value).to eq '<em>highlight</em>'
     end
 
-    context 'when no options are provided' do
-      let(:field_name) { 'qwer' }
-
-      it "checks the document field value" do
-        expect(subject).to eq 'document qwer value'
-      end
+    it 'respects the HTML-safeness of multivalued highlight fields' do
+      allow(document).to receive(:has_highlight_field?).and_return(true)
+      allow(document).to receive(:highlight_field).with('highlight').and_return(['<em>highlight</em>'.html_safe, '<em>other highlight</em>'.html_safe])
+      value = subject.field_value 'highlight'
+      expect(value).to eq '<em>highlight</em> and <em>other highlight</em>'
     end
 
-    context 'when accessor is true' do
-      before do
-        allow(document).to receive_messages(solr_doc_accessor: "123")
-      end
-
-      let(:field_name) { 'solr_doc_accessor' }
-
-      it { is_expected.to eq '123' }
+    it "checks the document field value" do
+      value = subject.field_value 'qwer'
+      expect(value).to eq 'document qwer value'
     end
 
-    context 'when accessor is set to a value' do
-      let(:field_name) { 'explicit_accessor' }
-
-      it 'calls the accessor with the field_name as the argument' do
-        expect(document).to receive(:solr_doc_accessor).with('explicit_accessor').and_return("123")
+    it "works with show fields that aren't explicitly defined" do
+      value = subject.field_value 'mnbv'
+      expect(value).to eq 'document mnbv value'
+    end
 
-        expect(subject).to eq '123'
-      end
+    it "calls an accessor on the solr document" do
+      allow(document).to receive_messages(solr_doc_accessor: "123")
+      value = subject.field_value 'solr_doc_accessor'
+      expect(value).to eq "123"
     end
 
-    context 'when accessor is set to an array' do
-      let(:field_name) { 'explicit_array_accessor' }
+    it "calls an explicit accessor on the solr document" do
+      allow(document).to receive_messages(solr_doc_accessor: "123")
+      value = subject.field_value 'explicit_accessor'
+      expect(value).to eq "123"
+    end
 
-      it 'calls the accessors on the return of the preceeding' do
-        allow(document).to receive_message_chain(:solr_doc_accessor, some_method: "123")
+    it "calls an explicit array-style accessor on the solr document" do
+      allow(document).to receive_message_chain(:solr_doc_accessor, some_method: "123")
+      value = subject.field_value 'explicit_array_accessor'
+      expect(value).to eq "123"
+    end
 
-        expect(subject).to eq '123'
-      end
+    it "calls an accessor on the solr document with the field as an argument" do
+      allow(document).to receive(:solr_doc_accessor_with_arg).with('explicit_accessor_with_arg').and_return("123")
+      value = subject.field_value 'explicit_accessor_with_arg'
+      expect(value).to eq "123"
     end
   end
 
@@ -296,9 +260,8 @@ describe Blacklight::ShowPresenter do
     context 'for a field with the helper_method option' do
       let(:field_name) { 'field_with_helper' }
       let(:field_config) { config.add_facet_field 'field_with_helper', helper_method: 'render_field_with_helper' }
-
-      before do
-        document['field_with_helper'] = 'value'
+      let(:document) do
+        SolrDocument.new(id: 1, 'field_with_helper' => 'value')
       end
 
       it "checks call the helper method with arguments" do
@@ -319,30 +282,5 @@ describe Blacklight::ShowPresenter do
       end
     end
   end
-
-  describe 'deprecated methods' do
-    before do
-      allow(Deprecation).to receive(:warn)
-    end
-
-    let(:field_config) { config.add_index_field 'qwerty' }
-
-    describe '#get_field_values' do
-      it 'renders values for the given field' do
-        expect(subject.get_field_values(field_config, value: ['x', 'y'])).to eq 'x and y'
-      end
-    end
-
-    describe '#render_field_values' do
-      it 'renders values for the given field' do
-        expect(subject.render_field_values('x')).to eq 'x'
-      end
-    end
-
-    describe '#render_values' do
-      it 'renders values for the given field' do
-        expect(subject.render_values(['x', 'y', 'z'])).to eq 'x, y, and z'
-      end
-    end
-  end
 end
+