blacklight-gallery 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c352955a6ff3422f81258dd566cfe58114da0c93f65241e70ae093ee3a76dfb
-  data.tar.gz: 58707632ea6223e59985771c6cb79f5cfa3a2e410e44cb5f02a631ed24f2c7be
+  metadata.gz: c6cef93b47ca74eb2e2cf9083baafce7e28948cc568b1146dd30f98a842720f6
+  data.tar.gz: 890631e78d834ac011666bb1b652ef97f9948b12352a4085c421b4e6f7aec6f7
 SHA512:
-  metadata.gz: b3220d3e51e3a178532a61678631b3d4dba3b0d38042a0bc4b9a62e447daefce4afa3833b4d2d0cce41442088af8004b4791e1e54e2bd42f2dfdfdfa600a7c51
-  data.tar.gz: dda77c2f7e9e80bb37e4783b6559e53cc0acaa6a403e3b17f66fc8a5db3501f01cc2c9f3844747809bf54f1f8e37648b3099102a428e6d169cd30045090f2b15
+  metadata.gz: 79942d8ad4a805a6020fc30e96e26fc392ea38b51dbab5868379a2744fd6ee798fd1b75f9c71f744678456deb165e3510e31820ff24f5c2eb7e21c9343be3c7f
+  data.tar.gz: 136ddeb750ddafe01d690265d734e9a183ffefebd896a024e893ae4fd8ab41762c5558fc72a4a88a7198358be9bc5594c69fc3de84304e7f1d2677148ecc64d0

data/README.md

@@ -1,5 +1,5 @@
 # Blacklight::Gallery
-[![Gem Version](https://badge.fury.io/rb/blacklight-gallery.svg)](http://badge.fury.io/rb/blacklight-gallery)  [![Build Status](https://travis-ci.org/projectblacklight/blacklight-gallery.svg?branch=master)](https://travis-ci.org/projectblacklight/blacklight-gallery)
+[![Gem Version](https://badge.fury.io/rb/blacklight-gallery.svg)](http://badge.fury.io/rb/blacklight-gallery) [![CI](https://github.com/projectblacklight/blacklight-gallery/actions/workflows/ruby.yml/badge.svg)](https://github.com/projectblacklight/blacklight-gallery/actions/workflows/ruby.yml)
 
 Gallery views for Blacklight search results
 

data/app/assets/stylesheets/blacklight_gallery/_slideshow.scss

@@ -85,10 +85,16 @@ $gray-dark: #343a40 !default;
 
   .caption {
     font-size: 1rem;
-    color: $gray-light;
     margin: 10px auto;
     min-width: 200px;
     max-width: 50%;
+    a {
+      color: $gray-light;
+      text-decoration: underline;
+      &:hover, &:focus {
+        color: #ffffff;
+      }
+    }
   }
 
   .counter {

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

@@ -2,7 +2,7 @@
   <div class="frame">
       <%= slideshow_tag %>
       <div class="caption">
-        <%= presenter.heading %>
+        <%= helpers.link_to_document(presenter.document, presenter.heading, counter: @counter) %>
       </div>
 
       <span class="counter">

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

@@ -20,11 +20,11 @@ module Blacklight
           method_name = view_config.slideshow_method
           @view_context.send(method_name, @document, image_options)
         elsif view_config.slideshow_field
-          url = slideshow_image_url
-
-          image_tag url, image_options if url.present?
+          return if slideshow_image_url.blank?
+          image = image_tag slideshow_image_url, image_options
+          helpers.link_to_document(@document, image)
         elsif presenter.thumbnail.exists?
-          presenter.thumbnail.thumbnail_tag(image_options, url_options.reverse_merge(suppress_link: true))
+          presenter.thumbnail.thumbnail_tag(image_options)
         end
       end
 

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "3.4.0"
+    VERSION = "3.5.0"
   end
 end

data/spec/components/blacklight/gallery/slideshow_component_spec.rb

@@ -15,20 +15,30 @@ RSpec.describe Blacklight::Gallery::SlideshowComponent, type: :component do
     Capybara::Node::Simple.new(render)
   end
 
-  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:document) do
+    SolrDocument.new(
+      id: 'x',
+    )
+  end
+
   let(:presenter) { Blacklight::IndexPresenter.new(document, view_context, blacklight_config) }
 
   before do
+    allow(view_context).to receive(:current_search_session).and_return(nil)
+    allow(view_context).to receive(:search_session).and_return({})
     allow(view_context).to receive(:blacklight_config).and_return(blacklight_config)
   end
 
   describe '#slideshow_tag' do
     subject { rendered }
 
-    let(:document) { SolrDocument.new({}) }
-
     context 'with a slideshow method' do
-      let(:blacklight_config) { Blacklight::Configuration.new.tap { |config| config.index.slideshow_method = :xyz } }
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.tap do |config|
+          config.index.slideshow_method = :xyz
+          config.track_search_session = false
+        end
+      end
 
       it 'calls the provided slideshow method' do
         expect(view_context).to receive_messages(xyz: 'some-slideshow')
@@ -41,26 +51,39 @@ RSpec.describe Blacklight::Gallery::SlideshowComponent, type: :component do
       end
     end
 
-    context 'with a field' do
-      let(:blacklight_config) { Blacklight::Configuration.new.tap { |config| config.index.slideshow_field = :xyz } }
-      let(:document) { SolrDocument.new({ xyz: 'http://example.com/some.jpg' }) }
+    context 'with a slideshow field' do
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.tap do |config|
+          config.index.slideshow_field = :xyz 
+          config.track_search_session = false
+        end
+      end
+      let(:document) { SolrDocument.new({ xyz: 'http://example.com/some.jpg', id: 'x' }) }
 
       it { is_expected.to have_selector 'img[src="http://example.com/some.jpg"]' }
 
       context 'without data in the field' do
-        let(:document) { SolrDocument.new({}) }
+        let(:document) { SolrDocument.new({id: 'x'}) }
 
         it { is_expected.not_to have_selector 'img' }
       end
     end
 
-    context 'with nothing configured' do
+    context 'with no view_config' do
+      let(:blacklight_config) { Blacklight::Configuration.new.tap { |config| 
+        config.track_search_session = false
+      } }
       it { is_expected.not_to have_selector 'img' }
     end
 
     context 'falling back to a thumbnail' do
-      let(:blacklight_config) { Blacklight::Configuration.new.tap { |config| config.index.thumbnail_field = :xyz } }
-      let(:document) { SolrDocument.new({ xyz: 'http://example.com/thumb.jpg' }) }
+      let(:blacklight_config) do
+        Blacklight::Configuration.new.tap do |config|
+          config.index.thumbnail_field = :xyz 
+          config.track_search_session = false
+        end
+      end
+      let(:document) { SolrDocument.new({ xyz: 'http://example.com/thumb.jpg', id: 'x' }) }
 
       it { is_expected.to have_selector 'img[src="http://example.com/thumb.jpg"]' }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails