blacklight 8.11.0 → 9.0.0.beta2

data/spec/models/blacklight/configuration_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-RSpec.describe "Blacklight::Configuration", :api do
+RSpec.describe Blacklight::Configuration, :api do
   let(:config) do
-    Blacklight::Configuration.new
+    described_class.new
   end
 
   it "supports arbitrary configuration values" do
@@ -17,14 +17,18 @@ RSpec.describe "Blacklight::Configuration", :api do
       expect(config).to be_a Blacklight::OpenStructWithHashAccess
     end
 
-    it "accepts a block for configuration" do
-      config = Blacklight::Configuration.new(a: 1) { |c| c.a = 2 }
+    context 'when passed a block' do
+      let(:config) do
+        described_class.new(a: 1) { |c| c.a = 2 }
+      end
 
-      expect(config.a).to eq 2
+      it "accepts a block for configuration" do
+        expect(config.a).to eq 2
 
-      config.configure { |c| c.a = 3 }
+        config.configure { |c| c.a = 3 }
 
-      expect(config.a).to eq 3
+        expect(config.a).to eq 3
+      end
     end
   end
 
@@ -84,11 +88,11 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "spell_max" do
     it "defaults to 5" do
-      expect(Blacklight::Configuration.new.spell_max).to eq 5
+      expect(config.spell_max).to eq 5
     end
 
     it "accepts config'd value" do
-      expect(Blacklight::Configuration.new(spell_max: 10).spell_max).to eq 10
+      expect(described_class.new(spell_max: 10).spell_max).to eq 10
     end
   end
 
@@ -181,9 +185,9 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "add alternative solr fields" do
     it "lets you define any arbitrary solr field" do
-      Blacklight::Configuration.define_field_access :my_custom_field
+      described_class.define_field_access :my_custom_field
 
-      config = Blacklight::Configuration.new do |config|
+      config = described_class.new do |config|
         config.add_my_custom_field 'qwerty', label: "asdf"
       end
 
@@ -191,9 +195,9 @@ RSpec.describe "Blacklight::Configuration", :api do
     end
 
     it "lets you define a field accessor that uses an existing field-type" do
-      Blacklight::Configuration.define_field_access :my_custom_facet_field, class: Blacklight::Configuration::FacetField
+      described_class.define_field_access :my_custom_facet_field, class: Blacklight::Configuration::FacetField
 
-      config = Blacklight::Configuration.new do |config|
+      config = described_class.new do |config|
         config.add_my_custom_facet_field 'qwerty', label: "asdf"
       end
 
@@ -406,13 +410,13 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "add_search_field" do
     it "accepts hash form" do
-      c = Blacklight::Configuration.new
+      c = described_class.new
       c.add_search_field(key: "my_search_key")
       expect(c.search_fields["my_search_key"]).not_to be_nil
     end
 
     it "accepts two-arg hash form" do
-      c = Blacklight::Configuration.new
+      c = described_class.new
 
       c.add_search_field("my_search_type",
                          key: "my_search_type",
@@ -428,7 +432,7 @@ RSpec.describe "Blacklight::Configuration", :api do
     end
 
     it "accepts block form" do
-      c = Blacklight::Configuration.new
+      c = described_class.new
 
       c.add_search_field("some_field") do |field|
         field.solr_parameters = { qf: "solr_field^10" }
@@ -443,7 +447,7 @@ RSpec.describe "Blacklight::Configuration", :api do
     end
 
     it "accepts SearchField object" do
-      c = Blacklight::Configuration.new
+      c = described_class.new
 
       f = Blacklight::Configuration::SearchField.new(foo: "bar")
 
@@ -481,7 +485,7 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe "add_sort_field" do
     it "takes a hash" do
-      c = Blacklight::Configuration.new
+      c = described_class.new
       c.add_sort_field(key: "my_sort_key", sort: "score desc")
       expect(c.sort_fields["my_sort_key"]).not_to be_nil
     end
@@ -692,23 +696,23 @@ RSpec.describe "Blacklight::Configuration", :api do
 
   describe '.default_configuration' do
     it 'adds additional default configuration properties' do
-      Blacklight::Configuration.default_configuration do
-        Blacklight::Configuration.default_values[:a] = '123'
+      described_class.default_configuration do
+        described_class.default_values[:a] = '123'
       end
 
-      Blacklight::Configuration.default_configuration do
-        Blacklight::Configuration.default_values[:b] = 'abc'
+      described_class.default_configuration do
+        described_class.default_values[:b] = 'abc'
       end
 
-      expect(Blacklight::Configuration.default_values[:a]).to eq '123'
-      expect(Blacklight::Configuration.default_values[:b]).to eq 'abc'
+      expect(described_class.default_values[:a]).to eq '123'
+      expect(described_class.default_values[:b]).to eq 'abc'
     ensure
       # reset the default configuration
-      Blacklight::Configuration.default_values.delete(:a)
-      Blacklight::Configuration.default_values.delete(:b)
+      described_class.default_values.delete(:a)
+      described_class.default_values.delete(:b)
 
-      Blacklight::Configuration.default_configuration.delete_at(1)
-      Blacklight::Configuration.default_configuration.delete_at(2)
+      described_class.default_configuration.delete_at(1)
+      described_class.default_configuration.delete_at(2)
     end
   end
 end

data/spec/models/blacklight/facet_search_builder_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::FacetSearchBuilder, :api do
+  subject(:builder) { described_class.new processor_chain, scope }
+
+  let(:processor_chain) { [] }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:scope) { double blacklight_config: blacklight_config, search_state_class: nil }
+
+  describe "#facet_suggestion_query" do
+    it "is nil if no value is set" do
+      expect(subject.facet_suggestion_query).to be_nil
+    end
+
+    it "sets facet_suggestion_query value" do
+      expect(subject.facet_suggestion_query('antel').facet_suggestion_query).to eq 'antel'
+    end
+  end
+end

data/spec/models/blacklight/search_builder_spec.rb

@@ -125,7 +125,7 @@ RSpec.describe Blacklight::SearchBuilder, :api do
       end
 
       subject.with(a: 1)
-      expect(subject.processed_parameters).to include step_1: 'builder'
+      expect(subject.send(:processed_parameters)).to include step_1: 'builder'
     end
   end
 
@@ -225,16 +225,6 @@ RSpec.describe Blacklight::SearchBuilder, :api do
     end
   end
 
-  describe "#facet_suggestion_query" do
-    it "is nil if no value is set" do
-      expect(subject.facet_suggestion_query).to be_nil
-    end
-
-    it "sets facet_suggestion_query value" do
-      expect(subject.facet_suggestion_query('antel').facet_suggestion_query).to eq 'antel'
-    end
-  end
-
   describe "#search_field" do
     it "uses the requested search field" do
       blacklight_config.add_search_field 'x'

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+RSpec.describe Blacklight::Solr::DefaultFilterQueryBuilder do
+  subject { described_class.new(blacklight_config: blacklight_config) }
+
+  let(:blacklight_config) { CatalogController.blacklight_config.deep_copy }
+
+  describe "#facet_value_to_fq_string" do
+    it "uses the configured field name" do
+      blacklight_config.add_facet_field :facet_key, field: "facet_name"
+      expect(subject.send(:facet_value_to_fq_string, "facet_key", "my value")).to eq "{!term f=facet_name}my value"
+    end
+
+    it "uses the raw handler for strings" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", "my value")).to eq "{!term f=facet_name}my value"
+    end
+
+    it "passes booleans through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", true)).to eq '{!term f=facet_name}true'
+    end
+
+    it "passes boolean-like strings through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", "true")).to eq '{!term f=facet_name}true'
+    end
+
+    it "passes integers through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", 1)).to eq '{!term f=facet_name}1'
+    end
+
+    it "passes integer-like strings through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", "1")).to eq '{!term f=facet_name}1'
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", -1)).to eq '{!term f=facet_name}-1'
+    end
+
+    it "passes floats through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", 1.11)).to eq '{!term f=facet_name}1.11'
+    end
+
+    it "passes floats in strings through" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", "1.11")).to eq '{!term f=facet_name}1.11'
+    end
+
+    context 'date handling' do
+      before { allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(date: true, query: nil, tag: nil, field: 'facet_name')) }
+
+      it "passes date-type fields through" do
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", "2012-01-01")).to eq '{!term f=facet_name}2012-01-01'
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", "2003-04-09T00:00:00Z")).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
+      end
+
+      it "formats Date objects correctly" do
+        allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(date: nil, query: nil, tag: nil, field: 'facet_name'))
+        d = DateTime.parse("2003-04-09T00:00:00")
+        expect(subject.send(:facet_value_to_fq_string, "facet_name", d)).to eq '{!term f=facet_name}2003-04-09T00:00:00Z'
+      end
+    end
+
+    it "handles range requests" do
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", 1..5)).to eq "facet_name:[1 TO 5]"
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", 1..nil)).to eq "facet_name:[1 TO *]"
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", nil..5)).to eq "facet_name:[* TO 5]"
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", nil..nil)).to eq "facet_name:[* TO *]"
+    end
+
+    it "adds tag local parameters" do
+      allow(blacklight_config.facet_fields).to receive(:[]).with('facet_name').and_return(double(query: nil, tag: 'asdf', date: nil, field: 'facet_name'))
+
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", true)).to eq "{!term f=facet_name tag=asdf}true"
+      expect(subject.send(:facet_value_to_fq_string, "facet_name", "my value")).to eq "{!term f=facet_name tag=asdf}my value"
+    end
+  end
+end

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

@@ -179,10 +179,6 @@ RSpec.describe "Blacklight::Solr::Document", :api do
         # registration in an after, sorry.
       end
 
-      it "registers format" do
-        expect(defined?("Mime::MOCK2")).to be_truthy
-      end
-
       it "registers as alias only" do
         expect(Mime::Type.lookup("application/mock2")).not_to equal Mime::Type.lookup_by_extension("mock2")
       end