geoblacklight 2.4.0 → 3.3.0

data/spec/views/catalog/_document_split.html.erb_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_index_split.html.erb_spec.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_results_pagination.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_results_pagination.html.erb', type: :view do

data/spec/views/catalog/_show_downloads.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_show_downloads.html.erb', type: :view do

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe 'catalog/_show_tools.html.erb', type: :view do
@@ -6,11 +7,8 @@ describe 'catalog/_show_tools.html.erb', type: :view do
   let(:context) { Blacklight::Configuration::Context.new(controller) }
 
   before do
-    assign :response, instance_double(Blacklight::Solr::Response, params: {})
     assign :document, document
     allow(view).to receive(:blacklight_config).and_return blacklight_config
-    allow(view).to receive(:has_user_authentication_provider?).and_return false
-
     allow(view).to receive(:blacklight_configuration_context).and_return context
   end
 
@@ -18,8 +16,8 @@ describe 'catalog/_show_tools.html.erb', type: :view do
     let(:document_actions) { blacklight_config.show.document_actions }
 
     it 'renders a document action' do
-      allow(view).to receive(:some_action_solr_document_path).with(document).and_return 'x'
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link 'Some action', href: 'x'
     end

data/template.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
 gem 'blacklight', '~> 7.0'
-gem 'geoblacklight', '~> 2.0'
-gem 'webpacker'
+gem 'geoblacklight', '~> 3.0'
+gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
+gem 'sprockets', '< 4.0' # Use sprockets less than 4.0, let webpacker users set this up themselves
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Mike Graves
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -41,20 +47,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: font-awesome-rails
-  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: config
   requirement: !ruby/object:Gem::Requirement
@@ -111,20 +103,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: geoblacklight-icons
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +160,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webpacker
+  name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,16 +205,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -308,21 +286,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bixby
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -336,47 +314,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: teaspoon
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 description: GeoBlacklight provides a world-class discovery platform for geospatial
   (GIS) holdings. It is an open collaborative project aiming to build off of the successes
   of the Blacklight Solr-powered discovery interface and the multi-institutional OpenGeoportal
@@ -386,12 +364,13 @@ email:
 - drh@stanford.edu
 - eliotj@princeton.edu
 - pjreed@stanford.edu
-executables: []
+executables:
+- coverage.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -468,6 +447,7 @@ files:
 - app/assets/images/blacklight/uva.svg
 - app/assets/images/blacklight/web_services.svg
 - app/assets/images/blacklight/wisconsin.svg
+- app/assets/images/favicon.ico
 - app/assets/javascripts/geoblacklight/basemaps.js
 - app/assets/javascripts/geoblacklight/controls.js
 - app/assets/javascripts/geoblacklight/controls/opacity.js
@@ -476,6 +456,7 @@ files:
 - app/assets/javascripts/geoblacklight/downloaders/hgl_downloader.js
 - app/assets/javascripts/geoblacklight/geoblacklight.js
 - app/assets/javascripts/geoblacklight/modules.js
+- app/assets/javascripts/geoblacklight/modules/bookmarks.js
 - app/assets/javascripts/geoblacklight/modules/download.js
 - app/assets/javascripts/geoblacklight/modules/geosearch.js
 - app/assets/javascripts/geoblacklight/modules/help_text.js
@@ -486,6 +467,7 @@ files:
 - app/assets/javascripts/geoblacklight/modules/metadata_download_button.js
 - app/assets/javascripts/geoblacklight/modules/relations.js
 - app/assets/javascripts/geoblacklight/modules/results.js
+- app/assets/javascripts/geoblacklight/modules/svg_tooltips.js
 - app/assets/javascripts/geoblacklight/modules/util.js
 - app/assets/javascripts/geoblacklight/templates/index_map_download.hbs
 - app/assets/javascripts/geoblacklight/templates/index_map_info.hbs
@@ -499,12 +481,13 @@ files:
 - app/assets/javascripts/geoblacklight/viewers/index_map.js
 - app/assets/javascripts/geoblacklight/viewers/map.js
 - app/assets/javascripts/geoblacklight/viewers/oembed.js
+- app/assets/javascripts/geoblacklight/viewers/tms.js
 - app/assets/javascripts/geoblacklight/viewers/viewer.js
 - app/assets/javascripts/geoblacklight/viewers/wms.js
-- app/assets/stylesheets/geoblacklight/_blacklight_overrides.scss
-- app/assets/stylesheets/geoblacklight/_geoblacklight.scss
-- app/assets/stylesheets/geoblacklight/_styles.scss
-- app/assets/stylesheets/geoblacklight/application.scss
+- app/assets/stylesheets/geoblacklight/geoblacklight.scss
+- app/assets/stylesheets/geoblacklight/modules/_base.scss
+- app/assets/stylesheets/geoblacklight/modules/_blacklight_overrides.scss
+- app/assets/stylesheets/geoblacklight/modules/_styles.scss
 - app/assets/stylesheets/geoblacklight/modules/downloads.scss
 - app/assets/stylesheets/geoblacklight/modules/facets.scss
 - app/assets/stylesheets/geoblacklight/modules/geosearch.scss
@@ -519,7 +502,6 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/metadata_missing.scss
 - app/assets/stylesheets/geoblacklight/modules/mixins.scss
 - app/assets/stylesheets/geoblacklight/modules/modal.scss
-- app/assets/stylesheets/geoblacklight/modules/relations.scss
 - app/assets/stylesheets/geoblacklight/modules/results.scss
 - app/assets/stylesheets/geoblacklight/modules/search_widgets.scss
 - app/assets/stylesheets/geoblacklight/modules/sidebar.scss
@@ -540,6 +522,8 @@ files:
 - app/models/concerns/geoblacklight/solr_document/inspection.rb
 - app/models/concerns/geoblacklight/spatial_search_behavior.rb
 - app/presenters/geoblacklight/document_presenter.rb
+- app/views/catalog/_arcgis.html.erb
+- app/views/catalog/_carto.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_data_dictionary.html.erb
 - app/views/catalog/_document_action.html.erb
@@ -549,7 +533,6 @@ files:
 - app/views/catalog/_downloads_generated.html.erb
 - app/views/catalog/_downloads_primary.html.erb
 - app/views/catalog/_downloads_secondary.html.erb
-- app/views/catalog/_exports.html.erb
 - app/views/catalog/_facet_tag_item.html.erb
 - app/views/catalog/_facet_tag_layout.html.erb
 - app/views/catalog/_header_icons.html.erb
@@ -565,7 +548,6 @@ files:
 - app/views/catalog/_show_downloads.html.erb
 - app/views/catalog/_show_header_default.html.erb
 - app/views/catalog/_show_sidebar.html.erb
-- app/views/catalog/_show_tools.html.erb
 - app/views/catalog/_web_services.html.erb
 - app/views/catalog/_web_services_default.html.erb
 - app/views/catalog/_web_services_wfs.html.erb
@@ -582,14 +564,22 @@ files:
 - app/views/relation/index.html.erb
 - app/views/relation/index.json.jbuilder
 - app/views/shared/_header_navbar.html.erb
+- babel.config.json
+- bin/coverage.rb
+- config/initializers/new_gbl_settings_defaults_3_3.yml
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
 - geoblacklight.gemspec
+- jest.config.js
+- lib/generators/geoblacklight/assets_generator.rb
 - lib/generators/geoblacklight/install_generator.rb
 - lib/generators/geoblacklight/templates/Procfile
+- lib/generators/geoblacklight/templates/assets/_blacklight.scss
+- lib/generators/geoblacklight/templates/assets/_customizations.scss
+- lib/generators/geoblacklight/templates/assets/_geoblacklight.scss
+- lib/generators/geoblacklight/templates/assets/application.scss
+- lib/generators/geoblacklight/templates/assets/geoblacklight.js
 - lib/generators/geoblacklight/templates/catalog_controller.rb
-- lib/generators/geoblacklight/templates/geoblacklight.js
-- lib/generators/geoblacklight/templates/geoblacklight.scss
 - lib/generators/geoblacklight/templates/package.json
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/webpacker.yml
@@ -607,6 +597,7 @@ files:
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
 - lib/geoblacklight/geoblacklight_helper_behavior.rb
+- lib/geoblacklight/geometry.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
 - lib/geoblacklight/metadata/base.rb
@@ -641,6 +632,7 @@ files:
 - schema/schema-commentary.md
 - schema/subjects.md
 - schema/type-values.md
+- setupJest.js
 - solr/conf/_rest_managed.json
 - solr/conf/admin-extra.html
 - solr/conf/core.properties
@@ -658,6 +650,7 @@ files:
 - solr/conf/xslt/example_atom.xsl
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -681,6 +674,7 @@ files:
 - spec/features/linkified_attribute_table_spec.rb
 - spec/features/metadata_panel_spec.rb
 - spec/features/missing_metadata_spec.rb
+- spec/features/multiple_downloads_spec.rb
 - spec/features/oembed_spec.rb
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
@@ -692,6 +686,7 @@ files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -722,6 +717,7 @@ files:
 - spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
 - spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
 - spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/multiple-downloads.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -733,6 +729,7 @@ files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
@@ -742,10 +739,8 @@ files:
 - spec/helpers/geoblacklight_helper_spec.rb
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -754,6 +749,7 @@ files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -783,7 +779,6 @@ files:
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html
@@ -808,8 +803,6 @@ files:
 - vendor/assets/javascripts/leaflet-src.js.map
 - vendor/assets/javascripts/leaflet.js.erb
 - vendor/assets/javascripts/native.history.js
-- vendor/assets/javascripts/readmore.js
-- vendor/assets/javascripts/readmore.min.js
 - vendor/assets/stylesheets/leaflet-label.css
 - vendor/assets/stylesheets/leaflet.css
 homepage: http://github.com/geoblacklight/geoblacklight
@@ -831,11 +824,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -859,6 +853,7 @@ test_files:
 - spec/features/linkified_attribute_table_spec.rb
 - spec/features/metadata_panel_spec.rb
 - spec/features/missing_metadata_spec.rb
+- spec/features/multiple_downloads_spec.rb
 - spec/features/oembed_spec.rb
 - spec/features/relations_spec.rb
 - spec/features/saved_searches_spec.rb
@@ -870,6 +865,7 @@ test_files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -900,6 +896,7 @@ test_files:
 - spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
 - spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
 - spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/multiple-downloads.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -911,6 +908,7 @@ test_files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
@@ -920,10 +918,8 @@ test_files:
 - spec/helpers/geoblacklight_helper_spec.rb
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -932,6 +928,7 @@ test_files:
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
 - spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -961,7 +958,6 @@ test_files:
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html