blacklight-spotlight 3.0.0.alpha.10 → 3.0.0.rc1

data/spec/features/add_contacts_spec.rb

@@ -17,7 +17,7 @@ describe 'Add a contact to an exhibit', type: :feature do
       fill_in 'Location', with: 'Rome'
       fill_in 'Telephone', with: '(555) 555-5555 ext. 12345 (mobile)'
 
-      click_button 'Save'
+      find('input[name="commit"]').click
     end
     expect(page).to have_content 'The contact was created.'
 

data/spec/features/browse_category_admin_spec.rb

@@ -21,7 +21,7 @@ describe 'Browse Category Administration', type: :feature do
       expect(page).to have_css('#save-modal')
       fill_in 'search_title', with: 'Some search'
       expect do
-        click_button 'Save'
+        find('input[name="commit"]').click
         exhibit.searches.reload
       end.to change { exhibit.searches.count }.by 1
       expect(exhibit.searches.last.query_params).to eq 'q' => 'xyz'
@@ -32,7 +32,7 @@ describe 'Browse Category Administration', type: :feature do
       click_button 'Save this search'
       expect(page).to have_css('#save-modal')
       select search.title, from: 'id'
-      click_button 'Save'
+      find('input[name="commit"]').click
       expect(search.reload.query_params).to eq 'q' => 'xyz'
     end
   end

data/spec/features/create_exhibit_spec.rb

@@ -24,7 +24,7 @@ describe 'Create a new exhibit', type: :feature do
 
     fill_in 'Title', with: 'My exhibit title'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'my-exhibit-title'
@@ -39,7 +39,7 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     expect(page).to have_content 'The exhibit was created.'
     expect(Spotlight::Exhibit.last.slug).to eq 'custom-slug'
@@ -51,14 +51,15 @@ describe 'Create a new exhibit', type: :feature do
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
 
     visit spotlight.new_exhibit_path
 
     fill_in 'Title', with: 'My exhibit title'
     fill_in 'URL slug', with: 'custom-slug'
 
-    click_button 'Save'
+    find('input[name="commit"]').click
+
     expect(page).to have_content 'has already been taken'
   end
 end

data/spec/features/dashboard_spec.rb

@@ -2,11 +2,6 @@
 
 describe 'Dashboard', type: :feature do
   let(:exhibit) { FactoryBot.create(:exhibit) }
-  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
-  before do
-    login_as(admin)
-  end
-
   let!(:parent_feature_page) do
     FactoryBot.create(:feature_page, title: 'Parent Page', exhibit: exhibit)
   end
@@ -18,6 +13,11 @@ describe 'Dashboard', type: :feature do
       exhibit: exhibit
     )
   end
+  let(:admin) { FactoryBot.create(:exhibit_admin, exhibit: exhibit) }
+
+  before do
+    login_as(admin)
+  end
 
   it 'includes a list of recently edited feature pages' do
     visit spotlight.exhibit_dashboard_path(exhibit)

data/spec/features/exhibits/administration_spec.rb

@@ -63,9 +63,9 @@ describe 'Exhibit Administration', type: :feature do
     it 'updates the aria-labels properly', js: true do
       visit spotlight.edit_exhibit_path(exhibit)
 
-      expect(find_field(email_id_0)['aria-label']).to eq 'Contact email 1'
+      expect(find_field(email_id_0)['aria-label']).to eq 'Recipient email 1'
       find('#another-email').click
-      expect(find_field(email_id_1)['aria-label']).to eq 'Contact email 2'
+      expect(find_field(email_id_1)['aria-label']).to eq 'Recipient email 2'
     end
 
     it 'allows deletion of contact email addresses', js: true do
@@ -135,7 +135,7 @@ describe 'Exhibit Administration', type: :feature do
         find_all('.contact-email-delete').first.click
       end
 
-      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting contact email: Not Found')
+      expect(page).to have_css("##{hidden_input_id_0}~div span.contact-email-delete-error", text: 'Problem deleting recipient: Not Found')
     end
   end
 end

data/spec/features/exhibits/language_create_edit_spec.rb

@@ -13,7 +13,7 @@ describe 'Language', type: :feature do
     it 'successfully adds languages' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -27,7 +27,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do
@@ -43,7 +43,7 @@ describe 'Language', type: :feature do
     it 'successfully updates the language' do
       within '#language' do
         select 'Albanian'
-        click_button 'Add language'
+        find('input[name="commit"]').click
       end
       expect(page).to have_css '.flash_messages', text: 'The language was created.'
       within '#language' do

data/spec/features/javascript/block_controls_spec.rb

@@ -27,10 +27,12 @@ describe 'Block controls' do
 
     within('.spotlight-block-controls') do
       expect(page).to have_css('.st-controls-group', count: 2)
+
       within(first('.st-controls-group')) do
         expect(page).to have_content 'Standard widgets'
         expect(page).to have_css('.st-block-controls__button')
       end
+
       within(all('.st-controls-group').last) do
         expect(page).to have_content 'Exhibit item widgets'
         expect(page).to have_css('.st-block-controls__button')

data/spec/features/report_a_problem_spec.rb

@@ -33,9 +33,10 @@ describe 'Report a Problem', type: :feature do
     it 'accepts a problem report', js: true do
       visit spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
       click_on 'Feedback'
+      expect(page).to have_css('.alert-primary', text: '/dq287tq6352')
       expect(find('#contact_form_current_url', visible: false).value).to end_with spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
-      fill_in 'Name', with: 'Some Body'
-      fill_in 'Email', with: 'test@example.com'
+      fill_in 'Your name', with: 'Some Body'
+      fill_in 'Your email', with: 'test@example.com'
       fill_in 'Message', with: 'This is my problem report'
 
       expect do
@@ -47,8 +48,8 @@ describe 'Report a Problem', type: :feature do
       visit spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
       click_on 'Feedback'
       expect(find('#contact_form_current_url', visible: false).value).to end_with spotlight.exhibit_solr_document_path(exhibit, id: 'dq287tq6352')
-      fill_in 'Name', with: 'Some Body'
-      fill_in 'Email', with: 'test@example.com'
+      fill_in 'Your name', with: 'Some Body'
+      fill_in 'Your email', with: 'test@example.com'
       page.evaluate_script("$('#contact_form_#{honeypot_field_name}').val('possible_spam@spam.com')")
       fill_in 'Message', with: 'This is my problem report'
 

data/spec/helpers/spotlight/pages_helper_spec.rb

@@ -109,13 +109,13 @@ describe Spotlight::PagesHelper, type: :helper do
   end
 
   describe '#content_editor_class' do
-    context 'with a sir-trevor backed page' do
+    context 'a sir-trevor backed page with a custom class' do
       it 'has a custom class' do
         expect(helper.content_editor_class(Spotlight::Page.new)).to eq 'js-st-instance'
       end
     end
 
-    context 'with a sir-trevor backed page' do
+    context 'a sir-trevor backed page with a derived class' do
       it 'derives a css class name from the editor type' do
         expect(helper.content_editor_class(Spotlight::Page.new(content_type: 'Something::Custom'))).to eq 'js-something-custom-instance'
       end

data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Spotlight::AddUploadsFromCSV do
+describe Spotlight::AddUploadsFromCsv do
   subject(:job) { described_class.new(data, exhibit, user) }
 
   let(:exhibit) { FactoryBot.create(:exhibit) }
@@ -40,4 +40,16 @@ describe Spotlight::AddUploadsFromCSV do
 
     job.perform_now
   end
+
+  context 'with errors' do
+    it 'collects errors uploaded resources for each row of data' do
+      allow(Spotlight::IndexingCompleteMailer).to receive(:documents_indexed).and_return(double(deliver_now: true))
+      job.perform_now
+      expect(Spotlight::IndexingCompleteMailer).to have_received(:documents_indexed).with(
+        data, exhibit, user,
+        indexed_count: 1,
+        errors: { 1 => array_including(match(/relative URI: x/)), 2 => array_including(match(/Upload is invalid/)) }
+      )
+    end
+  end
 end

data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe Spotlight::IndexingCompleteMailer do
-  subject { described_class.documents_indexed [1, 2, 3], exhibit, user }
+  subject { described_class.documents_indexed [1, 2, 3], exhibit, user, indexed_count: 3 }
 
   let(:user) { double(email: 'test@example.com') }
   let(:exhibit) { double(title: 'Exhibit title') }
@@ -29,4 +29,14 @@ describe Spotlight::IndexingCompleteMailer do
   it 'includes the exhibit title' do
     expect(subject.body.encoded).to match exhibit.title
   end
+
+  context 'with errors' do
+    subject { described_class.documents_indexed [], exhibit, user, indexed_count: 0, errors: { 1 => ['missing title'], 20 => ['whatever'] } }
+
+    it 'includes some errors' do
+      expect(subject.body.encoded).to match 'Errors'
+      expect(subject.body.encoded).to match 'Row 1: missing title'
+      expect(subject.body.encoded).to match 'Row 20: whatever'
+    end
+  end
 end

data/spec/models/solr_document_spec.rb

@@ -4,14 +4,13 @@ describe SolrDocument, type: :model do
   subject { document }
 
   let(:document) { described_class.new(id: 'abcd123') }
+  let(:exhibit_alt) { FactoryBot.create(:exhibit) }
+  let(:exhibit) { FactoryBot.create(:exhibit) }
 
   before do
     allow(subject).to receive_messages(reindex: nil)
   end
 
-  let(:exhibit_alt) { FactoryBot.create(:exhibit) }
-  let(:exhibit) { FactoryBot.create(:exhibit) }
-
   its(:to_key) { is_expected.to eq ['abcd123'] }
   its(:persisted?) { is_expected.to be_truthy }
 

data/spec/models/spotlight/access_controls_enforcement_search_builder_spec.rb

@@ -3,6 +3,7 @@
 describe Spotlight::AccessControlsEnforcementSearchBuilder do
   class MockSearchBuilder < Blacklight::SearchBuilder
     attr_reader :blacklight_params, :scope
+
     def initialize(blacklight_params, scope)
       @blacklight_params = blacklight_params
       @scope = scope

data/spec/models/spotlight/featured_image_spec.rb

@@ -36,7 +36,6 @@ describe Spotlight::FeaturedImage do
 
       context 'with an uploaded image' do
         before do
-          featured_image.source = 'remote'
           featured_image.image = temp_image.image
           featured_image.save!
         end

data/spec/models/spotlight/role_spec.rb

@@ -37,10 +37,10 @@ describe Spotlight::Role, type: :model do
 
       describe 'that points at a user with an existing role' do
         let(:user) { FactoryBot.create(:user) }
-        before { described_class.create!(role: 'curator', user: user) }
-
         let(:args) { { role: 'curator', user_key: user.email } }
 
+        before { described_class.create!(role: 'curator', user: user) }
+
         it 'is valid' do
           expect(subject).not_to be_valid
           expect(subject.errors.messages).to eq(user_key: ['already a member of this exhibit'])

data/spec/services/spotlight/exhibit_import_export_service_spec.rb

@@ -412,10 +412,22 @@ describe Spotlight::ExhibitImportExportService do
       new_export = described_class.new(e).as_json
 
       actual = _deep_transform_values_in_object(new_export) do |v|
-        v.is_a?(Time) ? nil : v
+        if DateTime.parse(v.to_s)
+          nil
+        else
+          v
+        end
+      rescue ArgumentError
+        nil
       end
       expected = _deep_transform_values_in_object(export) do |v|
-        v.is_a?(Time) ? nil : v
+        if DateTime.parse(v.to_s)
+          nil
+        else
+          v
+        end
+      rescue ArgumentError
+        nil
       end
       expect(actual).to include expected
     end

data/spec/services/spotlight/iiif_resource_resolver_spec.rb

@@ -68,7 +68,7 @@ describe Spotlight::IiifResourceResolver do
       end
     end
 
-    context 'when the stored canvas ID is not present' do
+    context 'when the stored image ID is not present' do
       it 'raises a ManifestError' do
         resource.iiif_image_id = 'not-a-real-image-id'
 

data/spec/test_app_templates/Gemfile.extra

@@ -1,3 +0,0 @@
-gem 'blacklight', '~> 7.0'
-gem 'sprockets', '< 4'
-gem 'thor', '~> 0.20'

data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb

@@ -2,7 +2,10 @@
 
 describe 'spotlight/metadata_configurations/_metadata_field', type: :view do
   let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:field) { Blacklight::Configuration::Field.new immutable: OpenStruct.new(another_view_type: false) }
+  let(:builder) { ActionView::Helpers::FormBuilder.new 'z', nil, view, {} }
   let(:p) { 'spotlight/metadata_configurations/metadata_field.html.erb' }
+
   before do
     assign(:exhibit, exhibit)
     assign(:blacklight_configuration, exhibit.blacklight_configuration)
@@ -14,9 +17,6 @@ describe 'spotlight/metadata_configurations/_metadata_field', type: :view do
     )
   end
 
-  let(:field) { Blacklight::Configuration::Field.new immutable: OpenStruct.new(another_view_type: false) }
-  let(:builder) { ActionView::Helpers::FormBuilder.new 'z', nil, view, {} }
-
   it 'uses the index_field_label helper to render the label' do
     allow(view).to receive(:index_field_label).with(anything, 'some_key').and_return 'Some label'
     render partial: p, locals: { key: 'some_key', config: field, f: builder }

data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb

@@ -2,6 +2,13 @@
 
 describe 'spotlight/search_configurations/_sort', type: :view do
   let(:exhibit) { FactoryBot.create(:exhibit) }
+  let(:f) do
+    form_helper = nil
+    controller.view_context.bootstrap_form_for(exhibit.blacklight_configuration, url: '/update') do |f|
+      form_helper = f
+    end
+    form_helper
+  end
 
   before do
     original_config = Spotlight::Engine.blacklight_config.deep_dup
@@ -16,14 +23,6 @@ describe 'spotlight/search_configurations/_sort', type: :view do
     )
   end
 
-  let(:f) do
-    form_helper = nil
-    controller.view_context.bootstrap_form_for(exhibit.blacklight_configuration, url: '/update') do |f|
-      form_helper = f
-    end
-    form_helper
-  end
-
   it 'has a disabled relevance sort option' do
     render partial: 'spotlight/search_configurations/sort', locals: { f: f }
     expect(rendered).to have_selector "input[name='blacklight_configuration[sort_fields][relevance][enable]'][disabled='disabled']"

data/vendor/assets/javascripts/leaflet-iiif.js

@@ -1,5 +1,5 @@
 /*
- * Leaflet-IIIF 2.0.0
+ * Leaflet-IIIF 3.0.0
  * IIIF Viewer for Leaflet
  * by Jack Reed, @mejackreed
  */
@@ -32,7 +32,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     }
 
     options = L.setOptions(this, options);
-    this._infoDeferred = new $.Deferred();
+    this._infoPromise = null;
     this._infoUrl = url;
     this._baseUrl = this._templateUrl();
     this._getInfo();
@@ -48,27 +48,39 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       miny = (y * tileBaseSize),
       maxx = Math.min(minx + tileBaseSize, _this.x),
       maxy = Math.min(miny + tileBaseSize, _this.y);
-    
+
     var xDiff = (maxx - minx);
     var yDiff = (maxy - miny);
 
+    // Canonical URI Syntax for v2
+    var size = Math.ceil(xDiff / scale) + ',';
+    if (_this.type === 'ImageService3') {
+      // Cannonical URI Syntax for v3
+      size = size + Math.ceil(yDiff / scale);
+    }
+
     return L.Util.template(this._baseUrl, L.extend({
       format: _this.options.tileFormat,
       quality: _this.quality,
       region: [minx, miny, xDiff, yDiff].join(','),
       rotation: 0,
-      size: Math.ceil(xDiff / scale) + ','
+      size: size
     }, this.options));
   },
   onAdd: function(map) {
     var _this = this;
 
-    // Wait for deferred to complete
-    $.when(_this._infoDeferred).done(function() {
+    // Wait for info.json fetch and parse to complete
+    Promise.all([_this._infoPromise]).then(function() {
+      // Store unmutated imageSizes
+      _this._imageSizesOriginal = _this._imageSizes.slice(0);
 
       // Set maxZoom for map
       map._layersMaxZoom = _this.maxZoom;
 
+      // Call add TileLayer
+      L.TileLayer.prototype.onAdd.call(_this, map);
+
       // Set minZoom and minNativeZoom based on how the imageSizes match up
       var smallestImage = _this._imageSizes[0];
       var mapSize = _this._map.getSize();
@@ -88,9 +100,6 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       _this._prev_map_layersMinZoom = _this._map._layersMinZoom;
       _this._map._layersMinZoom = newMinZoom;
 
-      // Call add TileLayer
-      L.TileLayer.prototype.onAdd.call(_this, map);
-
       if (_this.options.fitBounds) {
         _this._fitBounds();
       }
@@ -112,12 +121,16 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         tile.tile.style.height = height + 'px';
 
       });
+    })
+    .catch(function(err){
+        console.error(err);
     });
   },
   onRemove: function(map) {
     var _this = this;
-    
+
     map._layersMinZoom = _this._prev_map_layersMinZoom;
+    _this._imageSizes = _this._imageSizesOriginal;
 
     // Remove maxBounds set for this image
     if(_this.options.setMaxBounds) {
@@ -156,9 +169,14 @@ L.TileLayer.Iiif = L.TileLayer.extend({
   _getInfo: function() {
     var _this = this;
 
-    // Look for a way to do this without jQuery
-    $.getJSON(_this._infoUrl)
-      .done(function(data) {
+    _this._infoPromise = fetch(_this._infoUrl)
+      .then(function(response) {
+        return response.json();
+      })
+      .catch(function(err){
+          console.error(err);
+      })
+      .then(function(data) {
         _this.y = data.height;
         _this.x = data.width;
 
@@ -176,6 +194,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         }else {
           _this.profile = data.profile;
         }
+        _this.type = data.type;
 
         _this._setQuality();
 
@@ -197,10 +216,13 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         };
 
         // Calculates maximum native zoom for the layer
-        _this.maxNativeZoom = Math.max(ceilLog2(_this.x / _this.options.tileSize),
-          ceilLog2(_this.y / _this.options.tileSize));
+        _this.maxNativeZoom = Math.max(
+          ceilLog2(_this.x / _this.options.tileSize),
+          ceilLog2(_this.y / _this.options.tileSize),
+          0
+        );
         _this.options.maxNativeZoom = _this.maxNativeZoom;
-        
+
         // Enable zooming further than native if maxZoom option supplied
         if (_this._customMaxZoom && _this.options.maxZoom > _this.maxNativeZoom) {
           _this.maxZoom = _this.options.maxZoom;
@@ -208,7 +230,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
         else {
           _this.maxZoom = _this.maxNativeZoom;
         }
-        
+
         for (var i = 0; i <= _this.maxZoom; i++) {
           scale = Math.pow(2, _this.maxNativeZoom - i);
           width_ = Math.ceil(_this.x / scale);
@@ -221,10 +243,11 @@ L.TileLayer.Iiif = L.TileLayer.extend({
 
         _this._tierSizes = tierSizes;
         _this._imageSizes = imageSizes;
-
-        // Resolved Deferred to initiate tilelayer load
-        _this._infoDeferred.resolve();
+      })
+      .catch(function(err){
+          console.error(err);
       });
+
   },
 
   _setQuality: function() {
@@ -259,7 +282,6 @@ L.TileLayer.Iiif = L.TileLayer.extend({
     return this._infoToBaseUrl() + '{region}/{size}/{rotation}/{quality}.{format}';
   },
   _isValidTile: function(coords) {
-    var tileBounds = this._tileCoordsToBounds(coords);
     var _this = this;
     var zoom = _this._getZoomForUrl();
     var sizes = _this._tierSizes[zoom];
@@ -276,6 +298,9 @@ L.TileLayer.Iiif = L.TileLayer.extend({
       return true;
     }
   },
+  _tileShouldBeLoaded: function(coords) {
+    return this._isValidTile(coords);
+  },
   _getInitialZoom: function (mapSize) {
     var _this = this;
     var tolerance = 0.8;