blacklight-spotlight 0.32.0 → 0.33.0

data/spec/features/home_page_spec.rb

@@ -20,7 +20,7 @@ describe 'Home page', type: :feature do
     expect(page).to have_content('The home page was successfully updated.')
 
     within '.dropdown-menu' do
-      click_link 'Dashboard'
+      click_link 'Exhibit dashboard'
     end
     click_link 'Feature pages'
     expect(page).to have_content 'New Home Page Title'

data/spec/features/javascript/blocks/solr_documents_block_spec.rb

@@ -51,6 +51,36 @@ feature 'Solr Document Block', feature: true do
     expect(page).to have_selector '.items-block .box', count: 2
   end
 
+  scenario 'it should allow you to choose from a multi-image solr document (and persist through edits)', js: true do
+    fill_in_typeahead_field with: 'xd327cm9378'
+
+    expect(page).to have_css('[data-panel-image-pagination]', text: /Image 1 of 2/, visible: true)
+
+    # Select the last image
+    click_link('Change')
+    all('.thumbs-list li').last.click
+
+    save_page
+
+    # The thumbnail on the rendered block should be correct
+    thumb = find('.thumbnail img')
+    expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
+
+    # revisit the edit page
+    visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
+
+    # Expect the image on the rendered edit screen to be correct
+    expect(page).to have_css('[data-panel-image-pagination]', text: /Image 2 of 2/, visible: true)
+    thumb = find('.pic.thumbnail img')
+    expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
+
+    save_page
+
+    # Expect that the original image selection was retained
+    thumb = find('.thumbnail img')
+    expect(thumb['src']).to match(%r{xd327cm9378_05_0002/full})
+  end
+
   scenario 'it should allow you toggle visibility of solr documents', js: true do
     fill_in_typeahead_field with: 'dq287tq6352'
 
@@ -98,6 +128,18 @@ feature 'Solr Document Block', feature: true do
     end
   end
 
+  scenario 'should allow you to optionally display a ZPR link with the image', js: true do
+    fill_in_typeahead_field with: 'gk446cj2442'
+
+    check 'zpr_link'
+
+    save_page
+
+    expect(page).to have_selector('.zpr-link[data-iiif-tilesource]')
+    click_on 'Show in ZPR viewer'
+    expect(page).to have_css('#osd-modal-container')
+  end
+
   scenario 'should allow you to add text to the image', js: true do
     # fill in the content-editable div
     content_editable = find('.st-text-block')

data/spec/features/javascript/blocks/uploaded_items_block_spec.rb

@@ -48,9 +48,11 @@ feature 'Uploaded Items Block', feature: true, js: true do
     attach_file('uploaded_item_url', fixture_file1)
     attach_file('uploaded_item_url', fixture_file2)
 
-    within('.panel') do
-      uncheck 'Display?'
-    end
+    # This line blocks until the javascript has added the file to the page:
+    expect(find('#st-block-3_display-checkbox_2')).to be_present
+
+    # Uncheck the first checkbox
+    all('input[type="checkbox"]').first.click
 
     save_page
 

data/spec/features/javascript/feature_page_admin_spec.rb

@@ -95,7 +95,7 @@ feature 'Feature Pages Adminstration', js: true do
     # ensure page title not changed
     click_link exhibit_curator.email
     within '#user-util-collapse .dropdown' do
-      click_link 'Dashboard'
+      click_link 'Exhibit dashboard'
     end
     click_link 'Feature pages'
     within("[data-id='#{page1.id}']") do

data/spec/features/javascript/multi_image_select_spec.rb

@@ -7,7 +7,7 @@ describe 'Multi image selector', type: :feature, js: true do
   it 'allows the user to select which image in a multi image object to display' do
     visit spotlight.edit_exhibit_feature_page_path(exhibit, feature_page)
 
-    add_widget 'solr_documents'
+    add_widget 'solr_documents' # the "Item Row" widget
 
     fill_in_typeahead_field with: 'xd327cm9378'
 
@@ -21,10 +21,9 @@ describe 'Multi image selector', type: :feature, js: true do
     save_page
 
     visit spotlight.exhibit_feature_page_path(exhibit, feature_page)
-
     expect(page).to have_css("[data-id='xd327cm9378']")
-    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0001_thumb']")
-    expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0002_thumb']")
+    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/iiif/xd327cm9378%2Fxd327cm9378_05_0001/full/!400,400/0/default.jpg']")
+    expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/iiif/xd327cm9378%2Fxd327cm9378_05_0002/full/!400,400/0/default.jpg']")
 
     click_link('Edit')
 
@@ -42,7 +41,7 @@ describe 'Multi image selector', type: :feature, js: true do
     save_page
 
     expect(page).to have_css("[data-id='xd327cm9378']")
-    expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0001_thumb']")
-    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/xd327cm9378/xd327cm9378_05_0002_thumb']")
+    expect(page).to_not have_css("img[src='https://stacks.stanford.edu/image/iiif/xd327cm9378%2Fxd327cm9378_05_0001/full/!400,400/0/default.jpg']")
+    expect(page).to have_css("img[src='https://stacks.stanford.edu/image/iiif/xd327cm9378%2Fxd327cm9378_05_0002/full/!400,400/0/default.jpg']")
   end
 end

data/spec/features/javascript/search_config_admin_spec.rb

@@ -10,7 +10,7 @@ feature 'Search Configuration Administration', js: true do
 
       click_link user.email
       within '#user-util-collapse .dropdown' do
-        click_link 'Dashboard'
+        click_link 'Exhibit dashboard'
       end
       click_link 'Search'
       click_link 'Options'

data/spec/features/site_masthead_spec.rb

@@ -10,7 +10,10 @@ describe 'Add and update the site masthead', type: :feature do
 
     within '#site-masthead' do
       check 'Show background image in masthead'
-      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # The JS fills in these fields:
+      find('#site_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+      find('#site_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
     end
 
     click_button 'Save changes'
@@ -32,7 +35,10 @@ describe 'Add and update the site masthead', type: :feature do
 
     within '#site-masthead' do
       check 'Show background image in masthead'
-      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # The JS fills in these fields:
+      find('#site_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+      find('#site_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
     end
 
     click_button 'Save changes'
@@ -44,6 +50,7 @@ describe 'Add and update the site masthead', type: :feature do
     click_button 'Save changes'
     expect(page).to have_css('.image-masthead .background-container')
   end
+
   it 'displays a masthead image when one is uploaded and configured' do
     visit spotlight.edit_site_path
 
@@ -54,13 +61,16 @@ describe 'Add and update the site masthead', type: :feature do
     within '#site-masthead' do
       check 'Show background image in masthead'
 
-      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      # attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      find('#site_masthead_attributes_iiif_tilesource', visible: false).set 'http://test.host/images/7'
+      find('#site_masthead_attributes_iiif_region', visible: false).set '0,0,100,200'
     end
 
     click_button 'Save changes'
     expect(page).to have_content('The site was successfully updated.')
     expect(page).to have_css('.image-masthead .background-container')
   end
+
   it 'does not display an uploaded masthead if configured to not display' do
     visit spotlight.edit_site_path
 
@@ -69,7 +79,7 @@ describe 'Add and update the site masthead', type: :feature do
     click_link 'Site masthead'
 
     within '#site-masthead' do
-      attach_file('site_masthead_attributes_image', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
+      attach_file('site_masthead_attributes_file', File.absolute_path(File.join(FIXTURES_PATH, 'avatar.png')))
     end
 
     click_button 'Save changes'

data/spec/fixtures/gk446cj2442-manifest.json

@@ -0,0 +1,58 @@
+
+{
+  "@context":"http://iiif.io/api/presentation/2/context.json",
+  "@id":"https://purl.stanford.edu/gk446cj2442/iiif/manifest",
+  "@type":"sc:Manifest",
+  "label":"[World map",
+  "attribution":"This work has been identified as being free of known restrictions under copyright law, including all related and neighboring rights. You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.",
+  "seeAlso":{
+    "@id":"https://purl.stanford.edu/gk446cj2442.mods",
+    "format":"application/mods+xml"
+  },
+  "thumbnail":{
+    "@id":"https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001/full/!400,400/0/default.jpg",
+    "@type":"dctypes:Image",
+    "format":"image/jpeg",
+    "service":{
+      "@context":"http://iiif.io/api/image/2/context.json",
+      "@id":"https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001",
+      "profile":"http://iiif.io/api/image/2/level1.json"
+    }
+  },
+  "sequences":[
+    {
+      "@id":"https://purl.stanford.edu/gk446cj2442#sequence-1",
+      "@type":"sc:Sequence",
+      "label":"Current order",
+      "canvases":[
+        {
+          "@id":"https://purl.stanford.edu/gk446cj2442/iiif/canvas/gk446cj2442_1",
+          "@type":"sc:Canvas",
+          "label":"mclaughlin_gk446cj2442",
+          "height":3943,
+          "width":4956,
+          "images":[
+            {
+              "@id":"https://purl.stanford.edu/gk446cj2442/iiif/annotation/gk446cj2442_1",
+              "@type":"oa:Annotation",
+              "motivation":"sc:painting",
+              "resource":{
+                "@id":"https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001/full/full/0/default.jpg",
+                "@type":"dctypes:Image",
+                "format":"image/jpeg",
+                "height":3943,
+                "width":4956,
+                "service":{
+                  "@context":"http://iiif.io/api/image/2/context.json",
+                  "@id":"https://stacks.stanford.edu/image/iiif/gk446cj2442%2Fgk446cj2442_05_0001",
+                  "profile":"http://iiif.io/api/image/2/level1.json"
+                  }
+                },
+              "on":"https://purl.stanford.edu/gk446cj2442/iiif/canvas/gk446cj2442_1"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/spec/fixtures/iiif_responses.rb

@@ -0,0 +1,274 @@
+module IiifResponses
+  def complex_collection
+    {
+      "@id": 'uri://for-top-level-collection',
+      "@type": 'sc:Collection',
+      "label": 'Complex Collection',
+      "collections": [
+        {
+          "@id": 'uri://for-child-collection1',
+          "@type": 'sc:Collection',
+          "label": 'Child Collection 1'
+        },
+        {
+          "@id": 'uri://for-child-collection2',
+          "@type": 'sc:Collection',
+          "label": 'Child Collection 2'
+        }
+      ],
+      "manifests": [
+        {
+          "@id": 'uri://for-manifest1',
+          "@type": 'sc:Manifest',
+          "label": 'Test Manifest 1'
+        }
+      ]
+    }.to_json
+  end
+
+  def child_collection1
+    {
+      "@id": 'uri://for-child-collection1',
+      "@type": 'sc:Collection',
+      "label": 'Child Collection 1',
+      "collections": [
+        {
+          "@id": 'uri://for-child-collection3',
+          "@type": 'sc:Collection',
+          "label": 'Child Collection 3'
+        }
+      ],
+      "manifests": [
+        {
+          "@id": 'uri://for-manifest2',
+          "@type": 'sc:Manifest',
+          "label": 'Test Manifest 2'
+        }
+      ]
+    }.to_json
+  end
+
+  def child_collection2
+    {
+      "@id": 'uri://for-child-collection2',
+      "@type": 'sc:Collection',
+      "label": 'Child Collection 2',
+      "manifests": [
+        {
+          "@id": 'uri://for-manifest4',
+          "@type": 'sc:Manifest',
+          "label": 'Test Manifest 4'
+        }
+      ]
+    }.to_json
+  end
+
+  def child_collection3
+    {
+      "@id": 'uri://for-child-collection3',
+      "@type": 'sc:Collection',
+      "label": 'Child Collection 3',
+      "manifests": [
+        {
+          "@id": 'uri://for-manifest3',
+          "@type": 'sc:Manifest',
+          "label": 'Test Manifest 3'
+        }
+      ]
+    }.to_json
+  end
+
+  def test_manifest1
+    {
+      "@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": 'Author',
+          "value": 'John Doe'
+        },
+        {
+          "label": 'Author',
+          "value": 'Jane Doe'
+        },
+        {
+          "label": 'Another Field',
+          "value": 'Some data'
+        }
+      ],
+      "thumbnail": {
+        "@id": 'uri://to-thumbnail'
+      },
+      "sequences": [
+        {
+          "@type": 'sc:Sequence',
+          "canvases": [
+            {
+              "@type": 'sc:Canvas',
+              "images": [
+                {
+                  "@type": 'oa:Annotation',
+                  "resource": {
+                    "@type": 'dcterms:Image',
+                    "@id": 'uri://full-image',
+                    "service": {
+                      "@id": 'uri://to-image-service'
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
+
+  def test_manifest2
+    {
+      "@id": 'uri://for-manifest2',
+      "@type": 'sc:Manifest',
+      "label": 'Test Manifest 2',
+      "attribution": 'Attribution Data',
+      "description": 'A test IIIF manifest',
+      "license": 'http://www.example.org/license.html',
+      "metadata": [
+        {
+          "label": 'Contributor',
+          "value": 'John Doe'
+        },
+        {
+          "label": 'Yet Another Field',
+          "value": 'Some data'
+        }
+      ],
+      "thumbnail": {
+        "@id": 'uri://to-thumbnail'
+      },
+      "sequences": [
+        {
+          "@type": 'sc:Sequence',
+          "canvases": [
+            {
+              "@type": 'sc:Canvas',
+              "images": [
+                {
+                  "@type": 'oa:Annotation',
+                  "resource": {
+                    "@type": 'dcterms:Image',
+                    "service": {
+                      "@id": 'uri://to-image-service'
+                    }
+                  }
+                },
+                {
+                  "@type": 'oa:Annotation',
+                  "resource": {
+                    "@type": 'dcterms:Image',
+                    "service": {
+                      "@id": 'uri://to-image-service2'
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
+
+  def test_manifest3
+    {
+      "@id": 'uri://for-manifest3',
+      "@type": 'sc:Manifest',
+      "label": 'Test Manifest 3',
+      "attribution": 'Attribution Data',
+      "description": 'A test IIIF manifest',
+      "license": 'http://www.example.org/license.html',
+      "metadata": [
+        {
+          "label": 'Author',
+          "value": 'Jane Doe'
+        },
+        {
+          "label": 'Collection',
+          "value": 'Some Collection'
+        }
+      ],
+      "thumbnail": {
+        "@id": 'uri://to-thumbnail'
+      },
+      "sequences": [
+        {
+          "@type": 'sc:Sequence',
+          "canvases": [
+            {
+              "@type": 'sc:Canvas',
+              "images": [
+                {
+                  "@type": 'oa:Annotation',
+                  "resource": {
+                    "@type": 'dcterms:Image',
+                    "service": {
+                      "@id": 'uri://to-image-service'
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
+
+  def test_manifest4
+    {
+      "@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": 'Contributor',
+          "value": 'Jane Doe'
+        },
+        {
+          "label": 'Location',
+          "value": 'Some location'
+        }
+      ],
+      "thumbnail": {
+        "@id": 'uri://to-thumbnail'
+      },
+      "sequences": [
+        {
+          "@type": 'sc:Sequence',
+          "canvases": [
+            {
+              "@type": 'sc:Canvas',
+              "images": [
+                {
+                  "@type": 'oa:Annotation',
+                  "resource": {
+                    "@type": 'dcterms:Image',
+                    "service": {
+                      "@id": 'uri://to-image-service'
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }.to_json
+  end
+end