blacklight-gallery 3.5.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6cef93b47ca74eb2e2cf9083baafce7e28948cc568b1146dd30f98a842720f6
-  data.tar.gz: 890631e78d834ac011666bb1b652ef97f9948b12352a4085c421b4e6f7aec6f7
+  metadata.gz: 3920e96baf118137203d9e67fafc19564991399b4cf2082d8fc0409e0095982a
+  data.tar.gz: 7435e227a144f08d25b1748f1a1d3eddf9ef958e7b25a5e8460fd1e6a8a98c64
 SHA512:
-  metadata.gz: 79942d8ad4a805a6020fc30e96e26fc392ea38b51dbab5868379a2744fd6ee798fd1b75f9c71f744678456deb165e3510e31820ff24f5c2eb7e21c9343be3c7f
-  data.tar.gz: 136ddeb750ddafe01d690265d734e9a183ffefebd896a024e893ae4fd8ab41762c5558fc72a4a88a7198358be9bc5594c69fc3de84304e7f1d2677148ecc64d0
+  metadata.gz: 9f19253bc16e2ed53b6d5b1d6a96f9df64cc0708cc0197b01b3031a877a0bf89427212036450c6d0acaecf4b647f8b79c3f09cbe9ddfbd43f5463be93dd478b5
+  data.tar.gz: 94d41d45a7e516a84634607d891580bd8dc66f2347f4604633643bd94df3a80f6695224b5559f5a4bc974a32b78c9464da361870351c5b44525eb2fe3dbf0884

data/.github/workflows/ruby.yml

@@ -11,26 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [6.1.1]
-        ruby: [2.7, '3.0']
-    env:
-      RAILS_VERSION: ${{ matrix.rails_version }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies with Rails ${{ matrix.rails_version }}
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
-  test_rails52:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rails_version: [5.2.4.4, 6.0.3.4]
-        ruby: [2.7]
+        rails_version: [6.1.4.6]
+        ruby: ['2.7', '3.0']
+        include:
+          - rails_version: 7.0.2.2
+            ruby: '3.0'
+          - rails_version: 5.2.4.4
+            ruby: '2.7'
+          - rails_version: 6.0.3.4
+            ruby: '2.7'
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     steps:

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

@@ -2,9 +2,7 @@
   .document {
     border-bottom: none;
     display: flex;
-
     min-height: 250px;
-    -webkit-flex: 1 0 250px;
   }
 
   .caption {

data/app/helpers/blacklight/openseadragon_helper.rb

@@ -1,7 +1,24 @@
 module Blacklight
   module OpenseadragonHelper
+    # Somewhat arbitrary number; the only important thing is that
+    # it is bigger than the number of embedded viewers on a page
+    ID_COUNTER_MAX = (2**20) - 1
+
+    # Mint a (sufficiently) unique identifier, so we can associate
+    # the expand/collapse control with labels
+    def self.mint_id
+      @id_counter = ((@id_counter || 0) + 1) % ID_COUNTER_MAX
+
+      # We convert the ID to hex for markup compactness
+      @id_counter.to_s(16)
+    end
+
     def osd_container_class
       "col-md-6"
     end
+
+    def osd_html_id_prefix
+      "osd-#{Blacklight::OpenseadragonHelper.mint_id}".to_param
+    end
   end
-end
+end

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

@@ -1,13 +1,16 @@
-<% image = document.to_openseadragon(blacklight_config.view_config(:show)) %>
+<%
+  image = document.to_openseadragon(blacklight_config.view_config(:show))
+  id_prefix = osd_html_id_prefix
+%>
 <%
   osd_config = {
     crossOriginPolicy: false,
-    zoomInButton:     "osd-zoom-in",
-    zoomOutButton:    "osd-zoom-out",
-    homeButton:       "osd-home",
-    fullPageButton:   "osd-full-page",
-    nextButton:       "osd-next",
-    previousButton:   "osd-previous"
+    zoomInButton:     "#{id_prefix}-zoom-in",
+    zoomOutButton:    "#{id_prefix}-zoom-out",
+    homeButton:       "#{id_prefix}-home",
+    fullPageButton:   "#{id_prefix}-full-page",
+    nextButton:       "#{id_prefix}-next",
+    previousButton:   "#{id_prefix}-previous"
   }
 
   osd_config_referencestrip = {
@@ -26,16 +29,16 @@
       <div class="col-md-6 pagination">
         <% if count > 1 %>
           <% osd_config = osd_config_referencestrip.merge(osd_config) %>
-            <a id="osd-previous"><%= blacklight_icon('chevron_left') %></a>
-            <span id="osd-page">1</span>  of <%= count %>
-            <a id="osd-next"><%= blacklight_icon('chevron_right') %></a>
+            <a id="<%= id_prefix %>-previous"><%= blacklight_icon('chevron_left') %></a>
+            <span id="<%= id_prefix %>-page">1</span>  of <%= count %>
+            <a id="<%= id_prefix %>-next"><%= blacklight_icon('chevron_right') %></a>
         <% end %>
       </div>
       <div class="col-md-6 controls">
-        <a id="osd-zoom-in"><%= blacklight_icon('add_circle') %></a>
-        <a id="osd-zoom-out"><%= blacklight_icon('remove_circle') %></a>
-        <a id="osd-home"><%= blacklight_icon('resize_small') %></a>
-        <a id="osd-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
+        <a id="<%= id_prefix %>-zoom-in"><%= blacklight_icon('add_circle') %></a>
+        <a id="<%= id_prefix %>-zoom-out"><%= blacklight_icon('remove_circle') %></a>
+        <a id="<%= id_prefix %>-home"><%= blacklight_icon('resize_small') %></a>
+        <a id="<%= id_prefix %>-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
       </div>
     </div>
     <%= openseadragon_picture_tag image, class: 'osd-image row', data: { openseadragon: osd_config } %>

data/blacklight-gallery.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", '>= 5.1', '< 7'
+  spec.add_dependency "rails", '>= 5.1', '< 8'
   spec.add_dependency 'blacklight', '~> 7.17'
 
   spec.add_development_dependency "rake"

data/lib/blacklight/gallery/version.rb

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

data/lib/generators/blacklight_gallery/install_generator.rb

@@ -16,10 +16,9 @@ module BlacklightGallery
 
     def configuration
       inject_into_file 'app/controllers/catalog_controller.rb', after: "configure_blacklight do |config|" do
-        "\n    config.view.gallery.document_component = Blacklight::Gallery::DocumentComponent" \
-        "\n    # config.view.gallery.classes = 'row-cols-2 row-cols-md-3'" \
-        "\n    config.view.masonry.document_component = Blacklight::Gallery::DocumentComponent" \
-        "\n    config.view.slideshow.document_component = Blacklight::Gallery::SlideshowComponent" \
+        "\n    config.view.gallery(document_component: Blacklight::Gallery::DocumentComponent)" \
+        "\n    config.view.masonry(document_component: Blacklight::Gallery::DocumentComponent)" \
+        "\n    config.view.slideshow(document_component: Blacklight::Gallery::SlideshowComponent)" \
         "\n    config.show.tile_source_field = :content_metadata_image_iiif_info_ssm" \
         "\n    config.show.partials.insert(1, :openseadragon)"
       end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +0,0 @@
-gem 'sprockets', '< 4'

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "catalog/_document_slideshow.html.erb", :type => :view do
+describe "catalog/_document_slideshow", :type => :view do
   let(:blacklight_config) do
     Blacklight::Configuration.new do |config|
       config.track_search_session = false

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "catalog/openseadragon_default" do
   let(:document) { SolrDocument.new }
   let(:blacklight_config) { Blacklight::Configuration.new }
-  let(:p) { "catalog/openseadragon_default.html.erb" }
+  let(:p) { "catalog/openseadragon_default" }
 
   before do
     allow(view).to receive_messages(blacklight_config: blacklight_config, openseadragon_picture_tag: "<img />")
@@ -14,9 +14,9 @@ describe "catalog/openseadragon_default" do
     render partial: p, locals: { document: document }
     expect(rendered).to have_selector ".openseadragon-container"
   end
-  
+
   it "should support passing a container class" do
     render partial: p, locals: { document: document, osd_container_class: "custom-container" }
     expect(rendered).to have_selector ".custom-container"
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement