blacklight-gallery 3.3.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3a18f9fb266e50ea51b326f0a0ef67ef6cfbd3fb7ae999004575e18d849bdfb
-  data.tar.gz: 2c3b270a4e50b5fc9058b60d2fce4682da9c4c9d5dcab93ae1c83811843ae586
+  metadata.gz: c6cef93b47ca74eb2e2cf9083baafce7e28948cc568b1146dd30f98a842720f6
+  data.tar.gz: 890631e78d834ac011666bb1b652ef97f9948b12352a4085c421b4e6f7aec6f7
 SHA512:
-  metadata.gz: 616b9e895bbfb120fb2d61f51b19d953babb516aa4df4dbb8b36bb745f34b35b6fa944dbb873ef679dfa097aa033ab189651a80643e0b3ce6e4e9cc54a2bb378
-  data.tar.gz: 4a05826269a68efef37879ecbd745b53e8cf246c3b15018bdb2b082560774eaeab34c35319913da02055ac102bc5f19fbe8334f336ca81a5fa6f9c504c35af15
+  metadata.gz: 79942d8ad4a805a6020fc30e96e26fc392ea38b51dbab5868379a2744fd6ee798fd1b75f9c71f744678456deb165e3510e31820ff24f5c2eb7e21c9343be3c7f
+  data.tar.gz: 136ddeb750ddafe01d690265d734e9a183ffefebd896a024e893ae4fd8ab41762c5558fc72a4a88a7198358be9bc5594c69fc3de84304e7f1d2677148ecc64d0

data/.github/workflows/ruby.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         rails_version: [6.1.1]
-        ruby: [2.7, 3.0]
+        ruby: [2.7, '3.0']
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     steps:

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/images/blacklight/slideshow.svg

@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M10 16.5l6-4.5-6-4.5v9zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 25 24">
+  <path d="m1 9v6h-1v-6zm6-3h12v13h-13v-13zm11 1h-11v11h11zm-13 0v11h-1v-11zm-2 1v9h-1v-9zm18-1v11h-1v-11zm2 1v8h-1v-8zm2 1v5h-1v-5z"/>
+</svg>

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

@@ -24,6 +24,11 @@
   }
 
   .document-metadata {
+    .document-title-heading {
+      padding-left: 0;
+      padding-right: 0;
+    }
+
     dt, dd {
       flex: 0 0 100%;
       max-width: 100%;

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

@@ -12,8 +12,10 @@ $gray-dark: #343a40 !default;
 
     .modal-header {
       border-bottom: none;
+      padding: 0.5rem 1rem;
 
       .close {
+        font-size: 2.5rem;
         color: white;
       }
     }
@@ -57,11 +59,16 @@ $gray-dark: #343a40 !default;
 
   .carousel-control {
     position: absolute;
-    top: 40%;
+    top: 0;
     height: 100%;
     width: 50px;
+
     .blacklight-icons {
+      display: block;
+      position: absolute;
       width: 3rem;
+      top: calc(50% - 3rem);
+
       svg {
         height: 3rem;
         width: 3rem;
@@ -77,18 +84,24 @@ $gray-dark: #343a40 !default;
   }
 
   .caption {
-    font-size: 14px;
-    color: $gray-light;
+    font-size: 1rem;
     margin: 10px auto;
     min-width: 200px;
     max-width: 50%;
+    a {
+      color: $gray-light;
+      text-decoration: underline;
+      &:hover, &:focus {
+        color: #ffffff;
+      }
+    }
   }
 
   .counter {
     border-radius: 12px;
     border: 1px solid $gray-light;
     color: $gray-light;
-    font-size: 12px;
+    font-size: 1rem;
     overflow: auto;
     padding: 4px 10px;
     text-align: center;
@@ -97,6 +110,8 @@ $gray-dark: #343a40 !default;
   .controls {
     svg {
       fill: $gray-light;
+      width: 32px;
+      height: 32px;
     }
   }
 }

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/app/components/blacklight/gallery/slideshow_preview_component.rb

@@ -11,11 +11,24 @@ module Blacklight
       end
 
       def before_render
-        thumbnail(presenter.thumbnail.render({ alt: presenter.heading })) if thumbnail.blank? && presenter.thumbnail.exists?
-        thumbnail(content_tag(:div, t('.missing_image', scope: [:blacklight_gallery]), class: 'thumbnail thumbnail-placeholder')) if thumbnail.blank?
+        populate_thumbnail_slot if thumbnail.blank?
         super
       end
 
+      # populate the thumbnail slot with a value if one wasn't explicitly provided
+      def populate_thumbnail_slot
+        thumbnail_content = presenter.thumbnail.render({ alt: presenter.heading }) if presenter.thumbnail.exists?
+        unless thumbnail_content.present?
+          thumbnail_content = content_tag(
+            :div,
+            t(:missing_image, scope: %i[blacklight_gallery catalog grid_slideshow]),
+            class: 'thumbnail thumbnail-placeholder'
+          )
+        end
+
+        thumbnail(thumbnail_content)
+      end
+
       def presenter
         @presenter ||= @view_context.document_presenter(@document)
       end

data/blacklight-gallery.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails", '>= 5.1', '< 7'
   spec.add_dependency 'blacklight', '~> 7.17'
-  spec.add_dependency "bootstrap", "~> 4.0"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'sqlite3'

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "3.3.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

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Blacklight::Gallery::SlideshowPreviewComponent, type: :component do
+  subject(:component) { described_class.new(document: document, document_counter: 5, presenter: presenter, **attr) }
+
+  let(:attr) { {} }
+  let(:view_context) { controller.view_context }
+  let(:render) do
+    component.render_in(view_context)
+  end
+
+  let(:rendered) do
+    Capybara::Node::Simple.new(render)
+  end
+
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:presenter) { Blacklight::IndexPresenter.new(document, view_context, blacklight_config) }
+
+  before do
+    allow(view_context).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view_context).to receive(:current_search_session).and_return(nil)
+    allow(view_context).to receive(:search_session).and_return({})
+
+    # dumb hack to get our stubbing into the thumbnail component
+    allow(controller).to receive(:view_context).and_return(view_context)
+  end
+
+  let(:blacklight_config) do
+    Blacklight::Configuration.new.tap do |config|
+      config.index.thumbnail_field = 'thumbnail_path_ss'
+      config.track_search_session = false
+    end
+  end
+
+  describe 'default thumbnail' do
+    let(:document) { SolrDocument.new(id: 'abc', thumbnail_path_ss: 'http://example.com/image.jpg') }
+
+    it 'renders the thumbnail' do
+      puts render
+      expect(rendered).to have_selector '.thumbnail img[@src="http://example.com/image.jpg"]'
+    end
+
+    context 'when the presenter returns nothing' do
+      let(:document) { SolrDocument.new(id: 'abc') }
+
+      subject { rendered }
+      it { is_expected.to have_selector '.thumbnail-placeholder', text: 'Missing' }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.17'
-- !ruby/object:Gem::Dependency
-  name: bootstrap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +293,7 @@ files:
 - solr/conf/xslt/luke.xsl
 - spec/components/blacklight/gallery/document_component_spec.rb
 - spec/components/blacklight/gallery/slideshow_component_spec.rb
+- spec/components/blacklight/gallery/slideshow_preview_component_spec.rb
 - spec/features/gallery_spec.rb
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb
@@ -338,13 +325,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Gallery display for Blacklight
 test_files:
 - spec/components/blacklight/gallery/document_component_spec.rb
 - spec/components/blacklight/gallery/slideshow_component_spec.rb
+- spec/components/blacklight/gallery/slideshow_preview_component_spec.rb
 - spec/features/gallery_spec.rb
 - spec/features/masonry_spec.rb
 - spec/features/slideshow_spec.rb