blacklight-spotlight 3.0.3 → 3.1.0

data/spec/features/report_a_problem_spec.rb

@@ -28,6 +28,7 @@ describe 'Report a Problem', type: :feature do
       click_on 'Feedback'
 
       expect(page).to have_css('h2', text: 'Contact us', visible: true)
+      expect(page).to have_css('#contact_form_name', count: 1)
     end
 
     it 'accepts a problem report', js: true do

data/spec/fixtures/iiif_responses.rb

@@ -5,24 +5,24 @@ module IiifResponses
     {
       "@id": 'uri://for-top-level-collection',
       "@type": 'sc:Collection',
-      "label": 'Complex Collection',
-      "collections": [
+      label: 'Complex Collection',
+      collections: [
         {
           "@id": 'uri://for-child-collection1',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 1'
+          label: 'Child Collection 1'
         },
         {
           "@id": 'uri://for-child-collection2',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 2'
+          label: 'Child Collection 2'
         }
       ],
-      "manifests": [
+      manifests: [
         {
           "@id": 'uri://for-manifest1',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 1'
+          label: 'Test Manifest 1'
         }
       ]
     }.to_json
@@ -32,19 +32,19 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection1',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 1',
-      "collections": [
+      label: 'Child Collection 1',
+      collections: [
         {
           "@id": 'uri://for-child-collection3',
           "@type": 'sc:Collection',
-          "label": 'Child Collection 3'
+          label: 'Child Collection 3'
         }
       ],
-      "manifests": [
+      manifests: [
         {
           "@id": 'uri://for-manifest2',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 2'
+          label: 'Test Manifest 2'
         }
       ]
     }.to_json
@@ -54,12 +54,12 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection2',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 2',
-      "manifests": [
+      label: 'Child Collection 2',
+      manifests: [
         {
           "@id": 'uri://for-manifest4',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 4'
+          label: 'Test Manifest 4'
         }
       ]
     }.to_json
@@ -69,12 +69,12 @@ module IiifResponses
     {
       "@id": 'uri://for-child-collection3',
       "@type": 'sc:Collection',
-      "label": 'Child Collection 3',
-      "manifests": [
+      label: 'Child Collection 3',
+      manifests: [
         {
           "@id": 'uri://for-manifest3',
           "@type": 'sc:Manifest',
-          "label": 'Test Manifest 3'
+          label: 'Test Manifest 3'
         }
       ]
     }.to_json
@@ -84,40 +84,40 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest1',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 1',
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      label: 'Test Manifest 1',
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Author',
-          "value": 'John Doe'
+          label: 'Author',
+          value: 'John Doe'
         },
         {
-          "label": 'Author',
-          "value": 'Jane Doe'
+          label: 'Author',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Another Field',
-          "value": 'Some data'
+          label: 'Another Field',
+          value: 'Some data'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
                     "@id": 'uri://full-image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
@@ -134,47 +134,47 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest2',
       "@type": 'sc:Manifest',
-      "label": {
+      label: {
         "@value": 'Test Manifest 2',
         "@language": 'en'
       },
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Contributor',
-          "value": 'John Doe'
+          label: 'Contributor',
+          value: 'John Doe'
         },
         {
-          "label": 'Yet Another Field',
-          "value": 'Some data'
+          label: 'Yet Another Field',
+          value: 'Some data'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
                 },
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service2'
                     }
                   }
@@ -191,7 +191,7 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest3',
       "@type": 'sc:Manifest',
-      "label": [
+      label: [
         {
           "@value": 'Test Manifest 3',
           "@language": 'en'
@@ -201,34 +201,34 @@ module IiifResponses
           "@language": 'fr'
         }
       ],
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Author',
-          "value": 'Jane Doe'
+          label: 'Author',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Collection',
-          "value": 'Some Collection'
+          label: 'Collection',
+          value: 'Some Collection'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }
@@ -245,35 +245,35 @@ module IiifResponses
     {
       "@id": 'uri://for-manifest4',
       "@type": 'sc:Manifest',
-      "label": 'Test Manifest 4',
-      "attribution": 'Attribution Data',
-      "description": 'A test IIIF manifest',
-      "license": 'http://www.example.org/license.html',
-      "metadata": [
+      label: 'Test Manifest 4',
+      attribution: 'Attribution Data',
+      description: 'A test IIIF manifest',
+      license: 'http://www.example.org/license.html',
+      metadata: [
         {
-          "label": 'Contributor',
-          "value": 'Jane Doe'
+          label: 'Contributor',
+          value: 'Jane Doe'
         },
         {
-          "label": 'Location',
-          "value": 'Some location'
+          label: 'Location',
+          value: 'Some location'
         }
       ],
-      "thumbnail": {
+      thumbnail: {
         "@id": 'uri://to-thumbnail'
       },
-      "sequences": [
+      sequences: [
         {
           "@type": 'sc:Sequence',
-          "canvases": [
+          canvases: [
             {
               "@type": 'sc:Canvas',
-              "images": [
+              images: [
                 {
                   "@type": 'oa:Annotation',
-                  "resource": {
+                  resource: {
                     "@type": 'dcterms:Image',
-                    "service": {
+                    service: {
                       "@id": 'uri://to-image-service'
                     }
                   }

data/spec/models/spotlight/page_configurations_spec.rb

@@ -28,9 +28,9 @@ describe Spotlight::PageConfigurations, type: :model do
 
   describe 'downstream configured_params' do
     it 'merges the supplied hash into the configs' do
-      expect(page_config).to receive_messages(configured_params: { 'hello': 'goodbye' })
+      expect(page_config).to receive_messages(configured_params: { hello: 'goodbye' })
 
-      expect(page_config.as_json).to include('hello': 'goodbye')
+      expect(page_config.as_json).to include(hello: 'goodbye')
     end
 
     it 'sends the #call method to the value if it can respond (e.g. a lamda)' do

data/spec/test_app_templates/catalog_controller.rb

@@ -36,7 +36,6 @@ class CatalogController < ApplicationController
     config.index.thumbnail_field = Spotlight::Engine.config.thumbnail_field
 
     config.show.tile_source_field = :content_metadata_image_iiif_info_ssm
-    config.show.partials.insert(1, :openseadragon)
 
     config.add_results_collection_tool(:sort_widget)
     config.add_results_collection_tool(:per_page_widget)

data/spec/views/spotlight/pages/show.html.erb_spec.rb

@@ -33,12 +33,22 @@ describe 'spotlight/pages/show', type: :view do
     render
   end
 
-  it 'does not double-escape HTML entities in the HTML title' do
-    allow(page).to receive_messages(title: 'Abbott & Costello')
-    stub_template 'shared/_user_util_links.html.erb' => ''
-    stub_template 'shared/_masthead.html.erb' => ''
-    render template: 'spotlight/pages/show', layout: 'layouts/spotlight/spotlight'
-    expect(rendered).to have_content('Abbott & Costello | Blacklight')
+  context 'when rendering with layout' do
+    before do
+      allow(page).to receive_messages(title: 'Abbott & Costello')
+      stub_template 'shared/_analytics.html.erb' => 'analytics'
+      stub_template 'shared/_user_util_links.html.erb' => ''
+      stub_template 'shared/_masthead.html.erb' => ''
+      render template: 'spotlight/pages/show', layout: 'layouts/spotlight/spotlight'
+    end
+
+    it 'does not double-escape HTML entities in the HTML title' do
+      expect(rendered).to have_content('Abbott & Costello | Blacklight')
+    end
+
+    it 'includes analytics reporting' do
+      expect(rendered).to have_content 'analytics'
+    end
   end
 
   it 'does not include the page title' do

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Beer
 - Jessie Keck
 - Gary Geisler
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -867,7 +867,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - exhibits-feedback@lists.stanford.edu
 executables: []
@@ -1191,6 +1191,7 @@ files:
 - app/views/layouts/spotlight/spotlight.html.erb
 - app/views/shared/_about_navbar.html.erb
 - app/views/shared/_analytics.html.erb
+- app/views/shared/_body_preamble.html.erb
 - app/views/shared/_breadcrumbs.html.erb
 - app/views/shared/_browse_navbar.html.erb
 - app/views/shared/_curated_features_navbar.html.erb
@@ -1725,7 +1726,6 @@ files:
 - spec/uploaders/spotlight/featured_image_uploader_spec.rb
 - spec/views/shared/_analytics.html.erb_spec.rb
 - spec/views/shared/_exhibit_navbar.html.erb_spec.rb
-- spec/views/shared/_footer.html.erb_spec.rb
 - spec/views/shared/_header_navbar.html.erb_spec.rb
 - spec/views/shared/_masthead.html.erb_spec.rb
 - spec/views/shared/_user_util_links.html.erb_spec.rb
@@ -1820,7 +1820,7 @@ files:
 homepage: https://github.com/projectblacklight/spotlight
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1836,7 +1836,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.3
-signing_key:
+signing_key: 
 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.
@@ -2085,7 +2085,6 @@ test_files:
 - spec/uploaders/spotlight/featured_image_uploader_spec.rb
 - spec/views/shared/_analytics.html.erb_spec.rb
 - spec/views/shared/_exhibit_navbar.html.erb_spec.rb
-- spec/views/shared/_footer.html.erb_spec.rb
 - spec/views/shared/_header_navbar.html.erb_spec.rb
 - spec/views/shared/_masthead.html.erb_spec.rb
 - spec/views/shared/_user_util_links.html.erb_spec.rb

data/spec/views/shared/_footer.html.erb_spec.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-describe 'shared/_footer', type: :view do
-  let(:current_exhibit) { double(title: 'Some title', subtitle: 'Subtitle') }
-
-  before do
-    allow(view).to receive_messages(current_exhibit: current_exhibit)
-  end
-
-  it 'includes analytics reporting' do
-    stub_template 'shared/_analytics.html.erb' => 'analytics'
-    render
-    expect(rendered).to have_content 'analytics'
-  end
-end