blacklight-spotlight 5.1.0 → 5.2.0

data/spec/fixtures/iiif_responses.rb

@@ -309,4 +309,348 @@ module IiifResponses
           { '@language' => 'en', '@value' => 'Japanese' }] }
       ] }.to_json
   end
+
+  def test_v3_manifest
+    {
+      '@context' => [
+        'http://www.w3.org/ns/anno.jsonld',
+        'http://iiif.io/api/presentation/3/context.json'
+      ],
+      'type' => 'Manifest',
+      'id' => 'uri://for-v3-manifest',
+      'label' => {
+        'eng' => [
+          'A Map of the British and French settlements in North America'
+        ]
+      },
+      'summary' => {
+        'eng' => [
+          'Relief shown pictorially.',
+          'From the Universal magazine of knowledge and pleasure. v. 17, Oct. 1755, p. 144-145.',
+          'Inset: Fort Frederick at Crown Point built by the French, 1731.'
+        ]
+      },
+      'behavior' => [
+        'individuals'
+      ],
+      'metadata' => [
+        {
+          'label' => {
+            'eng' => [
+              'Title'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'Map of the British and French settlements in North America',
+              'A Map of the British and French settlements in North America'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'eng' => [
+              'Type'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'Maps'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'eng' => [
+              'Contributor'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'Hinton, John, d. 1781'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'eng' => [
+              'Cartographic Scale'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'Scale [ca. 1:10,000,000].'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'eng' => [
+              'Call Number'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'HMC01.1058'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'eng' => [
+              'Call Number'
+            ]
+          },
+          'value' => {
+            'eng' => [
+              'Electronic Resource'
+            ]
+          }
+        }
+      ],
+      'rendering' => [
+        {
+          'type' => 'Text',
+          'label' => {
+            'en' => [
+              'Download as PDF'
+            ]
+          },
+          'format' => 'application/pdf',
+          'id' => 'https://example.org/concern/scanned_maps/for-v3-manifest/pdf'
+        },
+        {
+          'id' => 'http://example.org/for-v3-manifest/permanent-link',
+          'format' => 'text/html',
+          'type' => 'Text',
+          'label' => {
+            'en' => [
+              'View in catalog'
+            ]
+          }
+        }
+      ],
+      'items' => [
+        {
+          'type' => 'Canvas',
+          'id' => 'https://example.org/concern/scanned_maps/for-v3-manifest/manifest/canvas/image-1',
+          'items' => [
+            {
+              'type' => 'AnnotationPage',
+              'items' => [
+                {
+                  'type' => 'Annotation',
+                  'motivation' => 'painting',
+                  'body' => {
+                    'id' => 'https://iiif-cloud.example.org/iiif/2/for-v3-manifest/image-1/intermediate_file/full/1000,/0/default.jpg',
+                    'type' => 'Image',
+                    'height' => 4468,
+                    'width' => 5998,
+                    'format' => 'image/jpeg',
+                    'service' => [
+                      {
+                        '@id' => 'https://iiif-cloud.example.org/iiif/2/for-v3-manifest/image-1/intermediate_file',
+                        'profile' => 'http://iiif.io/api/image/2/level2.json',
+                        '@type' => 'ImageService2'
+                      }
+                    ]
+                  },
+                  'id' => 'https://example.org/concern/scanned_maps/for-v3-manifest/manifest/canvas/image-1/annotation_page/page-1/annotation/annotation-1',
+                  'target' => 'https://example.org/concern/scanned_maps/for-v3-manifest/manifest/canvas/image-1'
+                }
+              ],
+              'id' => 'https://example.org/concern/scanned_maps/for-v3-manifest/manifest/canvas/image-1/annotation_page/page-1'
+            }
+          ],
+          'label' => {
+            'eng' => [
+              'PUmap_9170'
+            ]
+          },
+          'thumbnail' => [
+            {
+              'id' => 'https://iiif-cloud.example.org/iiif/2/for-v3-manifest/image-1/intermediate_file/full/!200,200/0/default.jpg',
+              'type' => 'Image',
+              'height' => 149,
+              'width' => 200,
+              'format' => 'image/jpeg',
+              'service' => [
+                {
+                  '@id' => 'https://iiif-cloud.example.org/iiif/2/for-v3-manifest/image-1/intermediate_file',
+                  'profile' => 'http://iiif.io/api/image/2/level2.json',
+                  '@type' => 'ImageService2'
+                }
+              ]
+            }
+          ],
+          'local_identifier' => 'p6w926v351',
+          'rendering' => [
+            {
+              'id' => 'https://example.org/downloads/for-v3-manifest/file/image-1',
+              'format' => 'image/tiff',
+              'type' => 'Dataset',
+              'label' => {
+                'en' => [
+                  'Download the original file'
+                ]
+              }
+            }
+          ],
+          'width' => 5998,
+          'height' => 4468
+        }
+      ],
+      'thumbnail' => [
+        {
+          'id' => 'uri://to-thumbnail',
+          'type' => 'Image',
+          'format' => 'image/jpeg',
+          'height' => 150
+        }
+      ],
+      'rights' => 'http://rightsstatements.org/vocab/NKC/1.0/',
+      'requiredStatement' => {
+        'label' => {
+          'en' => [
+            'Attribution'
+          ]
+        },
+        'value' => {
+          'en' => [
+            '<span>Glen Robson, IIIF Technical Coordinator. <a href="https://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a>'
+          ]
+        }
+      },
+      'provider' => [
+        {
+          'id' => 'https://library.princeton.edu',
+          'type' => 'Agent',
+          'label' => {
+            'en' => [
+              'Princeton University Library'
+            ]
+          },
+          'logo' => [
+            {
+              'id' => 'https://example.org/pul_logo_icon.png',
+              'type' => 'Image',
+              'format' => 'image/png',
+              'height' => 100,
+              'width' => 120
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
+
+  def test_multilingual_v3_manifest
+    {
+      '@context' => 'http://iiif.io/api/presentation/3/context.json',
+      'id' => 'https://iiif.io/api/cookbook/recipe/0006-text-language/manifest.json',
+      'type' => 'Manifest',
+      'label' => {
+        'en' => [
+          "Whistler's Mother"
+        ],
+        'fr' => [
+          'La Mère de Whistler'
+        ]
+      },
+      'metadata' => [
+        {
+          'label' => {
+            'en' => [
+              'Creator'
+            ],
+            'fr' => [
+              'Auteur'
+            ]
+          },
+          'value' => {
+            'none' => [
+              'Whistler, James Abbott McNeill'
+            ]
+          }
+        },
+        {
+          'label' => {
+            'en' => [
+              'Subject'
+            ],
+            'fr' => [
+              'Sujet'
+            ]
+          },
+          'value' => {
+            'en' => [
+              'McNeill Anna Matilda, mother of Whistler (1804-1881)'
+            ],
+            'fr' => [
+              'McNeill Anna Matilda, mère de Whistler (1804-1881)'
+            ]
+          }
+        }
+      ],
+      'summary' => {
+        'en' => [
+          "Arrangement in Grey and Black No. 1, also called Portrait of the Artist's Mother."
+        ],
+        'fr' => [
+          "Arrangement en gris et noir n°1, also called Portrait de la mère de l'artiste."
+        ]
+      },
+      'requiredStatement' => {
+        'label' => {
+          'en' => [
+            'Held By'
+          ],
+          'fr' => [
+            'Détenu par'
+          ]
+        },
+        'value' => {
+          'none' => [
+            "Musée d'Orsay, Paris, France"
+          ]
+        }
+      },
+      'items' => [
+        {
+          'id' => 'https://iiif.io/api/cookbook/recipe/0006-text-language/canvas/p1',
+          'type' => 'Canvas',
+          'width' => 1114,
+          'height' => 991,
+          'items' => [
+            {
+              'id' => 'https://iiif.io/api/cookbook/recipe/0006-text-language/page/p1/1',
+              'type' => 'AnnotationPage',
+              'items' => [
+                {
+                  'id' => 'https://iiif.io/api/cookbook/recipe/0006-text-language/annotation/p0001-image',
+                  'type' => 'Annotation',
+                  'motivation' => 'painting',
+                  'body' => {
+                    'id' => 'https://iiif.io/api/image/3.0/example/reference/329817fc8a251a01c393f517d8a17d87-Whistlers_Mother/full/max/0/default.jpg',
+                    'type' => 'Image',
+                    'format' => 'image/jpeg',
+                    'width' => 1114,
+                    'height' => 991,
+                    'service' => [
+                      {
+                        'id' => 'https://iiif.io/api/image/3.0/example/reference/329817fc8a251a01c393f517d8a17d87-Whistlers_Mother',
+                        'profile' => 'level1',
+                        'type' => 'ImageService3'
+                      }
+                    ]
+                  },
+                  'target' => 'https://iiif.io/api/cookbook/recipe/0006-text-language/canvas/p1'
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
 end

data/spec/support/features/test_features_helpers.rb

@@ -8,13 +8,15 @@ module Spotlight
       # Role=combobox indicates that the auto-complete is initialized
       expect(page).to have_css("auto-complete [data-#{type}-typeahead][role='combobox']")
       find("auto-complete [data-#{type}-typeahead]").fill_in(with: opts[:with])
-      find('auto-complete[open] [role="option"]', text: opts[:with], match: :first).click
+      first('auto-complete[open] [role="option"]', text: opts[:with]).click
     end
 
     # just like #fill_in_typeahead_field, but wait for the
     # form fields/thumbnail preview to show up on the page too
     def fill_in_solr_document_block_typeahead_field(opts)
+      wait_for_sir_trevor
       fill_in_typeahead_field(opts)
+      expect(page).to have_css('input[value="' + opts[:with] + '"]', visible: false)
       expect(page).to have_css('li[data-resource-id="' + opts[:with] + '"] .img-thumbnail[src^="http"]')
     end
 
@@ -37,17 +39,13 @@ module Spotlight
 
     def wait_for_sir_trevor
       expect(page).to have_selector('.st-blocks.st-ready')
-      sleep 1
     end
 
     def save_page_changes
-      wait_for_sir_trevor
       click_button('Save changes')
-      # Load bearing sleep. Remove or reduce at your own risk. Revisit if Sir Trevor is removed.
-      sleep 3 if ENV['CI']
       # verify that the page was created.
+      expect(page).to have_selector('.alert-info', text: 'was successfully updated')
       expect(page).to have_no_selector('.alert-danger')
-      expect(page).to have_selector('.alert-info', text: 'page was successfully updated')
     end
 
     RSpec::Matchers.define :have_breadcrumbs do |*expected|

data/spec/support/stub_iiif_response.rb

@@ -17,6 +17,7 @@ module StubIiifResponse
     stub_iiif_response_for_url('uri://for-manifest2', test_manifest2)
     stub_iiif_response_for_url('uri://for-manifest3', test_manifest3)
     stub_iiif_response_for_url('uri://for-manifest4', test_manifest4)
+    stub_iiif_response_for_url('uri://for-v3-manifest', test_v3_manifest)
   end
 end
 

data/spec/support/with_queue_adapter.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module WithQueueAdapter
+  def with_queue_adapter(new_adapter)
+    around do |example|
+      old_adapter = ActiveJob::Base.queue_adapter
+      ActiveJob::Base.queue_adapter = new_adapter
+      example.run
+    ensure
+      ActiveJob::Base.queue_adapter = old_adapter
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.extend WithQueueAdapter
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Chris Beer
 - Jessie Keck
 - Gary Geisler
 - Justin Coyne
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -76,7 +75,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +85,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
@@ -125,16 +124,22 @@ dependencies:
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -219,20 +224,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
-- !ruby/object:Gem::Dependency
-  name: github-markup
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: google-analytics-data
   requirement: !ruby/object:Gem::Requirement
@@ -295,14 +286,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -521,6 +512,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: axe-core-rspec
+  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: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -787,7 +792,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - exhibits-feedback@lists.stanford.edu
 executables: []
@@ -808,6 +812,7 @@ files:
 - app/assets/javascripts/spotlight/spotlight.js
 - app/assets/javascripts/spotlight/spotlight.js.map
 - app/assets/stylesheets/spotlight/_accessibility.scss
+- app/assets/stylesheets/spotlight/_admin_users.scss
 - app/assets/stylesheets/spotlight/_attachments.css
 - app/assets/stylesheets/spotlight/_autocomplete.scss
 - app/assets/stylesheets/spotlight/_blacklight_configuration.scss
@@ -861,6 +866,12 @@ files:
 - app/components/blacklight/icons/warning_component.rb
 - app/components/blacklight/icons/zoom_in_component.rb
 - app/components/blacklight/icons/zoom_out_component.rb
+- app/components/spotlight/admin_users/email_component.html.erb
+- app/components/spotlight/admin_users/email_component.rb
+- app/components/spotlight/admin_users/exhibit_roles_component.html.erb
+- app/components/spotlight/admin_users/exhibit_roles_component.rb
+- app/components/spotlight/admin_users/site_admin_component.html.erb
+- app/components/spotlight/admin_users/site_admin_component.rb
 - app/components/spotlight/analytics/aggregation_component.html.erb
 - app/components/spotlight/analytics/aggregation_component.rb
 - app/components/spotlight/analytics/dashboard_component.html.erb
@@ -1110,6 +1121,8 @@ files:
 - app/models/spotlight/resources/csv_upload.rb
 - app/models/spotlight/resources/iiif_harvester.rb
 - app/models/spotlight/resources/iiif_manifest.rb
+- app/models/spotlight/resources/iiif_manifest_metadata.rb
+- app/models/spotlight/resources/iiif_manifest_v3.rb
 - app/models/spotlight/resources/iiif_service.rb
 - app/models/spotlight/resources/json_upload.rb
 - app/models/spotlight/resources/upload.rb
@@ -1341,6 +1354,7 @@ files:
 - app/views/spotlight/translations/show.yaml.yamlbuilder
 - config/i18n-tasks.yml
 - config/importmap.rb
+- config/initializers/devise_rails8_patch.rb
 - config/locales/devise.en.yml
 - config/locales/spotlight.ar.yml
 - config/locales/spotlight.de.yml
@@ -1505,6 +1519,7 @@ files:
 - spec/support/helpers/controller_level_helpers.rb
 - spec/support/stub_iiif_response.rb
 - spec/support/views/test_view_helpers.rb
+- spec/support/with_queue_adapter.rb
 - vendor/assets/images/sir-trevor-icons.svg
 - vendor/assets/javascripts/Leaflet.Editable.js
 - vendor/assets/javascripts/Path.Drag.js
@@ -1533,7 +1548,6 @@ homepage: https://github.com/projectblacklight/spotlight
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1548,8 +1562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
   to create attractive, feature-rich websites that feature these collections.