blacklight-gallery 4.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d46a1601796a187729339ce0655d2537db43a7319608a2de67cd763b38fcbdcd
-  data.tar.gz: b9f28ea874c0908cfc9e19f7134b7dfc29779ed5c7865af8f96f1becab54a478
+  metadata.gz: b2a0883ccc5d8a704089cb412b638f5c23e8a4c99c17f975ed9783e5bf2e0f73
+  data.tar.gz: a1535e02691bfcc2c282b5e4df8eb95d87f0f1a646b8c4d8aace0e5cba231b39
 SHA512:
-  metadata.gz: 38912a52ab2cc3a35ec137d5e326e4e92f90228dd8254f9fa7526dc5f565945c08aefe3fcda4d028191dea8a7615b3073865e3c513a1701824deef9a3d4b092f
-  data.tar.gz: 76f328cf6da35f629a2ce99396ec89be2b5d97331f38daee12574201b9a21392f09b366ff38e099b4510bf380a3ed40a9a74509e7be384455d99fb865a73c7b6
+  metadata.gz: 5e897d9dd4f500ca90f25ce99375ffd01b23627e1c1c3782c760c8d5393dd34164c3a77febf0adcab25efcee3e7d215d73fe79a0e1dd79241a593d8c0ab0ec64
+  data.tar.gz: 2c2d9760850e5718537c471737d74719f3555f702df073c243438d93cfc09ddf6488abb4f2bc99fe8d5ed84b83cc57e9d1c79234e1aad97caabd5b0110f96eae

data/.github/workflows/ruby.yml

@@ -24,15 +24,15 @@ jobs:
           rails_version: '7.0.4'
           blacklight_version: '~> 7.0'
           experimental: false
-        - ruby: '3.1'
+        - ruby: '3.2'
           rails_version: '7.0.4'
-          blacklight_version: '8.0.0.beta6'
+          blacklight_version: '~> 8.0'
           experimental: false
-        - ruby: '3.1'
+        - ruby: '3.2'
           rails_version: '7.0.4'
           blacklight_version: 'github'
           experimental: true
-        - ruby: '3.1'
+        - ruby: '3.2'
           rails_version: '7.0.4'
           blacklight_version: 'github'
           experimental: true

data/README.md

@@ -49,3 +49,11 @@ If you would like to add or remove any particular view either add or remove the
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Releasing
+
+1. Edit `lib/version.rb` and `package.json` to set the new version
+1. Commit the changes e.g. `git commit -am "Bump version to X.X.X"`
+1. Push release to rubygems `bundle exec rake release`
+1. Push release to NPM `npm publish`
+1. Create a release on github with the tag that was just created: https://github.com/projectblacklight/blacklight-gallery/releases/new

data/app/assets/config/blacklight_gallery/manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../../javascripts .js
+//= link_tree ../../../../vendor/assets/javascripts .js

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

@@ -10,7 +10,7 @@
       }
     }
 
-    margin-bottom: $spacer / 2;
+    margin-bottom: $spacer * 0.5;
     position: relative;
     width: auto;
 

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

@@ -3,7 +3,7 @@
   Blacklight::DocumentComponent.new(classes: 'col', component: :div, document: @document, presenter: @presenter, counter: @counter)
 %> 
 <%= render(component) do |component| %>
-  <% component.body do %>
+  <% component.with_body do %>
     <div class="thumbnail-container">
       <%= thumbnail %>
 

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

@@ -4,7 +4,7 @@ module Blacklight
   module Gallery
     class DocumentComponent < Blacklight::DocumentComponent
       def before_render
-        thumbnail(image_options: { class: 'img-thumbnail' }) unless thumbnail.present?
+        with_thumbnail(image_options: { class: 'img-thumbnail' }) unless thumbnail.present?
         super
       end
 

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

@@ -3,7 +3,7 @@
   Blacklight::DocumentComponent.new(classes: 'slideshow-preview-thumbnail', component: :div, document: @document, presenter: @presenter, counter: @counter)
 %> 
 <%= render(component) 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" }) %>
+  <% 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" }) %>
   <% end %>
 <% end %>

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

@@ -25,8 +25,7 @@ module Blacklight
             class: 'thumbnail thumbnail-placeholder'
           )
         end
-
-        thumbnail(thumbnail_content)
+        with_thumbnail(thumbnail_content)
       end
 
       def presenter

data/blacklight-gallery.gemspec

@@ -29,6 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "solr_wrapper"
   spec.add_development_dependency "engine_cart", "~> 2.0"
   spec.add_development_dependency "capybara"
-  spec.add_development_dependency 'webdrivers'
   spec.add_development_dependency "selenium-webdriver", '>= 3.13.1'
 end

data/config/importmap.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+pin_all_from File.expand_path('../app/assets/javascripts/blacklight_gallery', __dir__), under: 'blacklight_gallery'
+pin_all_from File.expand_path('../vendor/assets/javascripts', __dir__)

data/lib/blacklight/gallery/engine.rb

@@ -3,6 +3,9 @@ require 'blacklight'
 module Blacklight
   module Gallery
     class Engine < Rails::Engine
+      initializer 'blacklight_gallery.importmap', before: 'importmap' do |app|
+        app.config.importmap.paths << Engine.root.join('config/importmap.rb') if app.config.respond_to?(:importmap)
+      end
     end
   end
 end

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "4.2.0"
+    VERSION = "4.4.0"
   end
 end

data/lib/generators/blacklight_gallery/install_generator.rb

@@ -29,6 +29,7 @@ module BlacklightGallery
 
     def assets
       copy_file "blacklight_gallery.css.scss", "app/assets/stylesheets/blacklight_gallery.css.scss"
+      append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight_gallery/manifest.js"
       copy_file "blacklight_gallery.js", "app/assets/javascripts/blacklight_gallery.js"
 
       insert_into_file "app/assets/javascripts/application.js", after: '//= require blacklight/blacklight' do

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-gallery",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Gallery views for Blacklight search results",
   "main": "app/assets/javascripts/blacklight_gallery/default.js",
   "files": [
@@ -20,7 +20,7 @@
   "homepage": "https://github.com/projectblacklight/blacklight-gallery#readme",
   "devDependencies": { },
   "dependencies": {
-    "blacklight-frontend": ">=7.1.0-alpha",
+    "blacklight-frontend": ">=7.1.0 <9",
     "jquery": ">=3.0"
   }
 }

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

@@ -12,7 +12,7 @@ RSpec.describe Blacklight::Gallery::DocumentComponent, type: :component do
   end
 
   let(:attr) { {} }
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
   let(:render) do
     component.render_in(view_context)
   end
@@ -43,13 +43,13 @@ RSpec.describe Blacklight::Gallery::DocumentComponent, type: :component do
   end
 
   before do
-    allow(controller).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(vc_test_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)
+    allow(vc_test_controller).to receive(:view_context).and_return(view_context)
   end
 
   it 'has a thumbnail and caption' do

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

@@ -12,7 +12,7 @@ RSpec.describe Blacklight::Gallery::SlideshowComponent, type: :component do
   end
 
   let(:attr) { {} }
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
   let(:render) do
     component.render_in(view_context)
   end

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

@@ -12,7 +12,7 @@ RSpec.describe Blacklight::Gallery::SlideshowPreviewComponent, type: :component
   end
 
   let(:attr) { {} }
-  let(:view_context) { controller.view_context }
+  let(:view_context) { vc_test_controller.view_context }
   let(:render) do
     component.render_in(view_context)
   end
@@ -29,8 +29,8 @@ RSpec.describe Blacklight::Gallery::SlideshowPreviewComponent, type: :component
     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)
+    # Every call to view_context returns a different object. This ensures it stays stable.
+    allow(vc_test_controller).to receive(:view_context).and_return(view_context)
   end
 
   let(:blacklight_config) do

data/spec/spec_helper.rb

@@ -9,8 +9,6 @@ require 'rspec/rails'
 require 'rspec/active_model/mocks'
 
 require 'selenium-webdriver'
-require 'webdrivers'
-
 
 Capybara.javascript_driver = :selenium_chrome_headless
 Capybara.disable_animation = true
@@ -20,7 +18,5 @@ require 'blacklight/gallery'
 
 RSpec.configure do |c|
   c.infer_spec_type_from_file_location!
-  c.full_backtrace = true
   c.include ViewComponent::TestHelpers, type: :component
-  #onfig.assets.precompile += %w(spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,20 +176,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +204,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/config/blacklight_gallery/manifest.js
 - app/assets/images/blacklight/add_circle.svg
 - app/assets/images/blacklight/chevron_left.svg
 - app/assets/images/blacklight/chevron_right.svg
@@ -264,6 +251,7 @@ files:
 - app/views/catalog/_openseadragon_default.html.erb
 - app/views/catalog/_slideshow_modal.html.erb
 - blacklight-gallery.gemspec
+- config/importmap.rb
 - config/locales/blacklight-gallery.ar.yml
 - config/locales/blacklight-gallery.de.yml
 - config/locales/blacklight-gallery.en.yml
@@ -330,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Gallery display for Blacklight