geoblacklight 6.0.0.pre.alpha.7 → 6.0.0.pre.beta.2

data/spec/fixtures/solr_documents/esri-image-map-layer.json

@@ -1,29 +1,29 @@
 {
-  "dct_title_s": "Wabash River Aerial Imagery: Indiana, 1929",
+  "dct_title_s": "USGS Digital Raster Graphic Mosaic: Illinois",
+  "dct_alternative_sm": ["esri-image-map-layer"],
   "dct_description_sm": [
-    "See Related Records below to download individual GeoTIFFs. The images represented here are the raster orthophoto set collected by remote sensing of 25 aerial images  owned by EAS library. Each aerial image was up to 450MB, 400dpi, grayscale. These images can be viewed and performed in the using either ArcGIS Desktop or QGIS (user choice), referencing against a number of known mapsets like the 2005 Indiana Orthophoto setand USGS DRGs. The geographic coordinate system reference of the maps included are applied in GCS_WGS_1984."
+    "ArcGIS Image Map Layer served from a statewide raster mosaic. ",
+    "A statewide raster mosaic of USGS Digital Raster Graphic (DRG) images of the 7.5-minute topographic quadrangles occurring in Illinois. These are unmodified DRG images as distributed by the USGS, except that collar information has been removed for map tiling and the data have been reprojected. The map scale is 1:24,000, and the images were scanned at 250 dpi, giving an approximate raster cell resolution of 2.5 meters."
   ],
   "dct_language_sm": ["eng"],
-  "dct_creator_sm": ["Brock & Weymouth Inc.", "United States Engineer Office"],
-  "schema_provider_s": "Purdue University",
-  "gbl_resourceClass_sm": ["Imagery"],
+  "dct_publisher_sm": ["Illinois State Geological Survey"],
+  "schema_provider_s": "University of Illinois Urbana-Champaign",
+  "gbl_resourceClass_sm": ["Maps"],
+  "gbl_resourceType_sm": ["Topographic maps"],
   "dcat_theme_sm": ["Imagery"],
-  "dcat_keyword_sm": ["Universities", "Campuses"],
-  "dct_temporal_sm": ["1929"],
-  "dct_issued_s": "2015-11-03",
-  "gbl_indexYear_im": [1929],
-  "gbl_dateRange_drsim": ["[1929 TO 1929]"],
-  "dct_spatial_sm": ["Indiana", "West Lafayette, Indiana"],
-  "locn_geometry": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)",
-  "dcat_bbox": "ENVELOPE(-87.5291,-86.2066,40.8009,39.3999)",
-  "dcat_centroid": "40.1004,-86.86785",
-  "pcdm_memberOf_sm": ["dc8c18df-7d64-4ff4-a754-d18d0891187d"],
-  "dct_isPartOf_sm": ["09d-01"],
+  "dcat_keyword_sm": ["GBL Fixture records"],
+  "dct_temporal_sm": ["2015"],
+  "gbl_indexYear_im": [2015],
+  "gbl_dateRange_drsim": ["[2015 TO 2015]"],
+  "dct_spatial_sm": ["Illinois"],
+  "locn_geometry": "ENVELOPE(-91.7077,-87.2490,42.6314,36.8563)",
+  "dcat_bbox": "ENVELOPE(-91.7077,-87.2490,42.6314,36.8563)",
+  "dcat_centroid": "39.7438,-89.4784",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Image Service",
-  "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://mapsweb.lib.purdue.edu/arcgis/rest/services/Purdue/wabashaerial/ImageServer\",\"http://schema.org/url\":\"https://mapsweb.lib.purdue.edu/wabashriver/\"}",
-  "id": "eee6150b-ce2f-4837-9d17-ce72a0c1c26f",
-  "dct_identifier_sm": ["eee6150b-ce2f-4837-9d17-ce72a0c1c26f"],
-  "gbl_mdModified_dt": "2022-05-31T13:44:08Z",
+  "dct_references_s": "{\"urn:x-esri:serviceType:ArcGIS#ImageMapLayer\":\"https://data.isgs.illinois.edu/arcgis/rest/services/Imagery/IL_DRG_24K/ImageServer\",\"http://schema.org/url\":\"https://clearinghouse.isgs.illinois.edu/data/reference/usgs-digital-raster-graphic-drg-mosaic\"}",
+  "id": "32653ed6-8d83-4692-8a06-bf13ffe2c018",
+  "dct_identifier_sm": ["32653ed6-8d83-4692-8a06-bf13ffe2c018"],
+  "gbl_mdModified_dt": "2026-08-31T00:00:00Z",
   "gbl_mdVersion_s": "Aardvark"
 }

data/spec/fixtures/solr_documents/esri-wms-layer.json

@@ -1,35 +1,33 @@
 {
-  "dct_title_s": "Agriculture Census: Indiana, 1997",
+  "dct_title_s": "Bedrock Geology: Illinois, 2005",
   "dct_alternative_sm": ["esri-wms-layer"],
   "dct_description_sm": [
     "Dataset with ArcGIS Dynamic Map Layer, ArcGIS WMS, and direct download. ",
-    "USGS National Atlas metadata states \"This data set portrays the National Agricultural Statistics Service, U.S. Department of Agriculture's 1997 Census data for the United States, presented by county. There are 25 categories of data which include information about farms, crops, livestock, values of products, and farm operator characteristics.\""
+    "This feature dataset shows the distribution and extent of the bedrock geologic units within the State of Illinois, as depicted on the map Bedrock Geology of Illinois (2005) by D. Kolata (compiler), published by the Illinois State Geological Survey. The component feature classes show geologic units (polygons) and faults (lines). The nominal scale of the published hardcopy map is 1:500,000."
   ],
-  "dct_creator_sm": [
-    "(creation): U.S. Geological Survey",
-    "(selection/conversion): Bernardin, Lochmueller and Associates"
-  ],
-  "dct_publisher_sm": ["Bernardin, Lochmueller and Associates"],
-  "schema_provider_s": "Purdue University",
-  "gbl_resourceClass_sm": ["Datasets"],
-  "gbl_resourceType_sm": ["Mixed data"],
-  "dct_subject_sm": ["Agriculture"],
-  "dcat_theme_sm": ["Farming"],
+  "dct_language_sm": ["eng"],
+  "dct_creator_sm": ["Illinois State Geological Survey"],
+  "dct_publisher_sm": ["Illinois State Geological Survey"],
+  "schema_provider_s": "University of Illinois Urbana-Champaign",
+  "gbl_resourceClass_sm": ["Datasets", "Web services"],
+  "gbl_resourceType_sm": ["Polygon data"],
+  "dct_subject_sm": ["Geology"],
+  "dcat_theme_sm": ["Geology"],
   "dcat_keyword_sm": ["GBL Fixture records"],
-  "dct_temporal_sm": ["1972-1997"],
-  "dct_issued_s": "2003-01-28",
-  "gbl_indexYear_im": [1972],
-  "gbl_dateRange_drsim": ["[1972 TO 1997]"],
-  "dct_spatial_sm": ["Indiana"],
-  "locn_geometry": "ENVELOPE(-88.1607,-84.6882,41.7753,37.7554)",
-  "dcat_bbox": "ENVELOPE(-88.1607,-84.6882,41.7753,37.7554)",
-  "dcat_centroid": "39.76,-86.42",
+  "dct_temporal_sm": ["2005"],
+  "dct_issued_s": "2005",
+  "gbl_indexYear_im": [2005],
+  "gbl_dateRange_drsim": ["[2005 TO 2005]"],
+  "dct_spatial_sm": ["Illinois"],
+  "locn_geometry": "ENVELOPE(-91.5826823,-87.38401652,42.49563968,36.95351896)",
+  "dcat_bbox": "ENVELOPE(-91.5826823,-87.38401652,42.49563968,36.95351896)",
+  "dcat_centroid": "39.72457932,-89.48334941",
   "dct_accessRights_s": "Public",
   "dct_format_s": "Shapefile",
   "gbl_wxsIdentifier_s": "0",
-  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://schema.org/downloadUrl:https://maps.indiana.edu/download/Environment/Agriculture_Census.zip\",\"http://schema.org/url\":\"http://indianamap.org/\",\"http://www.isotc211.org/schemas/2005/gmd/\":\"https://opengeometadata.github.io/edu.purdue/f0/82/ac/b1b01e4a089126fd62a23fd9aa/iso19139.xml\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"https://maps.indiana.edu/arcgis/rest/services/Environment/Agriculture_Census/MapServer\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://maps.indiana.edu/arcgis/services/Environment/Agriculture_Census/MapServer/WMSServer\"}",
-  "id": "purdue-urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa",
-  "dct_identifier_sm": ["urn-f082acb1-b01e-4a08-9126-fd62a23fd9aa"],
-  "gbl_mdModified_dt": "2021-06-01T22:14:15Z",
+  "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://clearinghouse.isgs.illinois.edu/sites/clearinghouse.isgs/files/Clearinghouse/data/ISGS/Geology/zips/IL_Bedrock_Geology_500K_2005_Py.zip\",\"http://schema.org/url\":\"https://clearinghouse.isgs.illinois.edu/data/geology/bedrock-geology-2005\",\"http://www.opengis.net/cat/csw/csdgm\":\"https://clearinghouse.isgs.illinois.edu/sites/clearinghouse.isgs/files/clearinghouse/data/metadata/ISGS/IL_Bedrock_Geology_500K_2005_Py.xml\",\"http://www.w3.org/1999/xhtml\":\"https://clearinghouse.isgs.illinois.edu/sites/clearinghouse.isgs/files/clearinghouse/data/metadata/ISGS/IL_Bedrock_Geology_500K_2005_Py.html\",\"urn:x-esri:serviceType:ArcGIS#DynamicMapLayer\":\"https://data.isgs.illinois.edu/arcgis/rest/services/Geology/Bedrock_Geology_500K_2005/MapServer\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://data.isgs.illinois.edu/arcgis/services/Geology/Bedrock_Geology_500K_2005/MapServer/WMSServer\"}",
+  "id": "5f92e192-7e3f-4ec7-a193-8c165288560a",
+  "dct_identifier_sm": ["5f92e192-7e3f-4ec7-a193-8c165288560a"],
+  "gbl_mdModified_dt": "2026-08-29T00:00:00Z",
   "gbl_mdVersion_s": "Aardvark"
 }

data/spec/fixtures/solr_documents/index_map_point.json

@@ -14,9 +14,9 @@
   "gbl_indexYear_im": [1960],
   "gbl_dateRange_drsim": ["[1960 TO 1969]"],
   "dct_spatial_sm": ["New York"],
-  "locn_geometry": "ENVELOPE(-74.783,-74.733,40.2,40.166)",
-  "dcat_bbox": "ENVELOPE(-74.783,-74.733,40.2,40.166)",
-  "dcat_centroid": "40.183,-74.75800000000001",
+  "locn_geometry": "ENVELOPE(-77.354137,-75.866513,43.433722,42.261578)",
+  "dcat_bbox": "ENVELOPE(-77.354137,-75.866513,43.433722,42.261578)",
+  "dcat_centroid": "42.84765,-76.610325",
   "dct_accessRights_s": "Public",
   "dct_format_s": "GeoJSON",
   "dct_references_s": "{\"http://schema.org/downloadUrl\":\"https://raw.githubusercontent.com/OpenIndexMaps/edu.cornell/master/ny-aerial-photos-1960s.geojson\",\"https://openindexmaps.org\":\"https://raw.githubusercontent.com/geoblacklight/geoblacklight/main/spec/fixtures/index_maps/index-map-point.geojson\"}",

data/spec/fixtures/solr_documents/public_polygon.json

@@ -0,0 +1,28 @@
+{
+  "dct_title_s": "1994 General Plan Land Use Designations, Stanislaus County, California, 2014",
+  "dct_alternative_sm": ["public_polygon"],
+  "dct_description_sm": ["Polygon shapefile with WMS and WFS, and no metadata reference"],
+  "dct_creator_sm": ["Stanislaus County (Calif.). Planning Department"],
+  "dct_publisher_sm": ["Stanislaus County (Calif.)"],
+  "schema_provider_s": "University of California Berkeley",
+  "gbl_resourceClass_sm": ["Datasets"],
+  "gbl_resourceType_sm": ["Polygon data", "Vector data"],
+  "dct_subject_sm": ["Land Use", "Land Use Mapping"],
+  "dcat_keyword_sm": ["GBL Fixture records"],
+  "dct_temporal_sm": ["2014"],
+  "dct_issued_s": "2014-10-22",
+  "gbl_indexYear_im": [2014],
+  "gbl_dateRange_drsim": ["[2014 TO 2014]"],
+  "dct_spatial_sm": ["Stanislaus County (Calif.)", "California"],
+  "locn_geometry": "ENVELOPE(-121.495138,-120.387591,38.07778,37.132488)",
+  "dcat_bbox": "ENVELOPE(-121.495138,-120.387591,38.07778,37.132488)",
+  "dcat_centroid": "37.605134,-120.9413645",
+  "dct_accessRights_s": "Public",
+  "dct_format_s": "Shapefile",
+  "gbl_wxsIdentifier_s": "s7pq31",
+  "dct_references_s": "{\"http://www.opengis.net/def/serviceType/ogc/wfs\":\"https://geoservices.lib.berkeley.edu/geoserver/wfs\",\"http://www.opengis.net/def/serviceType/ogc/wms\":\"https://geoservices.lib.berkeley.edu/geoserver/wms\"}",
+  "id": "berkeley-s7pq31",
+  "dct_identifier_sm": ["https://spatial.lib.berkeley.edu/viewpublic/berkeley-s7pq31"],
+  "gbl_mdModified_dt": "2018-02-23T23:34:35Z",
+  "gbl_mdVersion_s": "Aardvark"
+}

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -7,6 +7,28 @@ RSpec.describe GeoblacklightHelper, type: :helper do
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TranslationHelper
 
+  describe "#geoblacklight_viewer_theme" do
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(blacklight_config)
+    end
+
+    context "when dark mode support is disabled" do
+      let(:blacklight_config) { Struct.new(:dark_mode_support).new(false) }
+
+      it "states light explicitly" do
+        expect(helper.geoblacklight_viewer_theme).to eq "light"
+      end
+    end
+
+    context "when dark mode support is enabled" do
+      let(:blacklight_config) { Struct.new(:dark_mode_support).new(true) }
+
+      it "leaves the theme to the Bootstrap synchronizer" do
+        expect(helper.geoblacklight_viewer_theme).to be_nil
+      end
+    end
+  end
+
   describe "#geoblacklight_icon" do
     it "supports in use cases" do
       {
@@ -23,50 +45,106 @@ RSpec.describe GeoblacklightHelper, type: :helper do
     end
   end
 
-  describe "#snippit" do
-    let(:document) { SolrDocument.new(document_attributes) }
+  describe "#markdown_to_html" do
+    it "transforms markdown into HTML" do
+      expect(helper.markdown_to_html("a **short** description")).to eq "<p>a <strong>short</strong> description</p>\n"
+    end
+  end
+
+  describe "#geoblacklight_thumbnail" do
     let(:references_field) { Geoblacklight.configuration.fields.references }
-    context "as a String" do
+    let(:document) { SolrDocument.new(document_attributes) }
+
+    context "with a thumbnail URL" do
       let(:document_attributes) do
         {
-          value: "This is a really long string that should get truncated when it gets rendered" \
-                 "in the index view to give a brief description of the contents of a particular document" \
-                 "indexed into Solr"
+          references_field => {
+            "http://schema.org/thumbnailUrl" => "http://example.com/thumb.jpg"
+          }.to_json
         }
       end
-      it "truncates longer strings to 150 characters" do
-        expect(helper.snippit(document).length).to eq 150
-      end
-      it "truncated string ends with ..." do
-        expect(helper.snippit(document)[-3..]).to eq "..."
+      it "renders an image tag" do
+        html = Capybara.string(helper.geoblacklight_thumbnail(document))
+        expect(html).to have_css "img[src='http://example.com/thumb.jpg']"
       end
     end
-    context "as an Array" do
+
+    context "with only a IIIF image reference" do
       let(:document_attributes) do
         {
-          value: ["This is a really long string that should get truncated when it gets rendered" \
-                  "in the index view to give a brief description of the contents of a particular document" \
-                  "indexed into Solr"]
+          references_field => {
+            "http://iiif.io/api/image" => "https://iiif.example.com/iiif/2/abc%2Fdef/info.json"
+          }.to_json
         }
       end
-      it "truncates longer strings to 150 characters" do
-        expect(helper.snippit(document).length).to eq 150
+      it "renders an image tag using the URL inferred from info.json" do
+        html = Capybara.string(helper.geoblacklight_thumbnail(document))
+        expect(html).to have_css "img[src='https://iiif.example.com/iiif/2/abc%2Fdef/full/400,/0/default.jpg']"
       end
-      it "truncated string ends with ..." do
-        expect(helper.snippit(document)[-3..]).to eq "..."
+    end
+
+    context "without a thumbnail URL" do
+      let(:document_attributes) { {} }
+      it "returns nil" do
+        expect(helper.geoblacklight_thumbnail(document)).to be_nil
       end
     end
-    context "as a multivalued Array" do
+
+    context "when thumbnails are disabled" do
       let(:document_attributes) do
         {
-          value: %w[short description]
+          references_field => {
+            "http://schema.org/thumbnailUrl" => "http://example.com/thumb.jpg"
+          }.to_json
         }
       end
-      it "uses both values" do
-        expect(helper.snippit(document)).to eq "short description"
+      it "returns nil even though a thumbnail URL is present" do
+        allow(Geoblacklight.configuration).to receive_messages(thumbnails_enabled: false)
+        expect(helper.geoblacklight_thumbnail(document)).to be_nil
+      end
+    end
+  end
+
+  describe "#geoblacklight_default_thumbnail" do
+    let(:resource_type_field) { Geoblacklight.configuration.fields.resource_type }
+    let(:resource_class_field) { Geoblacklight.configuration.fields.resource_class }
+    let(:document) { SolrDocument.new(document_attributes) }
+
+    context "with a recognized data-type resource_type" do
+      let(:document_attributes) { {resource_type_field => ["Raster data"]} }
+      it "renders the data-type icon" do
+        html = Capybara.string(helper.geoblacklight_default_thumbnail(document))
+        expect(html).to have_xpath "//*[local-name() = 'svg']"
+      end
+    end
+
+    context "without a matching resource_type icon, but a recognized resource_class" do
+      let(:document_attributes) { {resource_class_field => ["Datasets"]} }
+      it "falls back to the resource_class icon" do
+        html = Capybara.string(helper.geoblacklight_default_thumbnail(document))
+        expect(html).to have_xpath "//*[local-name() = 'svg']"
+      end
+    end
+
+    context "with neither a recognized resource_type nor resource_class" do
+      let(:document_attributes) { {resource_type_field => ["Nonexistent data"], resource_class_field => ["TotallyUnknown"]} }
+      it "uses the 'missing icon' icon as a fallback" do
+        expect(helper.geoblacklight_default_thumbnail(document)).to eq "<span class=\"icon-missing geoblacklight-none\"></span>"
+      end
+    end
+
+    context "without any resource_type or resource_class" do
+      let(:document_attributes) { {} }
+      it "uses the 'missing icon' icon as a fallback" do
+        expect(helper.geoblacklight_default_thumbnail(document)).to eq "<span class=\"icon-missing geoblacklight-none\"></span>"
       end
-      it "does not truncate" do
-        expect(helper.snippit(document)[-3..]).not_to eq "..."
+    end
+
+    context "when thumbnails are disabled" do
+      let(:document_attributes) { {resource_class_field => ["Datasets"]} }
+      it "returns nil even though a matching icon exists" do
+        allow(Geoblacklight.configuration).to receive_messages(thumbnails_enabled: false)
+        expect(helper.geoblacklight_default_thumbnail(document)).to be_nil
       end
     end
   end

data/spec/lib/geoblacklight/bounding_box_spec.rb

@@ -16,6 +16,22 @@ RSpec.describe Geoblacklight::BoundingBox do
       expect(example_box.to_envelope).to eq "ENVELOPE(-160, 120, 70, -80)"
     end
   end
+  describe "#to_geojson" do
+    let(:example_box) { described_class.new(-160, -80, 120, 70) }
+
+    it "creates a GeoJSON polygon around the bounding box" do
+      expect(JSON.parse(example_box.to_geojson)).to eq(
+        "type" => "Polygon",
+        "coordinates" => [[
+          [-160.0, -80.0],
+          [-160.0, 70.0],
+          [120.0, 70.0],
+          [120.0, -80.0],
+          [-160.0, -80.0]
+        ]]
+      )
+    end
+  end
   describe "#from_rectangle" do
     let(:example_box) { described_class.from_rectangle("-160 -80 120 70") }
     it "parses and creates a Geoblacklight::BoundingBox from a Solr lat-lon" do

data/spec/lib/geoblacklight/configuration/relationships_config_spec.rb

@@ -0,0 +1,121 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::RelationshipsConfig do
+  before do
+    allow(Geoblacklight::Deprecation).to receive(:warn)
+    Geoblacklight::Configuration::RelationshipConfig.reset_removed_attribute_warnings!
+  end
+
+  describe "the defaults" do
+    subject(:config) { described_class.new }
+
+    it "carries the twelve relationships, lowercased" do
+      expect(config.each_key.to_a).to eq(
+        %i[
+          member_of_ancestors member_of_descendants
+          part_of_ancestors part_of_descendants
+          relation_ancestors relation_descendants
+          replaces_ancestors replaces_descendants
+          source_ancestors source_descendants
+          version_of_ancestors version_of_descendants
+        ]
+      )
+    end
+
+    it "builds each entry as a RelationshipConfig" do
+      expect(config.map { |_name, entry| entry }).to all(be_a(Geoblacklight::Configuration::RelationshipConfig))
+    end
+
+    it "does not warn" do
+      config
+
+      expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+    end
+  end
+
+  describe "a settings file carried over from GeoBlacklight 5" do
+    # Verbatim from the config/settings.yml that GeoBlacklight 4.0 and later wrote:
+    # uppercase entry names, an uppercase inverse, and an icon on every entry.
+    subject(:config) do
+      described_class.new(
+        MEMBER_OF_ANCESTORS: {
+          field: "pcdm_memberOf_sm",
+          icon: "parent-item",
+          inverse: :MEMBER_OF_DESCENDANTS,
+          label: "geoblacklight.relations.member_of_ancestors",
+          query_type: "ancestors"
+        },
+        MEMBER_OF_DESCENDANTS: {
+          field: "pcdm_memberOf_sm",
+          icon: "child-item",
+          inverse: :MEMBER_OF_ANCESTORS,
+          label: "geoblacklight.relations.member_of_descendants",
+          query_type: "descendants"
+        }
+      )
+    end
+
+    it "builds without raising" do
+      expect { config }.not_to raise_error
+    end
+
+    it "lowercases the entry names" do
+      expect(config.each_key.to_a).to eq(%i[member_of_ancestors member_of_descendants])
+    end
+
+    it "keeps the rest of each entry intact" do
+      expect(config[:member_of_ancestors].field).to eq("pcdm_memberOf_sm")
+      expect(config[:member_of_ancestors].query_type).to eq("ancestors")
+      expect(config[:member_of_ancestors].label).to eq("geoblacklight.relations.member_of_ancestors")
+    end
+
+    it "warns once about the icons rather than once per entry" do
+      config
+
+      expect(Geoblacklight::Deprecation).to have_received(:warn).once.with(/icon/)
+    end
+
+    # RelationsComponent builds each card's "Browse all ..." link from the entry
+    # name, and its regexp only matches the lowercase form. Left uppercase, the
+    # link renders as a titleized key instead of a sentence.
+    it "produces names that RelationsComponent can derive a browse label from" do
+      browse_keys = config.each_key.map { |name| name.to_s.sub(/_(ancestors|descendants)\z/, "") }
+
+      expect(browse_keys).to eq(%w[member_of member_of])
+    end
+  end
+
+  describe "lookup" do
+    subject(:config) { described_class.new(MEMBER_OF_ANCESTORS: {field: "pcdm_memberOf_sm"}) }
+
+    it "finds a normalized name with #[]" do
+      expect(config[:member_of_ancestors].field).to eq("pcdm_memberOf_sm")
+    end
+
+    it "reports a normalized name with #key?" do
+      expect(config.key?(:member_of_ancestors)).to be true
+      expect(config.key?(:MEMBER_OF_ANCESTORS)).to be false
+    end
+
+    it "answers a normalized name as a method" do
+      expect(config.member_of_ancestors.field).to eq("pcdm_memberOf_sm")
+    end
+
+    it "still raises NoMethodError for a name it does not have" do
+      expect { config.no_such_relationship }.to raise_error(NoMethodError)
+    end
+  end
+
+  describe "an unrecognized key" do
+    it "raises, naming the file and the key" do
+      expect { described_class.new(member_of_ancestors: {field: "x", quiery_type: "ancestors"}) }
+        .to raise_error(Geoblacklight::Exceptions::InvalidSettings, /"quiery_type"/)
+    end
+  end
+
+  it "passes an already-built RelationshipConfig through untouched" do
+    entry = Geoblacklight::Configuration::RelationshipConfig.new(field: "pcdm_memberOf_sm")
+
+    expect(described_class.new(member_of_ancestors: entry)[:member_of_ancestors]).to be(entry)
+  end
+end

data/spec/lib/geoblacklight/configuration/settings_attributes_spec.rb

@@ -0,0 +1,113 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::SettingsAttributes do
+  # Exercised through the two real classes that include it rather than a stub, so
+  # these also cover the wiring in each class.
+  shared_examples "a settings-backed value object" do |section:|
+    it "declares the settings.yml section it is built from" do
+      expect(described_class.settings_section).to eq(section)
+    end
+
+    it "resolves an uppercase key to its lowercase attribute" do
+      attribute = described_class.attribute_names.first
+
+      expect(described_class.new(attribute.upcase.to_sym => "a value").public_send(attribute)).to eq("a value")
+    end
+
+    it "assigns recognized attributes without complaint" do
+      attributes = described_class.attribute_names.to_h { |name| [name.to_sym, "a value"] }
+
+      expect { described_class.new(attributes) }.not_to raise_error
+    end
+
+    it "raises for an unrecognized key, naming the section and what is accepted" do
+      expect { described_class.new(no_such_key: "a value") }.to raise_error(
+        Geoblacklight::Exceptions::InvalidSettings,
+        /#{section}.*"no_such_key".*#{Regexp.escape(described_class.attribute_names.join(", "))}/m
+      )
+    end
+
+    # ActiveModel::AttributeAssignment defines a raising attribute_writer_missing.
+    # If SettingsAttributes is ever included before ActiveModel -- for instance by
+    # rewriting it as an ActiveSupport::Concern that includes ActiveModel itself --
+    # ActiveModel's version wins and every example above starts failing for a
+    # reason that has nothing to do with the behavior being tested.
+    it "installs its override ahead of ActiveModel's raising default" do
+      expect(described_class.instance_method(:attribute_writer_missing).owner)
+        .to eq(Geoblacklight::Configuration::SettingsAttributes)
+    end
+  end
+
+  describe Geoblacklight::Configuration::RelationshipConfig do
+    before do
+      allow(Geoblacklight::Deprecation).to receive(:warn)
+      described_class.reset_removed_attribute_warnings!
+    end
+
+    it_behaves_like "a settings-backed value object", section: "RELATIONSHIPS_SHOWN"
+
+    it "treats icon as removed" do
+      expect(described_class.removed_attributes).to eq(%w[icon])
+    end
+
+    it "builds successfully from a verbatim GeoBlacklight 5 entry" do
+      config = described_class.new(
+        field: "pcdm_memberOf_sm",
+        icon: "parent-item",
+        inverse: :member_of_descendants,
+        label: "geoblacklight.relations.member_of_ancestors",
+        query_type: "ancestors"
+      )
+
+      expect(config.field).to eq("pcdm_memberOf_sm")
+      expect(config.query_type).to eq("ancestors")
+    end
+
+    it "does not carry the removed attribute" do
+      expect(described_class.attribute_names).not_to include("icon")
+    end
+
+    it "warns that icon is no longer read" do
+      described_class.new(icon: "parent-item")
+
+      expect(Geoblacklight::Deprecation).to have_received(:warn).with(/icon.*RELATIONSHIPS_SHOWN/)
+    end
+
+    it "warns about an uppercase removed attribute too" do
+      described_class.new({ICON: "parent-item"})
+
+      expect(Geoblacklight::Deprecation).to have_received(:warn).with(/icon/)
+    end
+
+    it "warns only once however many entries set it" do
+      12.times { described_class.new(field: "pcdm_memberOf_sm", icon: "parent-item") }
+
+      expect(Geoblacklight::Deprecation).to have_received(:warn).once
+    end
+
+    it "does not warn when no removed attribute is set" do
+      described_class.new(field: "pcdm_memberOf_sm")
+
+      expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+    end
+  end
+
+  describe Geoblacklight::Configuration::DisplayNoteShownConfig do
+    before { allow(Geoblacklight::Deprecation).to receive(:warn) }
+
+    it_behaves_like "a settings-backed value object", section: "DISPLAY_NOTES_SHOWN"
+
+    it "has no removed attributes" do
+      expect(described_class.removed_attributes).to be_empty
+    end
+
+    # icon means opposite things in the two classes: RelationshipConfig drops it,
+    # while here it is a real attribute that has to survive.
+    it "keeps icon, which is one of its own attributes" do
+      config = described_class.new(icon: "circle-info-solid", note_prefix: "Info: ")
+
+      expect(config.icon).to eq("circle-info-solid")
+      expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+    end
+  end
+end

data/spec/lib/geoblacklight/configuration/settings_builder_spec.rb

@@ -19,8 +19,7 @@ RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
       let(:settings) do
         {
           institution: "MIT",
-          fields: {title: "my_title_s"},
-          leaflet: {selected_color: "#abc123", sidebar: true}
+          fields: {title: "my_title_s"}
         }
       end
 
@@ -30,8 +29,6 @@ RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
 
       it "resolves nested lowercase keys" do
         expect(config.fields.title).to eq("my_title_s")
-        expect(config.leaflet_options.selected_color).to eq("#abc123")
-        expect(config.leaflet_options.sidebar).to be true
       end
     end
 
@@ -194,6 +191,38 @@ RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
         expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/DISPLAY_NOTES_SHOWN/i))
       end
     end
+
+    describe "relationships_shown" do
+      it "preserves the defaults when RELATIONSHIPS_SHOWN is absent" do
+        expect(described_class.new(settings: {}).build.relationships_shown.each_key.to_a)
+          .to include(:member_of_ancestors, :version_of_descendants)
+      end
+
+      # The block every config/settings.yml generated since GeoBlacklight 4.0
+      # contains. Before GeoBlacklight tolerated the icon attribute, this raised
+      # ActiveModel::UnknownAttributeError while the configuration was built --
+      # which in production meant the application would not boot.
+      it "builds from a GeoBlacklight 5 block with icons and uppercase names" do
+        allow(Geoblacklight::Deprecation).to receive(:warn)
+        settings = {
+          RELATIONSHIPS_SHOWN: {
+            MEMBER_OF_ANCESTORS: {
+              field: "pcdm_memberOf_sm",
+              icon: "parent-item",
+              inverse: :MEMBER_OF_DESCENDANTS,
+              label: "geoblacklight.relations.member_of_ancestors",
+              query_type: "ancestors"
+            }
+          }
+        }
+
+        result = described_class.new(settings: settings).build.relationships_shown
+
+        expect(result.each_key.to_a).to eq([:member_of_ancestors])
+        expect(result[:member_of_ancestors].field).to eq("pcdm_memberOf_sm")
+        expect(result[:member_of_ancestors].query_type).to eq("ancestors")
+      end
+    end
   end
 end