RubyGems - geoblacklight - Versions diffs - 4.0.0 → 4.1.0 - Mend

geoblacklight 4.0.0 → 4.1.0

Files changed (225) hide show

checksums.yaml +4 -4
data/.github/workflows/ruby.yml +21 -6
data/.solr_wrapper +1 -0
data/.standard.yml +1 -0
data/Gemfile +13 -11
data/README.md +1 -1
data/Rakefile +42 -50
data/app/assets/images/blacklight/american-geographical-society-library-uwm-libraries.svg +26 -0
data/app/assets/images/blacklight/arizona.svg +4 -0
data/app/assets/images/blacklight/circle-info-solid.svg +1 -0
data/app/assets/images/blacklight/fire-solid.svg +1 -0
data/app/assets/images/blacklight/lightbulb-solid.svg +1 -0
data/app/assets/images/blacklight/nebraska.svg +4 -0
data/app/assets/images/blacklight/rutgers.svg +5 -0
data/app/assets/images/blacklight/triangle-exclamation-solid.svg +1 -0
data/app/assets/stylesheets/geoblacklight/modules/sidebar.scss +8 -0
data/app/components/geoblacklight/display_note_component.html.erb +1 -0
data/app/components/geoblacklight/display_note_component.rb +47 -0
data/app/components/geoblacklight/icon_facet_item_component.rb +2 -2
data/app/controllers/download_controller.rb +36 -37
data/app/controllers/relation_controller.rb +1 -0
data/app/controllers/wms_controller.rb +1 -0
data/app/helpers/arcgis_helper.rb +2 -1
data/app/helpers/blacklight_helper.rb +2 -1
data/app/helpers/carto_helper.rb +3 -2
data/app/helpers/geoblacklight/geoblacklight_helper_behavior.rb +2 -1
data/app/helpers/geoblacklight_helper.rb +44 -36
data/app/models/concerns/geoblacklight/bbox_filter_query.rb +1 -1
data/app/models/concerns/geoblacklight/solr_document/arcgis.rb +1 -0
data/app/models/concerns/geoblacklight/solr_document/carto.rb +1 -0
data/app/models/concerns/geoblacklight/solr_document/citation.rb +3 -2
data/app/models/concerns/geoblacklight/solr_document/finder.rb +1 -0
data/app/models/concerns/geoblacklight/solr_document/inspection.rb +1 -0
data/app/models/concerns/geoblacklight/solr_document.rb +17 -9
data/app/models/concerns/geoblacklight/suppressed_records_search_behavior.rb +2 -1
data/app/presenters/geoblacklight/document_presenter.rb +3 -2
data/app/views/catalog/_show_default_display_note.html.erb +7 -0
data/app/views/catalog/_show_sidebar.html.erb +1 -0
data/app/views/catalog/_show_sidebar_static_map.html.erb +10 -0
data/app/views/relation/index.json.jbuilder +1 -1
data/config/initializers/new_gbl_settings_defaults_4.1.yml +104 -0
data/config/initializers/rails_config.rb +5 -1
data/config/locales/geoblacklight.en.yml +18 -10
data/geoblacklight.gemspec +36 -40
data/lib/generators/geoblacklight/assets_generator.rb +15 -15
data/lib/generators/geoblacklight/install_generator.rb +24 -23
data/lib/generators/geoblacklight/templates/catalog_controller.rb +66 -71
data/lib/generators/geoblacklight/templates/settings.yml +74 -22
data/lib/geoblacklight/bounding_box.rb +1 -0
data/lib/geoblacklight/constants.rb +26 -25
data/lib/geoblacklight/download/geojson_download.rb +10 -9
data/lib/geoblacklight/download/geotiff_download.rb +6 -5
data/lib/geoblacklight/download/hgl_download.rb +4 -3
data/lib/geoblacklight/download/kmz_download.rb +11 -10
data/lib/geoblacklight/download/shapefile_download.rb +10 -9
data/lib/geoblacklight/download.rb +12 -11
data/lib/geoblacklight/engine.rb +10 -9
data/lib/geoblacklight/exceptions.rb +3 -0
data/lib/geoblacklight/faraday_middleware/follow_redirects.rb +12 -11
data/lib/geoblacklight/geometry.rb +6 -5
data/lib/geoblacklight/item_viewer.rb +4 -3
data/lib/geoblacklight/metadata/base.rb +4 -3
data/lib/geoblacklight/metadata/fgdc.rb +1 -0
data/lib/geoblacklight/metadata/html.rb +5 -4
data/lib/geoblacklight/metadata/iso19139.rb +1 -0
data/lib/geoblacklight/metadata.rb +1 -0
data/lib/geoblacklight/metadata_transformer/base.rb +5 -4
data/lib/geoblacklight/metadata_transformer/fgdc.rb +1 -0
data/lib/geoblacklight/metadata_transformer/iso19139.rb +1 -0
data/lib/geoblacklight/metadata_transformer.rb +6 -2
data/lib/geoblacklight/reference.rb +3 -2
data/lib/geoblacklight/references.rb +11 -6
data/lib/geoblacklight/relation/ancestors.rb +4 -3
data/lib/geoblacklight/relation/descendants.rb +4 -3
data/lib/geoblacklight/relation/relation_response.rb +3 -2
data/lib/geoblacklight/routes/downloadable.rb +3 -2
data/lib/geoblacklight/routes/exportable.rb +4 -3
data/lib/geoblacklight/routes/wms.rb +2 -1
data/lib/geoblacklight/routes.rb +4 -3
data/lib/geoblacklight/version.rb +2 -1
data/lib/geoblacklight/view_helper_override.rb +3 -2
data/lib/geoblacklight/wms_layer/feature_info_response.rb +5 -4
data/lib/geoblacklight/wms_layer.rb +4 -3
data/lib/geoblacklight.rb +32 -31
data/lib/tasks/geoblacklight.rake +45 -44
data/schema/geoblacklight-schema-aardvark.json +6 -0
data/spec/components/geoblacklight/display_note_component_spec.rb +27 -0
data/spec/components/geoblacklight/homepage_feature_facet_component_spec.rb +11 -10
data/spec/components/geoblacklight/icon_facet_item_component_spec.rb +8 -7
data/spec/config/initializers/rails_config_spec.rb +10 -9
data/spec/controllers/catalog_controller_spec.rb +27 -26
data/spec/controllers/download_controller_spec.rb +50 -49
data/spec/controllers/relation_controller_spec.rb +5 -4
data/spec/controllers/wms_controller_spec.rb +10 -9
data/spec/factories/user.rb +3 -2
data/spec/features/bookmarks_spec.rb +7 -6
data/spec/features/configurable_basemap_spec.rb +12 -11
data/spec/features/data_dictionary_download_spec.rb +11 -10
data/spec/features/download_layer_spec.rb +64 -63
data/spec/features/empty_search_spec.rb +6 -5
data/spec/features/esri_viewer_spec.rb +33 -32
data/spec/features/exports_spec.rb +18 -17
data/spec/features/full_screen_controll_spec.rb +8 -8
data/spec/features/help_text_spec.rb +6 -5
data/spec/features/home_page_spec.rb +30 -29
data/spec/features/iiif_viewer_spec.rb +6 -5
data/spec/features/index_map_spec.rb +17 -16
data/spec/features/layer_inspection_spec.rb +8 -7
data/spec/features/layer_opacity_spec.rb +15 -14
data/spec/features/layer_preview_spec.rb +11 -10
data/spec/features/layer_with_no_references_spec.rb +5 -4
data/spec/features/linkified_attribute_table_spec.rb +8 -7
data/spec/features/metadata_panel_spec.rb +32 -31
data/spec/features/missing_metadata_spec.rb +18 -17
data/spec/features/multiple_downloads_spec.rb +11 -10
data/spec/features/oembed_spec.rb +6 -5
data/spec/features/relations_spec.rb +51 -26
data/spec/features/saved_searches_spec.rb +7 -6
data/spec/features/search_bar_spec.rb +9 -8
data/spec/features/search_results_complex_geometry_spec.rb +12 -11
data/spec/features/search_results_icons_spec.rb +10 -9
data/spec/features/search_results_map_spec.rb +21 -20
data/spec/features/search_results_overlap_ratio_spec.rb +17 -16
data/spec/features/search_spec.rb +19 -18
data/spec/features/show_page_download_spec.rb +15 -14
data/spec/features/show_page_metadata_spec.rb +9 -8
data/spec/features/show_page_sidebar_static_map_spec.rb +21 -0
data/spec/features/sms_spec.rb +12 -11
data/spec/features/split_view.html.erb_spec.rb +56 -55
data/spec/features/suppressed_records_spec.rb +10 -9
data/spec/features/tilejson_spec.rb +9 -8
data/spec/features/tms_spec.rb +6 -5
data/spec/features/web_services_modal_spec.rb +37 -36
data/spec/features/wmts_spec.rb +16 -15
data/spec/features/xyz_spec.rb +6 -5
data/spec/fixtures/solr_documents/actual-papermap1.json +1 -1
data/spec/fixtures/solr_documents/actual-point1.json +1 -1
data/spec/fixtures/solr_documents/actual-polygon1.json +1 -1
data/spec/fixtures/solr_documents/actual-raster1.json +1 -1
data/spec/fixtures/solr_documents/baruch_ancestor1.json +1 -1
data/spec/fixtures/solr_documents/baruch_ancestor2.json +1 -1
data/spec/fixtures/solr_documents/baruch_documentation_download.json +2 -2
data/spec/fixtures/solr_documents/cornell_html_metadata.json +1 -1
data/spec/fixtures/solr_documents/display-note.json +52 -0
data/spec/fixtures/solr_documents/esri-dynamic-layer-all-layers.json +1 -1
data/spec/fixtures/solr_documents/esri-dynamic-layer-single-layer.json +1 -1
data/spec/fixtures/solr_documents/esri-feature-layer.json +1 -1
data/spec/fixtures/solr_documents/esri-image-map-layer.json +1 -1
data/spec/fixtures/solr_documents/esri-tiled_map_layer.json +1 -1
data/spec/fixtures/solr_documents/esri-wms-layer.json +1 -1
data/spec/fixtures/solr_documents/harvard_raster.json +1 -1
data/spec/fixtures/solr_documents/iiif-eastern-hemisphere.json +1 -1
data/spec/fixtures/solr_documents/index-map-polygon-no-downloadurl.json +1 -1
data/spec/fixtures/solr_documents/index-map-polygon.json +1 -1
data/spec/fixtures/solr_documents/index-map-stanford.json +1 -1
data/spec/fixtures/solr_documents/index_map_point.json +1 -1
data/spec/fixtures/solr_documents/princeton-parent.json +1 -1
data/spec/fixtures/solr_documents/public_direct_download.json +1 -1
data/spec/fixtures/solr_documents/public_iiif_princeton.json +1 -1
data/spec/fixtures/solr_documents/restricted-line.json +1 -1
data/spec/fixtures/solr_documents/tilejson.json +2 -2
data/spec/fixtures/solr_documents/umn_metro_result1.json +2 -2
data/spec/fixtures/solr_documents/umn_state_result1.json +1 -1
data/spec/fixtures/solr_documents/umn_state_result2.json +1 -1
data/spec/fixtures/solr_documents/uva_slug_colon.json +1 -1
data/spec/fixtures/solr_documents/wmts-multiple.json +1 -1
data/spec/fixtures/solr_documents/wmts-single-layer.json +6 -6
data/spec/fixtures/solr_documents/xyz.json +3 -3
data/spec/helpers/arcgis_helper_spec.rb +8 -7
data/spec/helpers/carto_helper_spec.rb +6 -5
data/spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb +10 -15
data/spec/helpers/geoblacklight_helper_spec.rb +139 -138
data/spec/lib/geoblacklight/bounding_box_spec.rb +14 -13
data/spec/lib/geoblacklight/document_presenter_spec.rb +26 -25
data/spec/lib/geoblacklight/download/geojson_download_spec.rb +8 -7
data/spec/lib/geoblacklight/download/geotiff_download_spec.rb +8 -7
data/spec/lib/geoblacklight/download/hgl_download_spec.rb +16 -15
data/spec/lib/geoblacklight/download/kmz_download_spec.rb +9 -8
data/spec/lib/geoblacklight/download/shapefile_download_spec.rb +8 -7
data/spec/lib/geoblacklight/download_spec.rb +61 -60
data/spec/lib/geoblacklight/geometry_spec.rb +29 -28
data/spec/lib/geoblacklight/item_viewer_spec.rb +25 -24
data/spec/lib/geoblacklight/metadata/base_spec.rb +44 -43
data/spec/lib/geoblacklight/metadata/html_spec.rb +7 -6
data/spec/lib/geoblacklight/metadata_spec.rb +15 -14
data/spec/lib/geoblacklight/metadata_transformer/base_spec.rb +13 -12
data/spec/lib/geoblacklight/metadata_transformer/fgdc_spec.rb +8 -7
data/spec/lib/geoblacklight/metadata_transformer/iso19139_spec.rb +8 -7
data/spec/lib/geoblacklight/metadata_transformer_spec.rb +15 -14
data/spec/lib/geoblacklight/reference_spec.rb +28 -27
data/spec/lib/geoblacklight/references_spec.rb +89 -76
data/spec/lib/geoblacklight/relation/ancestors_spec.rb +17 -16
data/spec/lib/geoblacklight/relation/descendants_spec.rb +17 -16
data/spec/lib/geoblacklight/relation/relation_response_spec.rb +29 -28
data/spec/lib/geoblacklight/view_helper_override_spec.rb +14 -13
data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb +19 -18
data/spec/lib/geoblacklight/wms_layer_spec.rb +31 -30
data/spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb +31 -31
data/spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb +32 -32
data/spec/models/concerns/geoblacklight/solr_document/carto_spec.rb +16 -15
data/spec/models/concerns/geoblacklight/solr_document/citation_spec.rb +7 -6
data/spec/models/concerns/geoblacklight/solr_document/finder_spec.rb +16 -17
data/spec/models/concerns/geoblacklight/solr_document/inspection_spec.rb +7 -6
data/spec/models/concerns/geoblacklight/solr_document_spec.rb +121 -107
data/spec/models/concerns/geoblacklight/suppressed_records_search_behavior_spec.rb +8 -7
data/spec/presenters/geoblacklight/bbox_item_presenter_spec.rb +10 -10
data/spec/routing/catalog_routing_spec.rb +4 -3
data/spec/spec_helper.rb +34 -33
data/spec/support/backport_test_helpers.rb +6 -5
data/spec/support/features/session_helpers.rb +8 -7
data/spec/support/features.rb +2 -1
data/spec/support/fixtures.rb +2 -1
data/spec/tasks/geoblacklight_spec.rb +10 -9
data/spec/test_app_templates/lib/generators/test_app_generator.rb +16 -15
data/spec/views/catalog/_document_split.html.erb_spec.rb +3 -2
data/spec/views/catalog/_index_split.html.erb_spec.rb +3 -2
data/spec/views/catalog/_results_pagination.html.erb_spec.rb +5 -4
data/spec/views/catalog/_show_downloads.html.erb_spec.rb +11 -10
data/spec/views/catalog/_show_tools.html.erb_spec.rb +13 -12
data/template.rb +9 -8
metadata +29 -212
data/.gitmodules +0 -0
data/.rubocop.yml +0 -111
data/.rubocop_todo.yml +0 -437
data/config/initializers/new_gbl_settings_defaults_3_4.yml +0 -6

data/lib/geoblacklight/metadata/iso19139.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Metadata
     class Iso19139 < Base

data/lib/geoblacklight/metadata.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Metadata
     ##

data/lib/geoblacklight/metadata_transformer/base.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##
@@ -10,7 +11,7 @@ module Geoblacklight
       def initialize(metadata)
         @metadata = metadata
         # Access the Nokogiri::XML Document from the metadata Object
-        fail EmptyMetadataError, 'Failed to retrieve the metadata' if @metadata.blank?
+        fail EmptyMetadataError, "Failed to retrieve the metadata" if @metadata.blank?
       end
       ##
@@ -30,11 +31,11 @@ module Geoblacklight
       # @return [Nokogiri::XML::Document] the Nokogiri XML Document for the cleaned HTML
       def cleaned_metadata
         transformed_doc = Nokogiri::XML(@metadata.to_html)
-        if transformed_doc.xpath('//body').children.empty?
+        if transformed_doc.xpath("//body").children.empty?
           fail TransformError, \
-               'Failed to extract the <body> child elements from the transformed metadata'
+            "Failed to extract the <body> child elements from the transformed metadata"
         end
-        transformed_doc.xpath('//body').children
+        transformed_doc.xpath("//body").children
       rescue => e
         raise TransformError, e.message
       end

data/lib/geoblacklight/metadata_transformer/fgdc.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/metadata_transformer/iso19139.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module MetadataTransformer
     ##

data/lib/geoblacklight/metadata_transformer.rb CHANGED Viewed

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
-require 'geo_combine'
+require "geo_combine"
 module Geoblacklight
   module MetadataTransformer
     ##
     # Exceptions raised for the types of geospatial metadata
     class TypeError < EncodingError; end
     ##
     # Exceptions raised when parsing geospatial metadata in the XML
     class ParseError < EncodingError; end
     ##
     # Exception raised when the geospatial metadata content is empty
     class EmptyMetadataError < ParseError; end
     ##
     # Exceptions raised when transforming the metadata into the HTML
     class TransformError < EncodingError; end
@@ -21,7 +25,7 @@ module Geoblacklight
     # @param [Geoblacklight::Metadata::Base] metadata string or File path to the raw metadata
     # @return [Geoblacklight::MetadataTransformer::BaseTransformer]
     def self.instance(metadata)
-      type = metadata.class.name.split('::').last
+      type = metadata.class.name.split("::").last
       begin
         klass = "Geoblacklight::MetadataTransformer::#{type.capitalize}".constantize
       rescue

data/lib/geoblacklight/reference.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   ##
   # Parses an array of dct_references to create useful reference information
@@ -30,7 +31,7 @@ module Geoblacklight
     # Creates a hash, using its type as key and endpoint as value
     # @return [Hash]
     def to_hash
-      { type => endpoint }
+      {type => endpoint}
     end
     private
@@ -40,7 +41,7 @@ module Geoblacklight
     # Remove any trailing slashes
     # @return [String]
     def uri
-      @reference[0].sub(/(\/)+$/, '') if @reference[0].present?
+      @reference[0].sub(/(\/)+$/, "") if @reference[0].present?
     end
   end
 end

data/lib/geoblacklight/references.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   # References is a geoblacklight-schema dct:references parser
   class References
@@ -52,11 +53,11 @@ module Geoblacklight
     # @return [Hash, nil]
     def downloads_by_format
       case format
-      when 'Shapefile'
+      when "Shapefile"
         vector_download_formats
-      when 'GeoTIFF'
+      when "GeoTIFF"
         geotiff_download_formats
-      when 'ArcGRID'
+      when "ArcGRID"
         arcgrid_download_formats
       end
     end
@@ -93,7 +94,7 @@ module Geoblacklight
     # Download hash for a static file download
     # @return (see #downloads_by_format)
     def file_download
-      { file_download: download.to_hash }
+      {file_download: download.to_hash}
     end
     ##
@@ -113,14 +114,14 @@ module Geoblacklight
     # Download hash for a GeoTiff file with a WMS reference present
     # @return (see #downloads_by_format)
     def geotiff_download_formats
-      { geotiff: wms.to_hash } if wms.present?
+      {geotiff: wms.to_hash} if wms.present?
     end
     ##
     # Download hash for an ArcGRID file with a WMS reference present
     # @return (see #downloads_by_format)
     def arcgrid_download_formats
-      { geotiff: wms.to_hash } if wms.present?
+      {geotiff: wms.to_hash} if wms.present?
     end
     ##
@@ -132,5 +133,9 @@ module Geoblacklight
         super
       end
     end
+    def respond_to_missing?(m, *args, &b)
+      Geoblacklight::Constants::URI.key?(m) || super
+    end
   end
 end

data/lib/geoblacklight/relation/ancestors.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Ancestors
@@ -9,8 +10,8 @@ module Geoblacklight
       end
       def create_search_params
-        { fq: ["{!join from=#{@field} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:#{@search_id}"],
-          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE] }
+        {fq: ["{!join from=#{@field} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:#{@search_id}"],
+         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
       end
       def execute_query
@@ -22,7 +23,7 @@ module Geoblacklight
       def results
         response = execute_query
-        response['response']
+        response["response"]
       end
     end
   end

data/lib/geoblacklight/relation/descendants.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Relation
     class Descendants
@@ -9,8 +10,8 @@ module Geoblacklight
       end
       def create_search_params
-        { fq: "#{@field}:#{@search_id}",
-          fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE] }
+        {fq: "#{@field}:#{@search_id}",
+         fl: [Settings.FIELDS.TITLE, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE]}
       end
       def execute_query
@@ -22,7 +23,7 @@ module Geoblacklight
       def results
         response = execute_query
-        response['response']
+        response["response"]
       end
     end
   end

data/lib/geoblacklight/relation/relation_response.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Relation
     class RelationResponse
@@ -27,9 +28,9 @@ module Geoblacklight
       def query_type(option)
         case option.query_type
-        when 'ancestors'
+        when "ancestors"
           Geoblacklight::Relation::Ancestors
-        when 'descendants'
+        when "descendants"
           Geoblacklight::Relation::Descendants
         else
           fail ArgumentError, "Bad RelationResponse query_type: #{option.query_type}. Only 'ancestors' or 'descendants' is allowed."

data/lib/geoblacklight/routes/downloadable.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Downloadable
@@ -7,8 +8,8 @@ module Geoblacklight
       end
       def call(mapper, _options = {})
-        mapper.get 'file/:id', action: 'file', as: :file
-        mapper.get 'hgl/:id', action: 'hgl', as: :hgl
+        mapper.get "file/:id", action: "file", as: :file
+        mapper.get "hgl/:id", action: "hgl", as: :hgl
       end
     end
   end

data/lib/geoblacklight/routes/exportable.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Exportable
@@ -8,9 +9,9 @@ module Geoblacklight
       def call(mapper, _options = {})
         mapper.member do
-          mapper.get 'web_services'
-          mapper.get 'metadata'
-          mapper.get 'relations' => 'relation#index'
+          mapper.get "web_services"
+          mapper.get "metadata"
+          mapper.get "relations" => "relation#index"
         end
       end
     end

data/lib/geoblacklight/routes/wms.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Routes
     class Wms
@@ -7,7 +8,7 @@ module Geoblacklight
       end
       def call(mapper, _options = {})
-        mapper.post 'handle'
+        mapper.post "handle"
       end
     end
   end

data/lib/geoblacklight/routes.rb CHANGED Viewed

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 module Geoblacklight
   module Routes
-    require 'geoblacklight/routes/exportable'
-    require 'geoblacklight/routes/downloadable'
-    require 'geoblacklight/routes/wms'
+    require "geoblacklight/routes/exportable"
+    require "geoblacklight/routes/downloadable"
+    require "geoblacklight/routes/wms"
   end
 end

data/lib/geoblacklight/version.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
-  VERSION = '4.0.0'
+  VERSION = "4.1.0"
 end

data/lib/geoblacklight/view_helper_override.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   # Override Blacklight helpers to inject behavior
   module ViewHelperOverride
@@ -7,9 +8,9 @@ module Geoblacklight
     end
     def render_search_to_s_bbox(params)
-      return ''.html_safe if params['bbox'].blank?
+      return "".html_safe if params["bbox"].blank?
-      render_search_to_s_element(t('geoblacklight.bbox_label'), render_filter_value(params['bbox']))
+      render_search_to_s_element(t("geoblacklight.bbox_label"), render_filter_value(params["bbox"]))
     end
   end
 end

data/lib/geoblacklight/wms_layer/feature_info_response.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   class FeatureInfoResponse
     def initialize(response)
@@ -15,11 +16,11 @@ module Geoblacklight
     def format
       page = Nokogiri::HTML(@response.body)
-      table_values = { values: [] }
-      page.css('th').each do |th|
+      table_values = {values: []}
+      page.css("th").each do |th|
         table_values[:values].push([th.text])
       end
-      page.css('td').each_with_index do |td, index|
+      page.css("td").each_with_index do |td, index|
         table_values[:values][index].push(td.text) unless index >= table_values[:values].count
       end
       table_values
@@ -27,7 +28,7 @@ module Geoblacklight
     def error?
       @response[:error] ||
-        @response.headers['content-type'].slice(0, 9) == 'text/xml'
+        @response.headers["content-type"].slice(0, 9) == "text/xml"
     end
   end
 end

data/lib/geoblacklight/wms_layer.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 module Geoblacklight
   class WmsLayer
     def initialize(params)
@@ -7,11 +8,11 @@ module Geoblacklight
     end
     def url
-      @params['URL']
+      @params["URL"]
     end
     def search_params
-      @params.except('URL')
+      @params.except("URL")
     end
     def feature_info
@@ -27,7 +28,7 @@ module Geoblacklight
       end
     rescue Faraday::ConnectionFailed, Faraday::TimeoutError => error
       Geoblacklight.logger.error error.inspect
-      { error: error.inspect }
+      {error: error.inspect}
     end
   end
 end

data/lib/geoblacklight.rb CHANGED Viewed

@@ -1,37 +1,38 @@
 # frozen_string_literal: true
-require 'active_support/dependencies'
-require 'geoblacklight/engine'
+require "active_support/dependencies"
+require "geoblacklight/engine"
 module Geoblacklight
-  require 'geoblacklight/bounding_box'
-  require 'geoblacklight/constants'
-  require 'geoblacklight/exceptions'
-  require 'geoblacklight/geometry'
-  require 'geoblacklight/view_helper_override'
-  require 'geoblacklight/item_viewer'
-  require 'geoblacklight/wms_layer'
-  require 'geoblacklight/wms_layer/feature_info_response'
-  require 'geoblacklight/download'
-  require 'geoblacklight/download/geojson_download'
-  require 'geoblacklight/download/geotiff_download'
-  require 'geoblacklight/download/kmz_download'
-  require 'geoblacklight/download/shapefile_download'
-  require 'geoblacklight/download/hgl_download'
-  require 'geoblacklight/metadata'
-  require 'geoblacklight/metadata/base'
-  require 'geoblacklight/metadata/fgdc'
-  require 'geoblacklight/metadata/html'
-  require 'geoblacklight/metadata/iso19139'
-  require 'geoblacklight/metadata_transformer'
-  require 'geoblacklight/metadata_transformer/base'
-  require 'geoblacklight/metadata_transformer/fgdc'
-  require 'geoblacklight/metadata_transformer/iso19139'
-  require 'geoblacklight/reference'
-  require 'geoblacklight/references'
-  require 'geoblacklight/routes'
-  require 'geoblacklight/relation/descendants'
-  require 'geoblacklight/relation/ancestors'
-  require 'geoblacklight/relation/relation_response'
+  require "geoblacklight/bounding_box"
+  require "geoblacklight/constants"
+  require "geoblacklight/exceptions"
+  require "geoblacklight/geometry"
+  require "geoblacklight/view_helper_override"
+  require "geoblacklight/item_viewer"
+  require "geoblacklight/wms_layer"
+  require "geoblacklight/wms_layer/feature_info_response"
+  require "geoblacklight/download"
+  require "geoblacklight/download/geojson_download"
+  require "geoblacklight/download/geotiff_download"
+  require "geoblacklight/download/kmz_download"
+  require "geoblacklight/download/shapefile_download"
+  require "geoblacklight/download/hgl_download"
+  require "geoblacklight/metadata"
+  require "geoblacklight/metadata/base"
+  require "geoblacklight/metadata/fgdc"
+  require "geoblacklight/metadata/html"
+  require "geoblacklight/metadata/iso19139"
+  require "geoblacklight/metadata_transformer"
+  require "geoblacklight/metadata_transformer/base"
+  require "geoblacklight/metadata_transformer/fgdc"
+  require "geoblacklight/metadata_transformer/iso19139"
+  require "geoblacklight/reference"
+  require "geoblacklight/references"
+  require "geoblacklight/routes"
+  require "geoblacklight/relation/descendants"
+  require "geoblacklight/relation/ancestors"
+  require "geoblacklight/relation/relation_response"
   def self.logger
     ::Rails.logger

data/lib/tasks/geoblacklight.rake CHANGED Viewed

@@ -1,39 +1,40 @@
 # frozen_string_literal: true
-require 'rails/generators'
-require 'generators/geoblacklight/install_generator'
+require "rails/generators"
+require "generators/geoblacklight/install_generator"
 namespace :geoblacklight do
-  desc 'Run Solr and GeoBlacklight for interactive development'
+  desc "Run Solr and GeoBlacklight for interactive development"
   task :server, [:rails_server_args] do |_t, args|
-    require 'solr_wrapper'
-    SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
+    require "solr_wrapper"
+    SolrWrapper.wrap(port: "8983") do |solr|
+      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path("../../", File.dirname(__FILE__)), "solr", "conf")) do
         puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
         puts "\n^C to stop"
-        puts ' '
+        puts " "
         begin
-          Rake::Task['geoblacklight:solr:seed'].invoke
+          Rake::Task["geoblacklight:solr:seed"].invoke
           system "bundle exec rails s #{args[:rails_server_args]}"
         rescue Interrupt
-          puts 'Shutting down...'
+          puts "Shutting down..."
         end
       end
     end
   end
-  desc 'Run Solr and GeoBlacklight for interactive development with Webpack enabled'
+  desc "Run Solr and GeoBlacklight for interactive development with Webpack enabled"
   task :webpack do |_t|
-    require 'solr_wrapper'
-    SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path('../../', File.dirname(__FILE__)), 'solr', 'conf')) do
+    require "solr_wrapper"
+    SolrWrapper.wrap(port: "8983") do |solr|
+      solr.with_collection(name: "blacklight-core", dir: File.join(File.expand_path("../../", File.dirname(__FILE__)), "solr", "conf")) do
         puts "\nSolr server running: http://localhost:#{solr.port}/solr/#/blacklight-core"
         puts "\n^C to stop"
-        puts ' '
+        puts " "
         begin
-          Rake::Task['geoblacklight:solr:seed'].invoke
-          system 'foreman start'
+          Rake::Task["geoblacklight:solr:seed"].invoke
+          system "foreman start"
         rescue Interrupt
-          puts 'Shutting down...'
+          puts "Shutting down..."
         end
       end
     end
@@ -42,41 +43,41 @@ namespace :geoblacklight do
   # Local fixtures: bundle exec rake "geoblacklight:index:seed"
   # Remote fixtures: bundle exec rake "geoblacklight:index:seed[:remote]"
   namespace :index do
-    desc 'Index GBL test fixture metadata into Solr'
+    desc "Index GBL test fixture metadata into Solr"
     task :seed, [:remote] => :environment do |t, args|
       docs = []
       if args.remote
-        puts 'Indexing - Remote test fixtures'
-        JSON.load(
-          URI.open("https://api.github.com/repos/geoblacklight/geoblacklight/contents/spec/fixtures/solr_documents")
+        puts "Indexing - Remote test fixtures"
+        JSON.parse(
+          URI.parse("https://api.github.com/repos/geoblacklight/geoblacklight/contents/spec/fixtures/solr_documents").open.read
         ).each do |fixture|
-          if fixture['name'].include?('.json')
-            docs << JSON.load(URI.open(fixture['download_url']))
+          if fixture["name"].include?(".json")
+            docs << JSON.parse(URI.parse(fixture["download_url"]).open.read)
           end
         end
       else
-        puts 'Indexing - Local test fixtures'
-        docs = Dir['spec/fixtures/solr_documents/*.json'].map { |f| JSON.parse File.read(f) }.flatten
+        puts "Indexing - Local test fixtures"
+        docs = Dir["spec/fixtures/solr_documents/*.json"].map { |f| JSON.parse File.read(f) }.flatten
       end
       Blacklight.default_index.connection.add docs
       Blacklight.default_index.connection.commit
     end
-    desc 'Ingests a GeoHydra transformed.json'
-    task :ingest_all => :environment do
-      docs = JSON.parse(File.read(Rails.root.join('tmp', 'transformed.json')))
+    desc "Ingests a GeoHydra transformed.json"
+    task ingest_all: :environment do
+      docs = JSON.parse(File.read(Rails.root.join("tmp", "transformed.json")))
       docs.each do |doc|
         Blacklight.default_index.connection.add doc
         Blacklight.default_index.connection.commit
       end
     end
-    desc 'Ingests a directory of geoblacklight.json files'
+    desc "Ingests a directory of geoblacklight.json files"
     task :ingest, [:directory] => :environment do |_t, args|
-      args.with_defaults(directory: 'data')
-      Dir.glob(File.join(args[:directory], '**', 'geoblacklight.json')).each do |fn|
+      args.with_defaults(directory: "data")
+      Dir.glob(File.join(args[:directory], "**", "geoblacklight.json")).each do |fn|
         puts "Ingesting #{fn}"
         begin
           Blacklight.default_index.connection.add(JSON.parse(File.read(fn)))
@@ -84,47 +85,47 @@ namespace :geoblacklight do
           puts "Failed to ingest #{fn}: #{e.inspect}"
         end
       end
-      puts 'Committing changes to Solr'
+      puts "Committing changes to Solr"
       Blacklight.default_index.connection.commit
     end
   end
   namespace :downloads do
-    desc 'Delete all cached downloads'
+    desc "Delete all cached downloads"
     task delete: :environment do
-      FileUtils.rm_rf Dir.glob(Rails.root.join('tmp', 'cache', 'downloads', '*'))
+      FileUtils.rm_rf Dir.glob(Rails.root.join("tmp", "cache", "downloads", "*"))
     end
-    desc 'Create download directory'
+    desc "Create download directory"
     task mkdir: :environment do
-      FileUtils.mkdir_p(Rails.root.join('tmp', 'cache', 'downloads'), verbose: true)
+      FileUtils.mkdir_p(Rails.root.join("tmp", "cache", "downloads"), verbose: true)
     end
-    desc 'Precaches a download'
+    desc "Precaches a download"
     task :precache, [:doc_id, :download_type, :timeout] => [:environment] do |_t, args|
       unless args[:doc_id] && args[:download_type] && args[:timeout]
-        fail 'Please supply required arguments [document_id, download_type and timeout]'
+        fail "Please supply required arguments [document_id, download_type and timeout]"
       end
       document = Geoblacklight::SolrDocument.find(args[:doc_id])
       fail Blacklight::Exceptions::RecordNotFound if document[:id] != args[:doc_id]
       download = "Geoblacklight::#{args[:download_type].capitalize}Download"
-                 .constantize.new(document, timeout: args[:timeout].to_i)
+        .constantize.new(document, timeout: args[:timeout].to_i)
       download.get
       Rails.logger.info "Successfully downloaded #{download.file_name}"
       Rails.logger.info Geoblacklight::ShapefileDownload.file_path.to_s
     rescue Geoblacklight::Exceptions::ExternalDownloadFailed => error
-      Rails.logger.error error.message + ' ' + error.url
+      Rails.logger.error error.message + " " + error.url
     rescue NameError
       Rails.logger.error "Could not find that download type \"#{args[:download_type]}\""
     end
   end
   namespace :solr do
-    desc 'Put sample data into solr'
-    task :seed => :environment do
-      Rake::Task['geoblacklight:index:seed'].invoke
+    desc "Put sample data into solr"
+    task seed: :environment do
+      Rake::Task["geoblacklight:index:seed"].invoke
     end
   end
-  desc 'Stdout output asset paths'
+  desc "Stdout output asset paths"
   task application_asset_paths: [:environment] do
     puts Rails.application.config.assets.paths
   end

data/schema/geoblacklight-schema-aardvark.json CHANGED Viewed

@@ -24,6 +24,12 @@
         "type": "string"
       }
     },
+    "gbl_displayNote_sm": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
     "dct_creator_sm": {
       "type": "array",
       "items": {