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

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

@@ -49,6 +49,6 @@ describe 'spotlight/search_configurations/_search_fields', type: :view do
   end
 
   it 'parameterizes the data-id attribute for search field key' do
-    expect(rendered).to have_selector '[data-id="some_field-with_a_space-id"]'
+    expect(rendered).to have_selector '[data-id="some_field-with_a_space"]'
   end
 end

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']"
@@ -31,11 +30,11 @@ describe 'spotlight/search_configurations/_sort', type: :view do
 
   it 'parameterizes the data-id attribute for sort fields (e.g. when no key is supplied and the sort is used as the key)' do
     render partial: 'spotlight/search_configurations/sort', locals: { f: f }
-    expect(rendered).to have_css('[data-id="sort_title_ssi-asc-plus_another_field-desc-id"]')
+    expect(rendered).to have_css('[data-id="sort_title_ssi-asc-plus_another_field-desc"]')
   end
 
   it 'hides fields that are configured not to display' do
     render partial: 'spotlight/search_configurations/sort', locals: { f: f }
-    expect(rendered).not_to have_css('[data-id="some_disabled_field-id"]')
+    expect(rendered).not_to have_css('[data-id="some_disabled_field"]')
   end
 end

data/spec/views/spotlight/translations/_import.html.erb_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+describe 'spotlight/translations/_import.html.erb', type: :view do
+  let(:exhibit) { FactoryBot.create(:exhibit) }
+
+  before do
+    allow(view).to receive(:can?).and_return(true)
+    allow(view).to receive(:current_exhibit).and_return(exhibit)
+    assign(:language, :es)
+    I18n.default_locale = 'en'
+  end
+
+  it 'has a link to export the translation data' do
+    render
+    expect(rendered).to have_link 'Export English', href: spotlight.exhibit_translations_path(exhibit_id: exhibit, format: 'yaml', locale: 'en')
+    expect(rendered).to have_link 'Export Spanish', href: spotlight.exhibit_translations_path(exhibit_id: exhibit, format: 'yaml', locale: 'es')
+  end
+
+  it 'has a form to import the translation data' do
+    render
+    expect(rendered).to have_selector "form[action='#{spotlight.import_exhibit_translations_path(exhibit_id: exhibit)}']"
+    expect(rendered).to have_selector 'input[name="file"]'
+  end
+end

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;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.6
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -37,16 +37,16 @@ dependencies:
   name: almond-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -149,30 +149,30 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: devise_invitable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -387,16 +387,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: riiif
   requirement: !ruby/object:Gem::Requirement
@@ -457,16 +457,30 @@ dependencies:
   name: sir_trevor_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sprockets-es6
   requirement: !ruby/object:Gem::Requirement
@@ -481,6 +495,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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: tophat
   requirement: !ruby/object:Gem::Requirement
@@ -515,14 +543,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.31'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.31'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -641,14 +669,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.83.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.83.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -844,6 +872,7 @@ files:
 - app/assets/javascripts/spotlight/user/index.js
 - app/assets/javascripts/spotlight/user/report_a_problem.js
 - app/assets/javascripts/spotlight/user/zpr_links.js.erb
+- app/assets/stylesheets/spotlight/_accessibility.scss
 - app/assets/stylesheets/spotlight/_attachments.css
 - app/assets/stylesheets/spotlight/_blacklight_configuration.scss
 - app/assets/stylesheets/spotlight/_blacklight_overrides.scss
@@ -1014,13 +1043,11 @@ files:
 - app/models/spotlight/search.rb
 - app/models/spotlight/site.rb
 - app/models/spotlight/solr_document_sidecar.rb
+- app/models/spotlight/temporary_image.rb
 - app/presenters/spotlight/iiif_manifest_presenter.rb
-- app/serializers/spotlight/exhibit_export_serializer.rb
-- app/serializers/spotlight/featured_image_representer.rb
-- app/serializers/spotlight/main_navigation_representer.rb
-- app/serializers/spotlight/page_representer.rb
 - app/services/spotlight/carrierwave_file_resolver.rb
 - app/services/spotlight/clone_translated_page_from_locale.rb
+- app/services/spotlight/exhibit_import_export_service.rb
 - app/services/spotlight/iiif_resource_resolver.rb
 - app/services/spotlight/invite_users_service.rb
 - app/services/spotlight/resources/iiif_builder.rb
@@ -1174,7 +1201,9 @@ files:
 - app/views/spotlight/searches/index.html.erb
 - app/views/spotlight/shared/_configuration_sidebar.html.erb
 - app/views/spotlight/shared/_curation_sidebar.html.erb
+- app/views/spotlight/shared/_dd3_item.html.erb
 - app/views/spotlight/shared/_exhibit_sidebar.html.erb
+- app/views/spotlight/shared/_honeypot_field.html.erb
 - app/views/spotlight/shared/_locale_picker.html.erb
 - app/views/spotlight/shared/_report_a_problem.html.erb
 - app/views/spotlight/sir_trevor/_sir_trevor_block_array.html.erb
@@ -1204,12 +1233,14 @@ files:
 - app/views/spotlight/tags/index.html.erb
 - app/views/spotlight/translations/_browse_categories.html.erb
 - app/views/spotlight/translations/_general.html.erb
+- app/views/spotlight/translations/_import.html.erb
 - app/views/spotlight/translations/_metadata.html.erb
 - app/views/spotlight/translations/_page.html.erb
 - app/views/spotlight/translations/_pages.html.erb
 - app/views/spotlight/translations/_pages_table.html.erb
 - app/views/spotlight/translations/_search_fields.html.erb
 - app/views/spotlight/translations/edit.html.erb
+- app/views/spotlight/translations/show.yaml.yamlbuilder
 - config/i18n-tasks.yml
 - config/locales/devise.en.yml
 - config/locales/spotlight.ar.yml
@@ -1287,12 +1318,14 @@ files:
 - db/migrate/20190813085432_add_is_multiple_to_custom_fields.rb
 - db/migrate/20190910200927_create_spotlight_custom_search_fields.rb
 - db/migrate/20191205112300_add_unique_index_to_sidecars.rb
+- db/migrate/20200403161512_add_subtitle_to_searches.rb
 - lib/blacklight/spotlight.rb
 - lib/generators/spotlight/install_generator.rb
 - lib/generators/spotlight/scaffold_resource_generator.rb
 - lib/generators/spotlight/templates/catalog_controller.rb
 - lib/generators/spotlight/templates/config/initializers/oembed.rb
 - lib/generators/spotlight/templates/config/initializers/riiif.rb
+- lib/generators/spotlight/templates/config/initializers/sir_trevor_rails.rb
 - lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb
 - lib/generators/spotlight/templates/config/initializers/translation.rb
 - lib/generators/spotlight/templates/config/sitemap.rb
@@ -1502,9 +1535,9 @@ files:
 - spec/routing/spotlight/exhibit_catalog_spec.rb
 - spec/routing/spotlight/featured_images_spec.rb
 - spec/routing/spotlight/pages_routing_spec.rb
-- spec/serializers/spotlight/exhibit_export_serializer_spec.rb
 - spec/services/spotlight/carrierwave_file_resolver_spec.rb
 - spec/services/spotlight/clone_translated_page_from_locale_spec.rb
+- spec/services/spotlight/exhibit_import_export_service_spec.rb
 - spec/services/spotlight/iiif_resource_resolver_spec.rb
 - spec/services/spotlight/invite_users_service_spec.rb
 - spec/services/spotlight/solr_document_builder_spec.rb
@@ -1582,6 +1615,7 @@ files:
 - spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb
 - spec/views/spotlight/sites/edit_exhibits.html.erb_spec.rb
 - spec/views/spotlight/tags/index.html.erb_spec.rb
+- spec/views/spotlight/translations/_import.html.erb_spec.rb
 - spec/views/spotlight/translations/_page.html.erb_spec.rb
 - vendor/assets/images/sir-trevor-icons.svg
 - vendor/assets/javascripts/Leaflet.Editable.js
@@ -1627,14 +1661,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
@@ -1751,7 +1785,6 @@ test_files:
 - spec/models/translation_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/presenters/spotlight/iiif_manifest_presenter_spec.rb
-- spec/serializers/spotlight/exhibit_export_serializer_spec.rb
 - spec/support/features/capybara_default_max_wait_metadata_helper.rb
 - spec/support/features/test_features_helpers.rb
 - spec/support/stub_iiif_response.rb
@@ -1889,6 +1922,7 @@ test_files:
 - spec/views/spotlight/pages/show.html.erb_spec.rb
 - spec/views/spotlight/pages/new.html.erb_spec.rb
 - spec/views/spotlight/pages/index.html.erb_spec.rb
+- spec/views/spotlight/translations/_import.html.erb_spec.rb
 - spec/views/spotlight/translations/_page.html.erb_spec.rb
 - spec/views/shared/_header_navbar.html.erb_spec.rb
 - spec/views/shared/_exhibit_navbar.html.erb_spec.rb
@@ -1915,3 +1949,4 @@ test_files:
 - spec/services/spotlight/iiif_resource_resolver_spec.rb
 - spec/services/spotlight/solr_document_builder_spec.rb
 - spec/services/spotlight/carrierwave_file_resolver_spec.rb
+- spec/services/spotlight/exhibit_import_export_service_spec.rb