blacklight 8.1.0 → 8.2.1

data/spec/components/blacklight/document_component_spec.rb

@@ -154,7 +154,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
         def initialize(**); end
 
         def call
-          'embed'
+          'embed'.html_safe
         end
       end)
 
@@ -167,7 +167,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
         Class.new(Blacklight::DocumentMetadataComponent) do
           # Override component rendering with our own value
           def call
-            'blah'
+            'blah'.html_safe
           end
         end
       end
@@ -187,7 +187,7 @@ RSpec.describe Blacklight::DocumentComponent, type: :component do
         Class.new(Blacklight::DocumentTitleComponent) do
           # Override component rendering with our own value
           def call
-            'Titleriffic'
+            'Titleriffic'.html_safe
           end
         end
       end

data/spec/components/blacklight/facet_component_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe Blacklight::FacetComponent, type: :component do
         end
 
         def call
-          'Custom facet rendering'
+          'Custom facet rendering'.html_safe
         end
       end
     end

data/spec/components/blacklight/response/view_type_component_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Blacklight::Response::ViewTypeComponent, type: :component do
     Class.new(Blacklight::Icons::IconComponent) do
       # Override component rendering with our own value
       def call
-        'blah'
+        'blah'.html_safe
       end
     end
   end

data/spec/controllers/catalog_controller_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe CatalogController, api: true do
       it "has no docs or facet values for query without results", integration: true do
         get :index, params: { q: 'sadfdsafasdfsadfsadfsadf' } # query for no results
         expect(assigns(:response).docs).to be_empty
-        assigns(:response).aggregations.each do |_key, facet|
+        assigns(:response).aggregations.each_value do |facet|
           expect(facet.items).to be_empty
         end
       end
@@ -815,7 +815,7 @@ end
 def assert_facets_have_values(aggregations)
   expect(aggregations).not_to be_empty
   # should have at least one value for each facet
-  aggregations.each do |_key, facet|
+  aggregations.each_value do |facet|
     expect(facet.items).to have_at_least(1).item
   end
 end

data/spec/features/advanced_search_spec.rb

@@ -118,5 +118,11 @@ RSpec.describe "Blacklight Advanced Search Form" do
       expect(page.current_url).to match(/bread/)
       expect(page.current_url).not_to match(/medicine/)
     end
+
+    it "clears the prepopulated fields when the Start Over button is pressed" do
+      expect(page).to have_field 'Title', with: 'medicine'
+      click_on 'Start over'
+      expect(page).not_to have_field 'Title', with: 'medicine'
+    end
   end
 end

data/spec/features/citation_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe 'Citation functionality' do
+  before { visit solr_document_path('2007020969') }
+
+  it 'displays the Cite modal with expected header' do
+    click_link 'Cite'
+    expect(find('div.modal-header')).to have_text 'Cite'
+  end
+end

data/spec/features/sms_spec.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+RSpec.describe 'SMS functionality' do
+  before { visit solr_document_path('2007020969') }
+
+  it 'displays SMS modal with form' do
+    click_link 'SMS'
+    expect(find('div.modal-header')).to have_text 'SMS This'
+    fill_in 'Phone Number:', with: '555-555-5555'
+    select 'Verizon', from: 'Carrier'
+  end
+end

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

@@ -48,7 +48,7 @@ RSpec.describe Blacklight::Solr::Response, api: true do
 
     expect(received).to eq expected
 
-    r.aggregations.each do |_key, facet|
+    r.aggregations.each_value do |facet|
       expect(facet).to respond_to :name
       expect(facet).to respond_to :sort
       expect(facet).to respond_to :offset

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

@@ -335,6 +335,7 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
           qf: '$subject_qf',
           pf: '$subject_pf'
         }
+        blacklight_config.search_fields['subject'].clause_params = nil
       end
 
       it "looks up qt from field definition" do
@@ -374,6 +375,18 @@ RSpec.describe Blacklight::Solr::SearchBuilderBehavior, api: true do
         expect(key_value_pairs).to include("pf=$subject_pf")
         expect(key_value_pairs).to include("qf=$subject_qf")
       end
+
+      context 'when subject field uses JSON query DSL' do
+        before do
+          blacklight_config.search_fields['subject'].clause_params = {
+            edismax: {}
+          }
+        end
+
+        it "includes spellcheck.q, without LocalParams" do
+          expect(subject["spellcheck.q"]).to eq "wome"
+        end
+      end
     end
 
     describe "solr json query parameters from the fielded search" do

data/spec/models/solr_document_spec.rb

@@ -49,6 +49,7 @@ RSpec.describe SolrDocument, api: true do
         attribute :author, :array, 'author_tesim', of: :string
         attribute :first_author, :select, 'author_tesim', by: :min
         attribute :date, :date, field: 'date_dtsi'
+        attribute :time, :time, field: 'date_dtsi'
         attribute :whatever, :string, default: ->(*) { 'default_value' }
       end
     end
@@ -56,14 +57,17 @@ RSpec.describe SolrDocument, api: true do
       doc_class.new(id: '123',
                     title_tesim: ['Good Omens'],
                     author_tesim: ['Neil Gaiman', 'Terry Pratchett'],
-                    date_dtsi: '1990-01-01T00:00:00Z')
+                    date_dtsi: '1990-01-01T17:23:13Z')
     end
 
     it "casts the attributes" do
       expect(document.title).to eq 'Good Omens'
       expect(document.author).to eq ['Neil Gaiman', 'Terry Pratchett']
       expect(document.first_author).to eq 'Neil Gaiman'
-      expect(document.date).to eq Date.new(1990)
+      expect(document.date).to be_a Date
+      expect(document.date.to_s).to eq '1990-01-01'
+      expect(document.time).to be_a Time
+      expect(document.time.to_s).to eq '1990-01-01 17:23:13 UTC'
       expect(document.whatever).to eq 'default_value'
     end
 

data/spec/spec_helper.rb

@@ -118,31 +118,3 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 end
-
-# RSpec's stub_template method needs a differnet implementation for Rails 7.1, that
-# isn't yet in an rspec-rails release.
-#
-# First rspec-rails tried this:
-#   https://github.com/rspec/rspec-rails/commit/4d65bea0619955acb15023b9c3f57a3a53183da8
-#
-# But it was subject to this problem:
-#   https://github.com/rspec/rspec-rails/issues/2696
-#
-# Below implementation appears to work for our purposes here, so we will patch it in
-# if we are on Rails 7.1+, and  not yet rspec-rails 6.1 which we expect to have it.
-
-if ::Rails.version.to_f >= 7.1 && Gem.loaded_specs["rspec-rails"].version.release < Gem::Version.new('6.1')
-
-  module RSpec
-    module Rails
-      module ViewExampleGroup
-        module ExampleMethods
-          def stub_template(hash)
-            controller.prepend_view_path(StubResolverCache.resolver_for(hash))
-          end
-        end
-      end
-    end
-  end
-
-end

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 gem 'rails-controller-testing'
-gem 'thor', '~> 0.20' if /^5.[12]/.match?(ENV['RAILS_VERSION'])
 
 unless ENV['VIEW_COMPONENT_VERSION'].to_s == ""
   gem 'view_component', ENV.fetch('VIEW_COMPONENT_VERSION')

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

@@ -30,7 +30,7 @@ RSpec.describe "catalog/_document" do
       Class.new(Blacklight::DocumentComponent) do
         # Override component rendering with our own value
         def call
-          'blah'
+          'blah'.html_safe
         end
       end
     end

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

@@ -95,7 +95,7 @@ RSpec.describe "catalog/index" do
       before do
         my_template = Class.new(ViewComponent::Base) do
           def call
-            'whatever content'
+            'whatever content'.html_safe
           end
 
           def self.name

data/template.demo.rb

@@ -2,12 +2,12 @@
 
 gem 'blacklight', '>= 7.0'
 
-run "bundle install"
+after_bundle do
+  # run the blacklight install generator
+  options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc')
 
-# run the blacklight install generator
-options = ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", '--devise --marc')
+  generate 'blacklight:install', options
 
-generate 'blacklight:install', options
-
-# run the database migrations
-rake "db:migrate"
+  # run the database migrations
+  rake "db:migrate"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -788,6 +788,7 @@ files:
 - spec/features/autocomplete_spec.rb
 - spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
+- spec/features/citation_spec.rb
 - spec/features/component_template_override_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
@@ -804,6 +805,7 @@ files:
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
 - spec/features/sitelinks_search_box_spec.rb
+- spec/features/sms_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
 - spec/helpers/blacklight/facets_helper_behavior_spec.rb
@@ -923,7 +925,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -965,6 +967,7 @@ test_files:
 - spec/features/autocomplete_spec.rb
 - spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
+- spec/features/citation_spec.rb
 - spec/features/component_template_override_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
@@ -981,6 +984,7 @@ test_files:
 - spec/features/search_sort_spec.rb
 - spec/features/search_spec.rb
 - spec/features/sitelinks_search_box_spec.rb
+- spec/features/sms_spec.rb
 - spec/fixtures/sample_solr_documents.yml
 - spec/helpers/blacklight/configuration_helper_behavior_spec.rb
 - spec/helpers/blacklight/facets_helper_behavior_spec.rb