geoblacklight 2.2.0 → 3.0.1

data/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 gem 'blacklight', '~> 7.0'
 gem 'geoblacklight', '~> 2.0'
 gem 'webpacker'

data/vendor/assets/stylesheets/leaflet.css

@@ -246,7 +246,6 @@
 
 .leaflet-container {
 	background: #ddd;
-	outline: 0;
 	}
 .leaflet-container a {
 	color: #0078A8;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Mike Graves
@@ -11,22 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.4
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.1'
 - !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
@@ -73,30 +65,30 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: coderay
   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
@@ -185,16 +163,16 @@ dependencies:
   name: webpacker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -321,20 +299,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +350,8 @@ email:
 - drh@stanford.edu
 - eliotj@princeton.edu
 - pjreed@stanford.edu
-executables: []
+executables:
+- coverage.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -413,6 +378,8 @@ files:
 - app/assets/images/blacklight/bookmark.svg
 - app/assets/images/blacklight/cd-rom.svg
 - app/assets/images/blacklight/chicago.svg
+- app/assets/images/blacklight/citation.svg
+- app/assets/images/blacklight/collection.svg
 - app/assets/images/blacklight/columbia.svg
 - app/assets/images/blacklight/cornell.svg
 - app/assets/images/blacklight/dvd-rom.svg
@@ -429,7 +396,6 @@ files:
 - app/assets/images/blacklight/leaf.svg
 - app/assets/images/blacklight/lewis-clark.svg
 - app/assets/images/blacklight/line.svg
-- app/assets/images/blacklight/logo.png
 - app/assets/images/blacklight/logo.svg
 - app/assets/images/blacklight/map-marker.svg
 - app/assets/images/blacklight/map.svg
@@ -475,7 +441,6 @@ 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/collapse.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 +451,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
@@ -501,10 +467,10 @@ files:
 - app/assets/javascripts/geoblacklight/viewers/oembed.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 +485,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
@@ -535,10 +500,14 @@ files:
 - app/models/concerns/geoblacklight/solr_document.rb
 - app/models/concerns/geoblacklight/solr_document/arcgis.rb
 - app/models/concerns/geoblacklight/solr_document/carto.rb
+- app/models/concerns/geoblacklight/solr_document/citation.rb
 - app/models/concerns/geoblacklight/solr_document/finder.rb
 - 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
 - app/views/catalog/_document_split.html.erb
@@ -547,7 +516,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
@@ -563,7 +531,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
@@ -580,14 +547,19 @@ files:
 - app/views/relation/index.html.erb
 - app/views/relation/index.json.jbuilder
 - app/views/shared/_header_navbar.html.erb
+- bin/coverage.rb
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
 - geoblacklight.gemspec
+- 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
@@ -679,6 +651,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
@@ -717,6 +690,10 @@ files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
+- 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
@@ -735,6 +712,7 @@ files:
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
+- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
 - spec/javascripts/spec_helper.js
@@ -766,6 +744,7 @@ files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
+- spec/models/concerns/geoblacklight/solr_document/citation_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
@@ -775,7 +754,10 @@ files:
 - spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - 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
 - spec/test_app_templates/metadata/fgdc.xml
@@ -799,8 +781,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.js.map
 - vendor/assets/stylesheets/leaflet-label.css
 - vendor/assets/stylesheets/leaflet.css
 homepage: http://github.com/geoblacklight/geoblacklight
@@ -822,7 +802,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
@@ -850,6 +830,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
@@ -888,6 +869,10 @@ test_files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
+- 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
@@ -906,6 +891,7 @@ test_files:
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
+- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
 - spec/javascripts/spec_helper.js
@@ -937,6 +923,7 @@ test_files:
 - spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
 - spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/carto_spec.rb
+- spec/models/concerns/geoblacklight/solr_document/citation_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/finder_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb
 - spec/models/concerns/geoblacklight/solr_document_spec.rb
@@ -946,7 +933,10 @@ test_files:
 - spec/support/backport_test_helpers.rb
 - spec/support/features.rb
 - 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
 - spec/test_app_templates/metadata/fgdc.xml

data/app/assets/javascripts/geoblacklight/modules/collapse.js

@@ -1,7 +0,0 @@
-Blacklight.onLoad(function() {
-  $('#content')
-    .on('click', '#documents [data-layer-id]', function() {
-      $(this).find('.collapse').collapse('toggle');
-      $(this).find('.caret-toggle').toggleClass('open');
-    });
-});

data/app/assets/stylesheets/geoblacklight/_geoblacklight.scss

@@ -1,36 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- */
-@import 'leaflet';
-@import 'geoblacklight-icons-rails';
-@import 'font-awesome';
-@import 'geoblacklight/styles';
-@import 'modules/facets';
-@import 'modules/mixins';
-@import 'modules/icon-customization';
-@import 'modules/home';
-@import 'modules/index_maps';
-@import 'modules/item';
-@import 'modules/layer_opacity';
-@import 'modules/metadata';
-@import 'modules/metadata_content';
-@import 'modules/metadata_missing';
-@import 'modules/metadata_markup';
-@import 'modules/modal';
-@import 'modules/results';
-@import 'modules/geosearch';
-@import 'modules/search_widgets';
-@import 'modules/sidebar';
-@import 'modules/toolbar';
-@import 'modules/relations';
-@import 'modules/web_services';
-@import 'blacklight_overrides';
-@import 'modules/downloads';