blacklight 7.20.1 → 7.22.0

data/spec/models/blacklight/document/email_spec.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe "Blacklight::Document::Email" do
+  let(:config) do
+    Blacklight::Configuration.new
+  end
+
   before(:all) do
     SolrDocument.use_extension(Blacklight::Document::Email)
   end
@@ -22,4 +26,32 @@ RSpec.describe "Blacklight::Document::Email" do
     doc = SolrDocument.new(id: "1234")
     expect(doc.to_email_text).to be_nil
   end
+
+  context "we pass in configuration with email fields set" do
+    it "uses the email fields for to_email_text" do
+      config.add_email_field("foo", label: "Foo:")
+      config.add_email_field("bar", label: "Bar:")
+      doc = SolrDocument.new(id: "1234", foo: ["Fuzz Fuzz", "Fizz Fizz"], bar: ["Buzz Buzz", "Bizz Bizz"])
+
+      expect(doc.to_email_text(config)).to eq("Foo: Fuzz Fuzz Fizz Fizz\nBar: Buzz Buzz Bizz Bizz")
+    end
+  end
+
+  context "we pass in configuration with email fields no set" do
+    it "falls back on default semantics setup" do
+      doc = SolrDocument.new(id: "1234", title_tsim: ["My Title", "My Alt. Title"])
+      email_body = doc.to_email_text(config)
+      expect(email_body).to match(/Title: My Title/)
+    end
+  end
+
+  context "document field is single valued" do
+    it "handles the single value field correctly" do
+      config.add_email_field("foo", label: "Foo:")
+      config.add_email_field("bar", label: "Bar:")
+      doc = SolrDocument.new(id: "1234", foo: "Fuzz Fuzz", bar: ["Buzz Buzz", "Bizz Bizz"])
+
+      expect(doc.to_email_text(config)).to eq("Foo: Fuzz Fuzz\nBar: Buzz Buzz Bizz Bizz")
+    end
+  end
 end

data/spec/models/blacklight/document/sms_spec.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe "Blacklight::Document::Email" do
+  let(:config) do
+    Blacklight::Configuration.new
+  end
+
   before(:all) do
     SolrDocument.use_extension(Blacklight::Document::Sms)
   end
@@ -22,4 +26,33 @@ RSpec.describe "Blacklight::Document::Email" do
     doc = SolrDocument.new(id: "1234")
     expect(doc.to_sms_text).to be_nil
   end
+
+  context "we pass in configuration with sms fields set" do
+    it "uses the sms fields for to_sms_text" do
+      config.add_sms_field("foo", label: "Foo:")
+      config.add_sms_field("bar", label: " by")
+      doc = SolrDocument.new(id: "1234", foo: ["Fuzz Fuzz", "Fizz Fizz"], bar: ["Buzz Buzz", "Bizz Bizz"])
+
+      expect(doc.to_sms_text(config)).to eq("Foo: Fuzz Fuzz by Buzz Buzz")
+    end
+  end
+
+  context "we pass in configuration with sms fields no set" do
+    it "falls back on default semantics setup" do
+      doc = SolrDocument.new(id: "1234", title_tsim: ["My Title", "My Alt. Title"])
+      sms_text = doc.to_sms_text(config)
+      expect(sms_text).to match(/My Title/)
+      expect(sms_text).not_to match(/My Alt\. Title/)
+    end
+  end
+
+  context "document field is single valued" do
+    it "handles the single value field correctly" do
+      config.add_sms_field("foo", label: "Foo:")
+      config.add_sms_field("bar", label: " by")
+      doc = SolrDocument.new(id: "1234", foo: "Fuzz Fuzz", bar: ["Buzz Buzz", "Bizz Bizz"])
+
+      expect(doc.to_sms_text(config)).to eq("Foo: Fuzz Fuzz by Buzz Buzz")
+    end
+  end
 end

data/spec/models/blacklight/solr/response/facets_spec.rb

@@ -102,6 +102,12 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
         expect(subject.aggregations['my_field'].prefix).to be_nil
       end
     end
+
+    describe '#response' do
+      it 'provides access to the full solr response' do
+        expect(subject.aggregations['my_field'].response).to eq subject
+      end
+    end
   end
 
   describe "#merge_facet" do
@@ -155,7 +161,7 @@ RSpec.describe Blacklight::Solr::Response::Facets, api: true do
     end
 
     it "marks the facet.missing field with a human-readable label and fq" do
-      missing = subject.aggregations["some_field"].items.find { |i| i.value.nil? }
+      missing = subject.aggregations["some_field"].items.find(&:missing)
 
       expect(missing.label).to eq "[Missing]"
       expect(missing.fq).to eq "-some_field:[* TO *]"

data/spec/models/blacklight/solr/search_builder_spec.rb

@@ -27,10 +27,6 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
     it "uses the class-level default_processor_chain" do
       expect(subject.processor_chain).to eq search_builder_class.default_processor_chain
     end
-
-    it "appends the :add_missing_field_query processor" do
-      expect(subject.processor_chain).to include(:add_missing_field_query)
-    end
   end
 
   context 'with merged parameters from the defaults + the search field' do
@@ -826,13 +822,4 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
       expect(subject.to_hash).to include q: '{!lucene}id:(1 OR 2 OR 3)'
     end
   end
-
-  describe "#add_missing_field_query" do
-    it "precesses facet.missing query" do
-      subject.with("f" => { "-hello:" => [""] })
-      solr_params = { "facet.missing" => true, fq: [] }
-
-      expect(subject.add_missing_field_query(solr_params)).to eq(["-hello:[* TO *]"])
-    end
-  end
 end

data/spec/models/record_mailer_spec.rb

@@ -1,17 +1,24 @@
 # frozen_string_literal: true
 
 RSpec.describe RecordMailer do
+  let(:config) do
+    Blacklight::Configuration.new
+  end
+
+  let(:document) do
+    SolrDocument.new(id: "123456", format: ["book"], title_tsim: "The horn", language_ssim: "English", author_tsim: "Janetzky, Kurt")
+  end
+
   before do
     allow(described_class).to receive(:default).and_return(from: 'no-reply@projectblacklight.org')
     SolrDocument.use_extension(Blacklight::Document::Email)
     SolrDocument.use_extension(Blacklight::Document::Sms)
-    document = SolrDocument.new(id: "123456", format: ["book"], title_tsim: "The horn", language_ssim: "English", author_tsim: "Janetzky, Kurt")
     @documents = [document]
   end
 
   describe "email" do
     before do
-      details = { to: 'test@test.com', message: "This is my message" }
+      details = { to: 'test@test.com', message: "This is my message", config: config }
       @email = described_class.email_record(@documents, details, host: 'projectblacklight.org', protocol: 'https')
     end
 
@@ -42,6 +49,27 @@ RSpec.describe RecordMailer do
       @https_email = described_class.email_record(@documents, details, host: 'projectblacklight.org', protocol: 'https')
       expect(@https_email.body).to match %r{https://projectblacklight.org/}
     end
+
+    context "email title_field is configured and multi valued" do
+      let(:document) { SolrDocument.new(id: "123456", foo: ["Fizz Fizz", "Fuzz Fuzz"], format: ["book"], title_tsim: "The horn", language_ssim: "English", author_tsim: "Janetzky, Kurt") }
+
+      it "uses configured email title_field" do
+        config.email.title_field = "foo"
+        expect(@email.subject).to match("Fizz Fizz")
+        expect(@email.subject).not_to match("Fuzz Fuzz")
+        expect(@email.subject).not_to match("The horn")
+      end
+    end
+
+    context "email title_field is configured and single valued" do
+      let(:document) { SolrDocument.new(id: "123456", foo: "Fizz Fizz", format: ["book"], title_tsim: "The horn", language_ssim: "English", author_tsim: "Janetzky, Kurt") }
+
+      it "uses configured email title_field" do
+        config.email.title_field = "foo"
+        expect(@email.subject).to match("Fizz Fizz")
+        expect(@email.subject).not_to match("The horn")
+      end
+    end
   end
 
   describe "SMS" do

data/spec/spec_helper.rb

@@ -10,9 +10,6 @@ SimpleCov.start do
   add_filter "/spec/"
 end
 
-require 'rsolr'
-require 'blacklight'
-
 require 'engine_cart'
 EngineCart.load_application!
 
@@ -25,6 +22,9 @@ require 'selenium-webdriver'
 require 'equivalent-xml'
 require 'axe-rspec'
 
+require 'rsolr'
+require 'blacklight'
+
 Capybara.javascript_driver = :headless_chrome
 
 Capybara.register_driver :headless_chrome do |app|

data/tasks/blacklight.rake

@@ -21,7 +21,11 @@ def system_with_error_handling(*args)
 end
 
 def with_solr
-  if system('docker-compose -v')
+  # We're being invoked by the app entrypoint script and solr is already up via docker-compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker-compose -v')
+    # We're not running docker-compose up but still want to use a docker instance of solr.
     begin
       puts "Starting Solr"
       system_with_error_handling "docker-compose up -d solr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.20.1
+  version: 7.22.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -14,10 +14,10 @@ authors:
 - Dan Funk
 - Naomi Dushay
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -378,8 +378,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".babelrc"
 - ".docker/app/Dockerfile"
 - ".docker/app/entrypoint.sh"
+- ".dockerignore"
 - ".env"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -918,7 +920,7 @@ homepage: http://projectblacklight.org/
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -933,8 +935,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.