blacklight-gallery 4.4.1 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 961f640e56b764735aef81bd840df36caacfbf81c493c0b673c1a541d9aca1a8
-  data.tar.gz: a37481f4b036cc67a0d00d925634c61e0702f673f9fc741df8234bdbc137244a
+  metadata.gz: 489c0dc3753e54b640a5e7c45247f1cc35a5761fe40f3d210c3d916b745d02aa
+  data.tar.gz: 687bc2a13226ddbbb6086c0273c74d06fd31f45b07f74933e550112c6f3e143a
 SHA512:
-  metadata.gz: fb24ef250ddcc2aa65ecca6dae9698bcc8f5326a01912272a3e29423c8de17c062dffe5866fd4cd0936e3c97d177974497def182c16805333c573ce57dc49e34
-  data.tar.gz: 9a6964b2c111118a74d02a1e31e9db4d252f8704f70a3304b2628a831fbf89cc4ffa2ba7a889a5c7ac092e4b4692b3a6571b6cb78a04afdb9091ed3f01755901
+  metadata.gz: 0b6b951139a002872a5f4b4c1831f9b43ae21b9f95821c260f25dcac0949905a7fa3cf04b66df2f3cdde566536583c428893712c7be10e48d1371eb8f5c1955e
+  data.tar.gz: 77a7c845ce3c8a191b225d63f81700347cf9e21dd23334b6ca54c602006719e3b9831f89d9c386c4452b6f8183ebda91d8ae9218cc0835904767cc421dc7cab8

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

data/.github/workflows/ruby.yml

@@ -43,7 +43,7 @@ jobs:
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
       ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:

data/app/assets/javascripts/blacklight_gallery/slideshow.js

@@ -84,10 +84,12 @@
         _this.play();
       });
 
-      $(document).on('click', '[data-slide], [data-slide-to]', function(e) {
+      $(document).on('click', '[data-slide], [data-bs-slide], [data-slide-to], [data-bs-slide-to]', function(e) {
         e.preventDefault();
 
-        pos = parseInt($(this).attr('data-slide-to'), 10) || $(this).attr('data-slide');
+        pos = parseInt($(this).attr('data-slide-to') || $(this).attr('data-bs-slide-to'), 10) ||
+                $(this).attr('data-slide') ||
+                $(this).attr('data-bs-slide');
 
         if (pos === 'next' || pos === 'prev') _this.pause();
         _this.to(pos);

data/app/components/blacklight/gallery/slideshow_preview_component.html.erb

@@ -1,9 +1,9 @@
 <% component = Blacklight::VERSION > '8' ?
   Blacklight::DocumentComponent.new(classes: 'slideshow-preview-thumbnail', component: :div, document: @presenter, counter: @counter) :
   Blacklight::DocumentComponent.new(classes: 'slideshow-preview-thumbnail', component: :div, document: @document, presenter: @presenter, counter: @counter)
-%> 
+%>
 <%= render(component) do |component| %>
   <% component.with_body do %>
-    <%= @view_context.link_to_document(@document, thumbnail, class: 'thumbnail', data: { 'context-href': nil, 'slide-to': @document_counter, toggle: "modal", target: "#slideshow-modal" }) %>
+    <%= link_to_document %>
   <% end %>
 <% end %>

data/app/components/blacklight/gallery/slideshow_preview_component.rb

@@ -35,6 +35,24 @@ module Blacklight
       def render_document_class(*args)
         @view_context.render_document_class(*args)
       end
+
+      def link_to_document
+        helpers.link_to_document(@document, thumbnail, class: 'thumbnail', data: data_attributes)
+      end
+
+      def data_attributes
+        # 'context-href': nil is for Blacklight < 7.38, :context_href is for those after 7.38
+        {
+          'context-href': nil,
+          context_href: nil,
+          'slide-to': @document_counter,
+          'bs-slide-to': @document_counter,
+          toggle: "modal",
+          'bs-toggle': "modal",
+          target: "#slideshow-modal",
+          'bs-target': "#slideshow-modal"
+        }
+      end
     end
   end
 end

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

@@ -14,10 +14,10 @@
       </div>
 
       <!-- Controls -->
-      <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
+      <a class="left carousel-control prev" href="#slideshow" data-slide="prev" data-bs-slide="prev">
         <%= render Blacklight::Gallery::Icons::ChevronLeftComponent.new additional_options: { label_context: 'previous_image' } %>
       </a>
-      <a class="right carousel-control next" href="#slideshow" data-slide="next">
+      <a class="right carousel-control next" href="#slideshow" data-slide="next" data-bs-slide="next">
         <%= render Blacklight::Gallery::Icons::ChevronRightComponent.new additional_options: { label_context: 'next_image' } %>
       </a>
 

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

@@ -3,8 +3,8 @@
     <div class="modal-dialog modal-xl">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-            <span aria-hidden="true">&times;</span>
+          <button type="button" class="blacklight-modal-close btn-close close btn-close-white" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+            <span aria-hidden="true" class="visually-hidden">&times;</span>
           </button>
         </div>
         <div class="modal-body">

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "4.4.1"
+    VERSION = "4.5.1"
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-gallery",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Gallery views for Blacklight search results",
   "main": "app/assets/javascripts/blacklight_gallery/default.js",
   "files": [

data/spec/features/slideshow_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "Slideshow", :js, :type => :feature do
+RSpec.describe 'Slideshow', default_max_wait_time: 10, js: true do
 
-  it "should open when one of the grid panes are clicked" do
-    visit search_catalog_path( :q => 'medicine', :view => 'slideshow' )
-    expect(page).to have_content "You searched for:"
-    within ".view-type" do
-      click_link "Slideshow"
+  it 'opens when one of the grid panes is clicked' do
+    visit search_catalog_path( q: 'medicine', view: 'slideshow' )
+    expect(page).to have_content 'You searched for:'
+    within '.view-type' do
+      click_link 'Slideshow'
     end
 
-    find('.grid [data-slide-to="0"]').click
+    find('.grid [data-slide-to="0"], .grid [data-bs-slide-to="0"]').click
+    expect(page).to have_css('.slideshow-inner .item')
   end
-
 end

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

@@ -30,8 +30,9 @@ RSpec.describe "catalog/_document_slideshow", :type => :view do
   it 'has a modal' do
     render 'catalog/document_slideshow', view_config: view_config
     expect(rendered).to have_selector '#slideshow-modal'
-    expect(rendered).to have_selector '[data-slide="prev"]'
-    expect(rendered).to have_selector '[data-slide="next"]'
-    expect(rendered).to have_selector '[data-slide-to="0"][data-toggle="modal"][data-target="#slideshow-modal"]'
+    expect(rendered).to have_selector '[data-slide="prev"][data-bs-slide="prev"]'
+    expect(rendered).to have_selector '[data-slide="next"][data-bs-slide="next"]'
+    expect(rendered).to have_selector '[data-slide-to="0"][data-bs-slide-to="0"][data-toggle="modal"]' \
+                                      '[data-bs-toggle="modal"][data-target="#slideshow-modal"]'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,6 +197,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".solr_wrapper.yml"
@@ -318,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: Gallery display for Blacklight