blacklight-gallery 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9ee96cd4e180caff7bc9589599eba86cba367459e594f79f5e33feac2030bb7
-  data.tar.gz: 3f088a83957abc39d2a099e8ddd337c09b62bbae65aae26b4ce73d11eaf9c9f6
+  metadata.gz: 6fa835b95df717be0278b6031180faaca3bf3ed4ba24750d28d40f83e87ae1ab
+  data.tar.gz: d2ee6eb17f865fe2c86dacd146b961c4c11b79275808a7c123639e69cc749f9e
 SHA512:
-  metadata.gz: fa1dc30f79963288cfdd629b5a8cb1db1750aed48ce76a2ffb8bf0cc8d97d6bfa8801dfc88d390e763af331ef59084b12c039a5e84af50544de7a9ce3e2617ab
-  data.tar.gz: e5aa5cd8772332cc98b80d6497875c2899e816baf6e4f5f0f488c98a806b28a6792a005c62a3c12f9bbc8097f4c7712e1248f4a8f198a236937ede9bbf5bae9c
+  metadata.gz: d8ccda7a52197a151cee67a6ecb8b131b5cfbe6242ad822fcb7f16a103993757366d36c533ac788c7ab09063b38e29eee52a1bd6a143b3215ba89cadc4075311
+  data.tar.gz: c1392ebf0be147afdfcefb9fa929c4115f784854c64bf1342573bee8e2ab374f206394c1f098f89c886277d4840e207edab8ba7017d0f6a840c4ab0ae31ba913

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

@@ -1,19 +1,16 @@
-<%= render(Blacklight::DocumentComponent.new(classes: 'col', component: :div, document: @document, counter: @counter)) do |component| %>
-  <% component.with(:body) do %>
+<%= render(Blacklight::DocumentComponent.new(classes: 'col', component: :div, document: @document, counter: @counter, presenter: @presenter)) do |component| %>
+  <% component.body do %>
     <div class="thumbnail-container">
-      <% # Checking if #thumbnail takes any args before passing image_options. #thumbnail did not take any args in version 7.14.1 and earlier %>
-      <%= method(:thumbnail).arity.zero? ? thumbnail : thumbnail(class: 'img-thumbnail') %>
+      <%= thumbnail %>
 
       <div class="caption-area">
         <div class="caption container">
-          <header class="documentHeader row">
-            <%= content_tag @title_component, class: 'index_title document-title-heading' do %>
-              <%= before_title %><%= title %><%= after_title %>
-            <% end %>
-            <%= actions %>
-          </header>
+          <%= title %>
           <%= content %>
           <%= metadata %>
+          <% metadata_sections.each do |section| %>
+            <%= section %>
+          <% end %>
         </div>
       </div>
     </div>

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

@@ -3,6 +3,11 @@
 module Blacklight
   module Gallery
     class DocumentComponent < Blacklight::DocumentComponent
+      def before_render
+        thumbnail(image_options: { class: 'img-thumbnail' }) unless thumbnail.present?
+        super
+      end
+
       def render_document_class(*args)
         @view_context.render_document_class(*args)
       end

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

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

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

@@ -10,10 +10,10 @@ module Blacklight
         @document_counter = document_counter || @counter
       end
 
-      def thumbnail
-        @thumbnail ||
-          (presenter.thumbnail.exists? && presenter.thumbnail.render({ alt: presenter.heading })) ||
-          content_tag(:div, t('.missing_image', scope: [:blacklight_gallery]), class: 'thumbnail thumbnail-placeholder')
+      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?
+        super
       end
 
       def presenter

data/blacklight-gallery.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", '>= 5.1', '< 7'
-  spec.add_dependency 'blacklight', '~> 7.12'
+  spec.add_dependency 'blacklight', '~> 7.17'
   spec.add_dependency "bootstrap", "~> 4.0"
 
   spec.add_development_dependency "rake"

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::Gallery::DocumentComponent, type: :component do
-  subject(:component) { described_class.new(document: document, **attr) }
+  subject(:component) { described_class.new(document: document, presenter: presenter, **attr) }
 
   let(:attr) { {} }
   let(:view_context) { controller.view_context }
@@ -23,6 +23,8 @@ RSpec.describe Blacklight::Gallery::DocumentComponent, type: :component do
     )
   end
 
+  let(:presenter) { Blacklight::IndexPresenter.new(document, view_context, blacklight_config) }
+
   let(:blacklight_config) do
     CatalogController.blacklight_config.deep_copy.tap do |config|
       config.track_search_session = false
@@ -34,6 +36,7 @@ RSpec.describe Blacklight::Gallery::DocumentComponent, type: :component do
     allow(controller).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({})
+    allow(view_context).to receive(:blacklight_config).and_return(blacklight_config)
 
     # dumb hack to get our stubbing into the thumbnail component
     allow(controller).to receive(:view_context).and_return(view_context)

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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Blacklight::Gallery::SlideshowComponent, type: :component do
-  subject(:component) { described_class.new(document: document, **attr) }
+  subject(:component) { described_class.new(document: document, presenter: presenter, **attr) }
 
   let(:attr) { {} }
   let(:view_context) { controller.view_context }
@@ -16,6 +16,7 @@ RSpec.describe Blacklight::Gallery::SlideshowComponent, type: :component do
   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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.12'
+        version: '7.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.12'
+        version: '7.17'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement