geoblacklight 4.0.0 → 4.1.0

data/geoblacklight.gemspec

@@ -1,47 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'geoblacklight/version'
+require "geoblacklight/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'geoblacklight'
-  spec.version       = Geoblacklight::VERSION
-  spec.authors       = ['Mike Graves', 'Darren Hardy', 'Eliot Jordan', 'Jack Reed']
-  spec.email         = ['mgraves@mit.edu', 'drh@stanford.edu', 'eliotj@princeton.edu', 'pjreed@stanford.edu']
-  spec.summary       = 'A discovery platform for geospatial holdings'
-  spec.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 federated metadata sharing communities.'
-  spec.homepage      = 'http://github.com/geoblacklight/geoblacklight'
-  spec.license       = 'Apache 2.0'
+  spec.name = "geoblacklight"
+  spec.version = Geoblacklight::VERSION
+  spec.authors = ["Mike Graves", "Darren Hardy", "Eliot Jordan", "Jack Reed"]
+  spec.email = ["mgraves@mit.edu", "drh@stanford.edu", "eliotj@princeton.edu", "pjreed@stanford.edu"]
+  spec.summary = "A discovery platform for geospatial holdings"
+  spec.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 federated metadata sharing communities."
+  spec.homepage = "http://github.com/geoblacklight/geoblacklight"
+  spec.license = "Apache 2.0"
 
-  spec.files         = `git ls-files -z`.split(%Q{\x0})
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_rubygems_version = '>= 2.5.2'
+  spec.files = `git ls-files -z`.split(%(\x0))
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency 'rails', '>= 6.1', '< 7.1'
-  spec.add_dependency 'blacklight', '~> 7.12'
-  spec.add_dependency 'config'
-  spec.add_dependency 'faraday', '>= 1.0'
-  spec.add_dependency 'coderay'
-  spec.add_dependency 'deprecation'
-  spec.add_dependency 'geo_combine', '~> 0.4'
-  spec.add_dependency 'mime-types'
-  spec.add_dependency 'handlebars_assets'
-  spec.add_dependency 'rgeo-geojson'
+  spec.add_dependency "rails", ">= 6.1", "< 7.1"
+  spec.add_dependency "blacklight", "~> 7.33"
+  spec.add_dependency "config"
+  spec.add_dependency "faraday", ">= 1.0"
+  spec.add_dependency "coderay"
+  spec.add_dependency "deprecation"
+  spec.add_dependency "geo_combine", "~> 0.8"
+  spec.add_dependency "mime-types"
+  spec.add_dependency "handlebars_assets"
+  spec.add_dependency "rgeo-geojson"
 
-  spec.add_development_dependency 'solr_wrapper'
-  spec.add_development_dependency 'rails-controller-testing'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'engine_cart', '~> 2.0'
-  spec.add_development_dependency 'capybara', '>= 2.5.0'
-  spec.add_development_dependency 'webdrivers'
-  spec.add_development_dependency 'factory_bot_rails'
-  spec.add_development_dependency 'database_cleaner', '~> 1.3'
-  spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'foreman'
-  spec.add_development_dependency 'rubocop', '~> 1.25'
-  spec.add_development_dependency 'rubocop-rails', '~> 2.13'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.8'
-  spec.add_development_dependency 'webmock', '~> 3.14'
+  spec.add_development_dependency "solr_wrapper"
+  spec.add_development_dependency "rails-controller-testing"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "engine_cart", "~> 2.0"
+  spec.add_development_dependency "capybara", ">= 2.5.0"
+  spec.add_development_dependency "webdrivers"
+  spec.add_development_dependency "factory_bot_rails"
+  spec.add_development_dependency "database_cleaner", "~> 1.3"
+  spec.add_development_dependency "simplecov", "~> 0.17.1"
+  spec.add_development_dependency "foreman"
+  spec.add_development_dependency "standardrb"
+  spec.add_development_dependency "webmock", "~> 3.14"
 end

data/lib/generators/geoblacklight/assets_generator.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'rails/generators'
+require "rails/generators"
 
 module Geoblacklight
   class AssetsGenerator < Rails::Generators::Base
-    source_root File.expand_path('templates', __dir__)
+    source_root File.expand_path("templates", __dir__)
 
     desc <<-DESCRIPTION
       This generator makes the following changes to your application:
@@ -15,32 +15,32 @@ module Geoblacklight
     DESCRIPTION
 
     def add_javascript
-      copy_file 'assets/geoblacklight.js', 'app/assets/javascripts/geoblacklight.js'
+      copy_file "assets/geoblacklight.js", "app/assets/javascripts/geoblacklight.js"
 
       if Rails.version.to_i >= 6
-        append_to_file 'app/assets/javascripts/application.js',
-                       "\n// Required by GeoBlacklight\n//= require geoblacklight"
+        append_to_file "app/assets/javascripts/application.js",
+          "\n// Required by GeoBlacklight\n//= require geoblacklight"
       end
     end
 
     def remove_stylesheets
-      remove_file 'app/assets/stylesheets/application.css'
-      remove_file 'app/assets/stylesheets/blacklight.scss'
+      remove_file "app/assets/stylesheets/application.css"
+      remove_file "app/assets/stylesheets/blacklight.scss"
     end
 
     def add_stylesheets
-      copy_file 'assets/application.scss', 'app/assets/stylesheets/application.scss'
-      copy_file 'assets/_blacklight.scss', 'app/assets/stylesheets/_blacklight.scss'
-      copy_file 'assets/_customizations.scss', 'app/assets/stylesheets/_customizations.scss'
-      copy_file 'assets/_geoblacklight.scss', 'app/assets/stylesheets/_geoblacklight.scss'
+      copy_file "assets/application.scss", "app/assets/stylesheets/application.scss"
+      copy_file "assets/_blacklight.scss", "app/assets/stylesheets/_blacklight.scss"
+      copy_file "assets/_customizations.scss", "app/assets/stylesheets/_customizations.scss"
+      copy_file "assets/_geoblacklight.scss", "app/assets/stylesheets/_geoblacklight.scss"
     end
 
     def add_initializers
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
+      append_to_file "config/initializers/assets.rb",
+        "\nRails.application.config.assets.precompile += %w( favicon.ico )\n"
 
-      append_to_file 'config/initializers/assets.rb',
-                     "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
+      append_to_file "config/initializers/assets.rb",
+        "\nRails.application.config.assets.paths << Rails.root.join('vendor', 'assets', 'images')\n"
     end
   end
 end

data/lib/generators/geoblacklight/install_generator.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
-require 'rails/generators'
+
+require "rails/generators"
 
 module Geoblacklight
   class Install < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path("../templates", __FILE__)
 
-    desc 'Install Geoblacklight'
+    desc "Install Geoblacklight"
 
     def allow_geoblacklight_params
-      gbl_params = <<-"PARAMS"
+      gbl_params = <<-PARAMS
         before_action :allow_geoblacklight_params
 
         def allow_geoblacklight_params
@@ -17,19 +18,19 @@ module Geoblacklight
         end
       PARAMS
 
-      inject_into_file 'app/controllers/application_controller.rb', gbl_params, before: /^end/
+      inject_into_file "app/controllers/application_controller.rb", gbl_params, before: /^end/
     end
 
     def raise_unpermitted_params
-      inject_into_file 'config/environments/test.rb', "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
+      inject_into_file "config/environments/test.rb", "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
     end
 
     def mount_geoblacklight_engine
-      inject_into_file 'config/routes.rb', "mount Geoblacklight::Engine => 'geoblacklight'\n", before: /^end/
+      inject_into_file "config/routes.rb", "mount Geoblacklight::Engine => 'geoblacklight'\n", before: /^end/
     end
 
     def inject_geoblacklight_routes
-      routes = <<-"ROUTES"
+      routes = <<-ROUTES
         concern :gbl_exportable, Geoblacklight::Routes::Exportable.new
         resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
           concerns :gbl_exportable
@@ -45,71 +46,71 @@ module Geoblacklight
         resources :download, only: [:show]
       ROUTES
 
-      inject_into_file 'config/routes.rb', routes, before: /^end/
+      inject_into_file "config/routes.rb", routes, before: /^end/
     end
 
     def generate_assets
-      generate 'geoblacklight:assets'
+      generate "geoblacklight:assets"
     end
 
     def create_blacklight_catalog
-      remove_file 'app/controllers/catalog_controller.rb'
-      copy_file 'catalog_controller.rb', 'app/controllers/catalog_controller.rb'
+      remove_file "app/controllers/catalog_controller.rb"
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
     end
 
     def rails_config
-      copy_file 'settings.yml', 'config/settings.yml'
+      copy_file "settings.yml", "config/settings.yml"
     end
 
     def solr_config
-      directory '../../../../solr', 'solr'
+      directory "../../../../solr", "solr"
     end
 
     def include_geoblacklight_solrdocument
-      inject_into_file 'app/models/solr_document.rb', after: 'include Blacklight::Solr::Document' do
+      inject_into_file "app/models/solr_document.rb", after: "include Blacklight::Solr::Document" do
         "\n include Geoblacklight::SolrDocument"
       end
     end
 
     def add_unique_key
-      inject_into_file 'app/models/solr_document.rb', after: "# self.unique_key = 'id'" do
+      inject_into_file "app/models/solr_document.rb", after: "# self.unique_key = 'id'" do
         "\n  self.unique_key = Settings.FIELDS.UNIQUE_KEY"
       end
     end
 
     def add_spatial_search_behavior
-      inject_into_file 'app/models/search_builder.rb', after: 'include Blacklight::Solr::SearchBuilderBehavior' do
+      inject_into_file "app/models/search_builder.rb", after: "include Blacklight::Solr::SearchBuilderBehavior" do
         "\n  include Geoblacklight::SuppressedRecordsSearchBehavior"
       end
     end
 
     # Turn off JQuery animations during testing
     def inject_disable_jquery_animations
-      inject_into_file 'app/views/layouts/application.html.erb', before: '</head>' do
+      inject_into_file "app/views/layouts/application.html.erb", before: "</head>" do
         "  <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>\n"
       end
     end
 
     def create_downloads_directory
-      FileUtils.mkdir_p('tmp/cache/downloads') unless File.directory?('tmp/cache/downloads')
+      FileUtils.mkdir_p("tmp/cache/downloads") unless File.directory?("tmp/cache/downloads")
     end
 
     def disable_turbolinks
-      gsub_file('app/assets/javascripts/application.js', %r{\/\/= require turbolinks}, '')
+      gsub_file("app/assets/javascripts/application.js", %r{//= require turbolinks}, "")
     end
 
     def update_application_name
-      gsub_file('config/locales/blacklight.en.yml', 'Blacklight', 'GeoBlacklight')
+      gsub_file("config/locales/blacklight.en.yml", "Blacklight", "GeoBlacklight")
     end
 
     # Ensure that assets/images exists
     def create_image_assets_directory
-      FileUtils.mkdir_p('app/assets/images') unless File.directory?('app/assets/images')
+      FileUtils.mkdir_p("app/assets/images") unless File.directory?("app/assets/images")
     end
 
     def bundle_install
       Bundler.with_clean_env do
-        run 'bundle install'
+        run "bundle install"
       end
     end
   end

data/lib/generators/geoblacklight/templates/catalog_controller.rb

@@ -1,12 +1,9 @@
-# -*- encoding : utf-8 -*-
-require 'blacklight/catalog'
+require "blacklight/catalog"
 
 class CatalogController < ApplicationController
-
   include Blacklight::Catalog
 
   configure_blacklight do |config|
-
     # Ensures that JSON representations of Solr Documents can be retrieved using
     # the path /catalog/:id/raw
     # Please see https://github.com/projectblacklight/blacklight/pull/2006/
@@ -16,8 +13,8 @@ class CatalogController < ApplicationController
     ## @see https://lucene.apache.org/solr/guide/6_6/common-query-parameters.html
     ## @see https://lucene.apache.org/solr/guide/6_6/the-dismax-query-parser.html#TheDisMaxQueryParser-Theq.altParameter
     config.default_solr_params = {
-      start: 0,
-      'q.alt' => '*:*'
+      :start => 0,
+      "q.alt" => "*:*"
     }
 
     ## Default rows returned from Solr
@@ -28,14 +25,14 @@ class CatalogController < ApplicationController
     ## parameters included in the Blacklight-jetty document requestHandler.
     #
     config.default_document_solr_params = {
-     :qt => 'document',
-     :q => "{!raw f=#{Settings.FIELDS.ID} v=$id}"
+      qt: "document",
+      q: "{!raw f=#{Settings.FIELDS.ID} v=$id}"
     }
 
     # GeoBlacklight Defaults
     # * Adds the "map" split view for catalog#index
-    config.view.split(partials: ['index'])
-    config.view.delete_field('list')
+    config.view.split(partials: ["index"])
+    config.view.delete_field("list")
 
     # solr field configuration for search results/index views
     # config.index.show_link = 'title_display'
@@ -47,11 +44,12 @@ class CatalogController < ApplicationController
     # This sets the metadata to display below the map viewer.
     # To move metadata above the map viewer,
     # remove the lines deleting and re-adding the :show partial
-    config.show.display_type_field = 'format'
+    config.show.display_type_field = "format"
     config.show.partials.delete(:show)
-    config.show.partials << 'show_default_viewer_container'
-    config.show.partials << 'show_default_attribute_table'
-    config.show.partials << 'show_default_viewer_information'
+    config.show.partials << "show_default_display_note"
+    config.show.partials << "show_default_viewer_container"
+    config.show.partials << "show_default_attribute_table"
+    config.show.partials << "show_default_viewer_information"
     config.show.partials << :show
 
     ##
@@ -92,23 +90,22 @@ class CatalogController < ApplicationController
     #    :years_25 => { :label => 'within 25 Years', :fq => "pub_date:[#{Time.now.year - 25 } TO *]" }
     # }
 
-
     # FACETS
 
     # DEFAULT FACETS
     # to add additional facets, use the keys defined in the settings.yml file
-    config.add_facet_field Settings.FIELDS.INDEX_YEAR, :label => 'Year', :limit => 10
-    config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, :label => 'Place', :limit => 8
-    config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access', limit: 8, item_component: Geoblacklight::IconFacetItemComponent
-    config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', :limit => 8
-    config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', :limit => 8
-    config.add_facet_field Settings.FIELDS.FORMAT, :label => 'Format', :limit => 8
-    config.add_facet_field Settings.FIELDS.SUBJECT, :label => 'Subject', :limit => 8
-    config.add_facet_field Settings.FIELDS.THEME, :label => 'Theme', :limit => 8
-    config.add_facet_field Settings.FIELDS.CREATOR, :label => 'Creator', :limit => 8
-    config.add_facet_field Settings.FIELDS.PUBLISHER, :label => 'Publisher', :limit => 8
-    config.add_facet_field Settings.FIELDS.PROVIDER, label: 'Provider', limit: 8, item_component: Geoblacklight::IconFacetItemComponent
-    config.add_facet_field Settings.FIELDS.GEOREFERENCED, :label => 'Georeferenced', :limit => 3
+    config.add_facet_field Settings.FIELDS.INDEX_YEAR, label: "Year", limit: 10
+    config.add_facet_field Settings.FIELDS.SPATIAL_COVERAGE, label: "Place", limit: 8
+    config.add_facet_field Settings.FIELDS.ACCESS_RIGHTS, label: "Access", limit: 8, item_component: Geoblacklight::IconFacetItemComponent
+    config.add_facet_field Settings.FIELDS.RESOURCE_CLASS, label: "Resource Class", limit: 8
+    config.add_facet_field Settings.FIELDS.RESOURCE_TYPE, label: "Resource Type", limit: 8
+    config.add_facet_field Settings.FIELDS.FORMAT, label: "Format", limit: 8
+    config.add_facet_field Settings.FIELDS.SUBJECT, label: "Subject", limit: 8
+    config.add_facet_field Settings.FIELDS.THEME, label: "Theme", limit: 8
+    config.add_facet_field Settings.FIELDS.CREATOR, label: "Creator", limit: 8
+    config.add_facet_field Settings.FIELDS.PUBLISHER, label: "Publisher", limit: 8
+    config.add_facet_field Settings.FIELDS.PROVIDER, label: "Provider", limit: 8, item_component: Geoblacklight::IconFacetItemComponent
+    config.add_facet_field Settings.FIELDS.GEOREFERENCED, label: "Georeferenced", limit: 3
 
     # GEOBLACKLIGHT APPLICATION FACETS
 
@@ -117,26 +114,25 @@ class CatalogController < ApplicationController
     # filter_query_builder - Defines the query generated for Solr
     # filter_class         - Defines how to add/remove facet from query
     # label                - Defines the label used in contstraints container
-    config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD, label: 'Bounding Box'
+    config.add_facet_field Settings.FIELDS.GEOMETRY, item_presenter: Geoblacklight::BboxItemPresenter, filter_class: Geoblacklight::BboxFilterField, filter_query_builder: Geoblacklight::BboxFilterQuery, within_boost: Settings.BBOX_WITHIN_BOOST, overlap_boost: Settings.OVERLAP_RATIO_BOOST, overlap_field: Settings.FIELDS.OVERLAP_FIELD, label: "Bounding Box"
 
     # Item Relationship Facets
     # * Not displayed to end user (show: false)
     # * Must be present for relationship "Browse all 4 records" links to work
     # * Label value becomes the search contraint filter name
-    config.add_facet_field Settings.FIELDS.MEMBER_OF, label: 'Member Of', show: false
-    config.add_facet_field Settings.FIELDS.IS_PART_OF, label: 'Is Part Of', show: false
-    config.add_facet_field Settings.FIELDS.RELATION, label: 'Related', show: false
-    config.add_facet_field Settings.FIELDS.REPLACES, label: 'Replaces', show: false
-    config.add_facet_field Settings.FIELDS.IS_REPLACED_BY, label: 'Is Replaced By', show: false
-    config.add_facet_field Settings.FIELDS.SOURCE, label: 'Source', show: false
-    config.add_facet_field Settings.FIELDS.VERSION, label: 'Is Version Of', show: false
+    config.add_facet_field Settings.FIELDS.MEMBER_OF, label: "Member Of", show: false
+    config.add_facet_field Settings.FIELDS.IS_PART_OF, label: "Is Part Of", show: false
+    config.add_facet_field Settings.FIELDS.RELATION, label: "Related", show: false
+    config.add_facet_field Settings.FIELDS.REPLACES, label: "Replaces", show: false
+    config.add_facet_field Settings.FIELDS.IS_REPLACED_BY, label: "Is Replaced By", show: false
+    config.add_facet_field Settings.FIELDS.SOURCE, label: "Source", show: false
+    config.add_facet_field Settings.FIELDS.VERSION, label: "Is Version Of", show: false
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.
     config.add_facet_fields_to_solr_request!
 
-
     # SEARCH RESULTS FIELDS
 
     # solr fields to be displayed in the index (search results) view
@@ -162,28 +158,28 @@ class CatalogController < ApplicationController
     # The following fields all feature string values. If there is a value present in the metadata, they fields will show up on the item show page.
     # The labels and order can be customed. Comment out fields to hide them.
 
-    config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: 'Alternative Title', itemprop: 'alt_title'
-    config.add_show_field Settings.FIELDS.DESCRIPTION, label: 'Description', itemprop: 'description', helper_method: :render_value_as_truncate_abstract
-    config.add_show_field Settings.FIELDS.CREATOR, label: 'Creator', itemprop: 'creator'
-    config.add_show_field Settings.FIELDS.PUBLISHER, label: 'Publisher', itemprop: 'publisher'
-    config.add_show_field Settings.FIELDS.PROVIDER, label: 'Provider', link_to_facet: true
-	config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: 'Resource Class', itemprop: 'class'
-    config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: 'Resource Type', itemprop: 'type'
-    config.add_show_field Settings.FIELDS.SUBJECT, label: 'Subject', itemprop: 'keywords', link_to_facet: true
-    config.add_show_field Settings.FIELDS.THEME, label: 'Theme', itemprop: 'theme'
-    config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: 'Temporal Coverage', itemprop: 'temporal'
-    config.add_show_field Settings.FIELDS.DATE_ISSUED, label: 'Date Issued', itemprop: 'issued'
-    config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: 'Spatial Coverage', itemprop: 'spatial', link_to_facet: true
-    config.add_show_field Settings.FIELDS.RIGHTS, label: 'Rights', itemprop: 'rights'
-    config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: 'Rights Holder', itemprop: 'rights_holder'
-    config.add_show_field Settings.FIELDS.LICENSE, label: 'License', itemprop: 'license'
-    config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: 'Access Rights', itemprop: 'access_rights'
-    config.add_show_field Settings.FIELDS.FORMAT, label: 'Format', itemprop: 'format'
-    config.add_show_field Settings.FIELDS.FILE_SIZE, label: 'File Size', itemprop: 'file_size'
-    config.add_show_field Settings.FIELDS.GEOREFERENCED, label: 'Georeferenced', itemprop: 'georeferenced'
+    config.add_show_field Settings.FIELDS.ALTERNATIVE_TITLE, label: "Alternative Title", itemprop: "alt_title"
+    config.add_show_field Settings.FIELDS.DESCRIPTION, label: "Description", itemprop: "description", helper_method: :render_value_as_truncate_abstract
+    config.add_show_field Settings.FIELDS.CREATOR, label: "Creator", itemprop: "creator"
+    config.add_show_field Settings.FIELDS.PUBLISHER, label: "Publisher", itemprop: "publisher"
+    config.add_show_field Settings.FIELDS.PROVIDER, label: "Provider", link_to_facet: true
+    config.add_show_field Settings.FIELDS.RESOURCE_CLASS, label: "Resource Class", itemprop: "class"
+    config.add_show_field Settings.FIELDS.RESOURCE_TYPE, label: "Resource Type", itemprop: "type"
+    config.add_show_field Settings.FIELDS.SUBJECT, label: "Subject", itemprop: "keywords", link_to_facet: true
+    config.add_show_field Settings.FIELDS.THEME, label: "Theme", itemprop: "theme"
+    config.add_show_field Settings.FIELDS.TEMPORAL_COVERAGE, label: "Temporal Coverage", itemprop: "temporal"
+    config.add_show_field Settings.FIELDS.DATE_ISSUED, label: "Date Issued", itemprop: "issued"
+    config.add_show_field Settings.FIELDS.SPATIAL_COVERAGE, label: "Spatial Coverage", itemprop: "spatial", link_to_facet: true
+    config.add_show_field Settings.FIELDS.RIGHTS, label: "Rights", itemprop: "rights"
+    config.add_show_field Settings.FIELDS.RIGHTS_HOLDER, label: "Rights Holder", itemprop: "rights_holder"
+    config.add_show_field Settings.FIELDS.LICENSE, label: "License", itemprop: "license"
+    config.add_show_field Settings.FIELDS.ACCESS_RIGHTS, label: "Access Rights", itemprop: "access_rights"
+    config.add_show_field Settings.FIELDS.FORMAT, label: "Format", itemprop: "format"
+    config.add_show_field Settings.FIELDS.FILE_SIZE, label: "File Size", itemprop: "file_size"
+    config.add_show_field Settings.FIELDS.GEOREFERENCED, label: "Georeferenced", itemprop: "georeferenced"
     config.add_show_field(
       Settings.FIELDS.REFERENCES,
-      label: 'More details at',
+      label: "More details at",
       accessor: [:external_url],
       if: proc { |_, _, doc| doc.external_url },
       helper_method: :render_references_url
@@ -217,7 +213,6 @@ class CatalogController < ApplicationController
     # config.add_show_field Settings.FIELDS.METADATA_VERSION, label: 'Metadata Version', itemprop: 'metadata_version'
     # config.add_show_field Settings.FIELDS.SUPPRESSED, label: 'Suppressed', itemprop: 'suppresed'
 
-
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
     #
@@ -236,7 +231,7 @@ class CatalogController < ApplicationController
     # solr request handler? The one set in config[:default_solr_parameters][:qt],
     # since we aren't specifying it otherwise.
 
-    config.add_search_field 'all_fields', :label => 'All Fields'
+    config.add_search_field "all_fields", label: "All Fields"
     # config.add_search_field 'dct_title_ti', :label => 'Title'
     # config.add_search_field 'dct_description_ti', :label => 'Description'
 
@@ -290,33 +285,33 @@ class CatalogController < ApplicationController
     # label in pulldown is followed by the name of the SOLR field to sort by and
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
-    config.add_sort_field 'score desc, dct_title_sort asc', :label => 'Relevance'
-    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} desc, dct_title_sort asc", :label => 'Year (Newest first)'
-    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} asc, dct_title_sort asc", :label => 'Year (Oldest first)'
-    config.add_sort_field 'dct_title_sort asc', :label => 'Title (A-Z)'
-    config.add_sort_field 'dct_title_sort desc', :label => 'Title (Z-A)'
+    config.add_sort_field "score desc, dct_title_sort asc", label: "Relevance"
+    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} desc, dct_title_sort asc", label: "Year (Newest first)"
+    config.add_sort_field "#{Settings.FIELDS.INDEX_YEAR} asc, dct_title_sort asc", label: "Year (Oldest first)"
+    config.add_sort_field "dct_title_sort asc", label: "Title (A-Z)"
+    config.add_sort_field "dct_title_sort desc", label: "Title (Z-A)"
 
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
     config.spell_max = 5
 
     # Nav actions from Blacklight
-    config.add_nav_action(:bookmark, partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?)
-    config.add_nav_action(:search_history, partial: 'blacklight/nav/search_history')
+    config.add_nav_action(:bookmark, partial: "blacklight/nav/bookmark", if: :render_bookmarks_control?)
+    config.add_nav_action(:search_history, partial: "blacklight/nav/search_history")
 
     # Tools from Blacklight
     config.add_results_collection_tool(:sort_widget)
     config.add_results_collection_tool(:per_page_widget)
-    config.add_show_tools_partial(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
+    config.add_show_tools_partial(:bookmark, partial: "bookmark_control", if: :render_bookmarks_control?)
     config.add_show_tools_partial(:citation)
     config.add_show_tools_partial(:email, callback: :email_action, validator: :validate_email_params)
     config.add_show_tools_partial(:sms, if: :render_sms_action?, callback: :sms_action, validator: :validate_sms_params)
 
     # Custom tools for GeoBlacklight
     config.add_show_tools_partial :metadata, if: proc { |_context, _config, options| options[:document] && (Settings.METADATA_SHOWN & options[:document].references.refs.map(&:type).map(&:to_s)).any? }
-    config.add_show_tools_partial :carto, partial: 'carto', if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? }
-    config.add_show_tools_partial :arcgis, partial: 'arcgis', if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? }
-    config.add_show_tools_partial :data_dictionary, partial: 'data_dictionary', if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present? }
+    config.add_show_tools_partial :carto, partial: "carto", if: proc { |_context, _config, options| options[:document] && options[:document].carto_reference.present? }
+    config.add_show_tools_partial :arcgis, partial: "arcgis", if: proc { |_context, _config, options| options[:document] && options[:document].arcgis_urls.present? }
+    config.add_show_tools_partial :data_dictionary, partial: "data_dictionary", if: proc { |_context, _config, options| options[:document] && options[:document].data_dictionary_download.present? }
 
     # Configure basemap provider for GeoBlacklight maps (uses https only basemap
     # providers with open licenses)
@@ -331,11 +326,11 @@ class CatalogController < ApplicationController
     # 'openstreetmapHot'
     # 'openstreetmapStandard'
 
-    config.basemap_provider = 'positron'
+    config.basemap_provider = "positron"
 
     # Configuration for autocomplete suggestor
     config.autocomplete_enabled = true
-    config.autocomplete_path = 'suggest'
+    config.autocomplete_path = "suggest"
   end
 
   def web_services