blacklight 7.35.0 → 7.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841946108f3216c1dfc66f10787069b43fdcca041e9cc3e114524bf0a5cf6aa1
-  data.tar.gz: 621f2d5648013ab85fa3c3c99a001824e49b24be263cd1eda45a7f5ed9e22daa
+  metadata.gz: f765559b5df84d243537823f81c5b6d9fccca157bf7cc17a1c857067f76c4a79
+  data.tar.gz: d0de6aa0209d19691e48569b9aa33011f13259755502997082add198ad6e21de
 SHA512:
-  metadata.gz: 9ae81c46a04f928701d7e16c227bf33ae9ed0ae214e6ef94bbf96bc0b33aa22ff889e286a1235d6c6a225e11597fe3e832db2c5242cc71a533229ee75dc2b407
-  data.tar.gz: 2005c22b35ac7a9f4c3fb065f412a6369bcf903f918bc46770d23999a509bae45d855c83b14a0e167f3acbafd900ae63f6fe4cfe30de98f8d97bb17980a64c49
+  metadata.gz: d241feeec8c93d23cfbe7a8b9b8600e2cd10ccfe52ddd26e8706b721173311033b31d9378226929008fa8d9326828c9e9363646d67a48f74359fda7479b1a468
+  data.tar.gz: bc1df26425a9e43efb3b01bbdcdf31e4b9fd3ad2ee9e6215780e485bf1c7f62d6b625a5c554549f183c1ce104503bba175e0830349cdadc981c7d895d0c440c8

data/.env

@@ -1,5 +1,5 @@
-ALPINE_RUBY_VERSION=2.7.5
-RAILS_VERSION=5.2.6
+ALPINE_RUBY_VERSION=3.2.2
+RAILS_VERSION=7.0.8
 VIEW_COMPONENT_VERSION=2.6.6
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core

data/.github/workflows/ruby.yml

@@ -23,7 +23,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run linter
@@ -32,14 +32,16 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: [3.1, 3.2]
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -51,13 +53,15 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.0']
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -76,7 +80,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
       env:
@@ -97,7 +101,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
       env:
@@ -107,27 +111,25 @@ jobs:
       env:
         RAILS_VERSION: 5.2.8.1
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-
   test_rails6_1:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby: ['3.0']
+    env:
+      RAILS_VERSION: 6.1.6.1
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
-      env:
-        RAILS_VERSION: 6.1.6.1
     - name: Run tests
       run: bundle exec rake ci
       env:
-        RAILS_VERSION: 6.1.6.1
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
   test_vc3:
     runs-on: ubuntu-latest
@@ -135,6 +137,7 @@ jobs:
       matrix:
         ruby: ['3.2']
     env:
+      RAILS_VERSION: 7.0.8
       VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
     steps:
     - uses: actions/checkout@v2
@@ -142,7 +145,7 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-        bundler: 'latest'
+        bundler: 'default'
     - name: Install dependencies
       run: bundle install
     - name: Run tests
@@ -154,12 +157,14 @@ jobs:
     strategy:
       matrix:
         ruby: [2.7, '3.0']
+    env:
+      RAILS_VERSION: 7.0.8
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        bundler: 'latest'
+        bundler: 'default'
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
       run: bundle install

data/Gemfile

@@ -48,3 +48,29 @@ end
 # END ENGINE_CART BLOCK
 
 eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))
+
+gem "rubocop", "~> 1.60"
+
+gem "rubocop-capybara", "~> 2.20"
+
+gem "rubocop-rspec", "~> 2.26"
+
+gem "rubocop-rails", "~> 2.23"
+
+gem "rspec", "~> 3.12"
+
+gem "simplecov", "~> 0.22.0"
+
+gem "engine_cart", "~> 2.6"
+
+gem "rspec-rails", "~> 6.1"
+
+gem "rspec-collection_matchers", "~> 1.2"
+
+gem "capybara", "~> 3.39"
+
+gem "selenium-webdriver", "~> 4.16"
+
+gem "equivalent-xml", "~> 0.6.0"
+
+gem "axe-core-rspec", "~> 4.8"

data/VERSION

@@ -1 +1 @@
-7.35.0
+7.36.1

data/app/components/blacklight/advanced_search_form_component.rb

@@ -33,7 +33,7 @@ module Blacklight
       options = sort_fields.values.map { |field_config| [helpers.sort_field_label(field_config.key), field_config.key] }
       return unless options.any?
 
-      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-control sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
+      select_tag(:sort, options_for_select(options, params[:sort]), class: "form-select custom-select sort-select w-auto", aria: { labelledby: 'advanced-search-sort-label' })
     end
 
     private

data/app/components/blacklight/facet_field_component.html.erb

@@ -20,7 +20,7 @@
         <div class="more_facets">
           <%= link_to t("more_#{@facet_field.key}_html", scope: 'blacklight.search.facets', default: :more_html, field_name: @facet_field.label),
             @facet_field.modal_path,
-            data: { blacklight_modal: 'trigger' } %>
+            data: { blacklight_modal: 'trigger', turbo: false } %>
         </div>
       <% end %>
     </div>

data/app/views/catalog/_citation.html.erb

@@ -1,5 +1,5 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.tools.citation') } %>
+  <% component.with_title { t('blacklight.tools.citation') } %>
 
   <%= render Blacklight::Document::CitationComponent.with_collection(@documents) if @documents.present? %>
 <% end %>

data/app/views/catalog/email.html.erb

@@ -1,7 +1,7 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.email.form.title') } %>
+  <% component.with_title { t('blacklight.email.form.title') } %>
 
-  <% component.body do %>
+  <% component.with_body do %>
     <%= render 'email_form' %>
   <% end %>
 <% end %>

data/app/views/catalog/sms.html.erb

@@ -1,7 +1,7 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.sms.form.title') } %>
+  <% component.with_title { t('blacklight.sms.form.title') } %>
 
-  <% component.body do %>
+  <% component.with_body do %>
     <%= render 'sms_form' %>
   <% end %>
 <% end %>

data/app/views/shared/_modal.html.erb

@@ -1,4 +1,4 @@
-<div id="blacklight-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+<div id="blacklight-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true" data-turbo="false">
   <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
     </div>

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.35.0
+  version: 7.36.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-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -810,6 +810,7 @@ files:
 - spec/features/autocomplete_spec.rb
 - spec/features/axe_spec.rb
 - spec/features/bookmarks_spec.rb
+- spec/features/citation_spec.rb
 - spec/features/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
@@ -824,6 +825,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
@@ -955,7 +957,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
@@ -994,6 +996,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/did_you_mean_spec.rb
 - spec/features/facet_missing_spec.rb
 - spec/features/facets_spec.rb
@@ -1008,6 +1011,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