geoblacklight 6.0.0.pre.alpha.1 → 6.0.0.pre.alpha.2

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

@@ -0,0 +1,177 @@
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
+  describe ".build" do
+    subject(:config) { described_class.build }
+
+    it { is_expected.to be_a(Geoblacklight::Configuration) }
+
+    it "reads values from the real Settings (lowercase) constant" do
+      expect(config.institution).to eq(Settings.institution)
+    end
+  end
+
+  describe "#build" do
+    subject(:config) { described_class.new(settings: settings).build }
+
+    describe "reading lowercase keys" do
+      let(:settings) do
+        {
+          institution: "MIT",
+          fields: {title: "my_title_s"},
+          download_formats: {vector: ["GeoJSON"]},
+          leaflet: {selected_color: "#abc123", sidebar: true}
+        }
+      end
+
+      it "resolves top-level lowercase keys" do
+        expect(config.institution).to eq("MIT")
+      end
+
+      it "resolves nested lowercase keys" do
+        expect(config.fields.title).to eq("my_title_s")
+        expect(config.vector_download_formats).to eq(["GeoJSON"])
+        expect(config.leaflet_options.selected_color).to eq("#abc123")
+        expect(config.leaflet_options.sidebar).to be true
+      end
+    end
+
+    describe "reading uppercase keys (backwards compatibility)" do
+      let(:settings) do
+        {
+          INSTITUTION: "Stanford",
+          FIELDS: {TITLE: "dct_title_s"}
+        }
+      end
+
+      before { allow(Geoblacklight::Deprecation).to receive(:warn) }
+
+      it "resolves uppercase keys even though the builder asks case-insensitively" do
+        expect(config.institution).to eq("Stanford")
+        expect(config.fields.title).to eq("dct_title_s")
+      end
+    end
+
+    describe "deprecation warnings" do
+      before { allow(Geoblacklight::Deprecation).to receive(:warn) }
+
+      it "warns when an uppercase key is resolved" do
+        described_class.new(settings: {INSTITUTION: "MIT"}).build
+        expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/INSTITUTION/i))
+      end
+
+      it "warns about nested uppercase keys" do
+        described_class.new(settings: {fields: {TITLE: "dct_title_s"}}).build
+        expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/TITLE/i))
+      end
+
+      it "does not warn when keys are lowercase" do
+        described_class.new(settings: {institution: "MIT", fields: {title: "x"}}).build
+        expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+      end
+
+      it "does not warn when a lowercase key shadows an uppercase one" do
+        described_class.new(settings: {institution: "lower", INSTITUTION: "UPPER"}).build
+        expect(Geoblacklight::Deprecation).not_to have_received(:warn)
+      end
+    end
+
+    describe "when both cases are present" do
+      let(:settings) { {institution: "lower", INSTITUTION: "UPPER"} }
+      it "prefers the lowercase value" do
+        expect(config.institution).to eq("lower")
+      end
+    end
+
+    describe "missing keys" do
+      let(:settings) { {} }
+      it "fall back to the Configuration defaults" do
+        expect(config.institution).to eq("Stanford")
+      end
+    end
+  end
+end
+
+RSpec.describe Geoblacklight::Configuration::CaseInsensitiveSettings do
+  subject(:wrapper) { described_class.new(settings) }
+
+  describe "method access" do
+    let(:settings) { {ARCgis_BASE_URL: "https://example.com"} }
+
+    it "resolves keys case-insensitively" do
+      expect(wrapper.arcgis_base_url).to eq("https://example.com")
+      expect(wrapper.ARCGIS_BASE_URL).to eq("https://example.com")
+      expect(wrapper.Arcgis_Base_Url).to eq("https://example.com")
+    end
+
+    it "returns nil for unknown keys" do
+      expect(wrapper.does_not_exist).to be_nil
+    end
+  end
+
+  describe "[] access" do
+    let(:settings) { {INSTITUTION: "MIT"} }
+
+    it "resolves via bracket access" do
+      expect(wrapper[:institution]).to eq("MIT")
+      expect(wrapper[:INSTITUTION]).to eq("MIT")
+    end
+  end
+
+  describe "nested access" do
+    let(:settings) { {FIELDS: {TITLE: "dct_title_s"}} }
+
+    it "wraps nested hashes so chained access resolves" do
+      expect(wrapper.fields.title).to eq("dct_title_s")
+      expect(wrapper.FIELDS.TITLE).to eq("dct_title_s")
+    end
+  end
+
+  describe "lowercase preference" do
+    let(:settings) { {institution: "lower", INSTITUTION: "UPPER"} }
+
+    it "returns the lowercase value when both forms exist" do
+      expect(wrapper.institution).to eq("lower")
+    end
+  end
+
+  describe "to_h" do
+    let(:settings) { {FOO: "bar"} }
+
+    it "returns the underlying hash" do
+      expect(wrapper.to_h).to eq({FOO: "bar"})
+    end
+  end
+
+  describe "deprecation warnings" do
+    it "warns when an uppercase key is used" do
+      deprecation = double("deprecation")
+      expect(deprecation).to receive(:warn).with(a_string_matching(/INSTITUTION/i))
+      described_class.new({INSTITUTION: "MIT"}, deprecation: deprecation).institution
+    end
+
+    it "warns about nested uppercase keys" do
+      deprecation = double("deprecation")
+      allow(deprecation).to receive(:warn)
+      described_class.new({FIELDS: {TITLE: "x"}}, deprecation: deprecation).fields.title
+      expect(deprecation).to have_received(:warn).with(a_string_matching(/FIELDS/i))
+      expect(deprecation).to have_received(:warn).with(a_string_matching(/TITLE/i))
+    end
+
+    it "does not warn when the resolved key is lowercase" do
+      deprecation = double("deprecation")
+      expect(deprecation).not_to receive(:warn)
+      described_class.new({institution: "MIT"}, deprecation: deprecation).institution
+    end
+
+    it "does not warn when a lowercase key shadows an uppercase one" do
+      deprecation = double("deprecation")
+      expect(deprecation).not_to receive(:warn)
+      described_class.new({institution: "lower", INSTITUTION: "UPPER"}, deprecation: deprecation).institution
+    end
+
+    it "does not warn by default (no deprecation configured)" do
+      expect { described_class.new({INSTITUTION: "MIT"}).institution }.not_to raise_error
+    end
+  end
+end

data/spec/lib/geoblacklight/configuration_spec.rb

@@ -9,5 +9,40 @@ RSpec.describe Geoblacklight::Configuration do
     it "returns a hash of options for leaflet" do
       expect(leaflet_options.layers.index.keys).to eq(%i[DEFAULT UNAVAILABLE SELECTED])
     end
+
+    it "uses LayerConfig instances for index configurations" do
+      expect(leaflet_options.layers.index[:DEFAULT]).to be_a(Geoblacklight::Configuration::LayerConfig)
+      expect(leaflet_options.layers.index[:DEFAULT].weight).to eq(1)
+      expect(leaflet_options.layers.index[:DEFAULT].radius).to eq(4)
+      expect(leaflet_options.layers.index[:DEFAULT].color).to eq("#7FCDBB")
+      expect(leaflet_options.layers.index[:DEFAULT].sr_color_name).to eq("Green")
+    end
+
+    it "serializes layers options correctly with LayerConfig defaults" do
+      layers_hash = leaflet_options.to_h[:layers]
+      expect(layers_hash).to eq(
+        "detect_retina" => true,
+        "index" => {
+          DEFAULT: {
+            color: "#7FCDBB",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Green"
+          },
+          UNAVAILABLE: {
+            color: "#EDF8B1",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Yellow"
+          },
+          SELECTED: {
+            color: "#2C7FB8",
+            weight: 1,
+            radius: 4,
+            sr_color_name: "Blue"
+          }
+        }
+      )
+    end
   end
 end

data/spec/lib/geoblacklight/relation/relation_response_spec.rb

@@ -14,13 +14,13 @@ RSpec.describe Geoblacklight::Relation::RelationResponse do
 
   describe "#method_missing" do
     it "returns a hash of ancestor documents" do
-      expect(relation_resp.SOURCE_ANCESTORS).to include("numFound")
-      expect(relation_resp.SOURCE_ANCESTORS).to include("docs")
+      expect(relation_resp.source_ancestors).to include("numFound")
+      expect(relation_resp.source_ancestors).to include("docs")
     end
 
     it "returns a hash of descendant documents" do
-      expect(relation_resp.SOURCE_DESCENDANTS).to include("numFound")
-      expect(relation_resp.SOURCE_DESCENDANTS).to include("docs")
+      expect(relation_resp.source_descendants).to include("numFound")
+      expect(relation_resp.source_descendants).to include("docs")
     end
 
     it "raises no method error" do

data/spec/spec_helper.rb

@@ -44,6 +44,11 @@ Capybara.register_driver :chrome_headless do |app|
   options.add_argument("--disable-gpu")
   options.add_argument("--no-sandbox")
   options.add_argument("--window-size=1280,1024")
+  # Return from #visit at DOMContentLoaded instead of waiting for the full
+  # window `load` event. GeoBlacklight pages pull basemap tiles and WMS/TMS
+  # layers from external hosts; in CI those requests can hang and prevent
+  # `load` from ever firing, causing Net::ReadTimeout on #visit.
+  options.page_load_strategy = :eager
 
   # Allow longer TCP reads to prevent timeout in the case of loading fixture
   # eee6150b-ce2f-4837-9d17-ce72a0c1c26f, as part of relations_spec.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.alpha.1
+  version: 6.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2026-06-24 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -436,6 +436,8 @@ files:
 - app/components/geoblacklight/display_note_component.rb
 - app/components/geoblacklight/document/citation_component.html.erb
 - app/components/geoblacklight/document/citation_component.rb
+- app/components/geoblacklight/document/relations_container_component.html.erb
+- app/components/geoblacklight/document/relations_container_component.rb
 - app/components/geoblacklight/document/sidebar_component.html.erb
 - app/components/geoblacklight/document/sidebar_component.rb
 - app/components/geoblacklight/document_component.html.erb
@@ -491,7 +493,6 @@ files:
 - app/javascript/geoblacklight/index.js
 - app/javascript/geoblacklight/initializers/metadata_download.js
 - app/javascript/geoblacklight/initializers/popovers.js
-- app/javascript/geoblacklight/initializers/relations.js
 - app/javascript/geoblacklight/initializers/tooltips.js
 - app/javascript/geoblacklight/initializers/truncation.js
 - app/javascript/geoblacklight/leaflet/basemaps.js
@@ -521,7 +522,6 @@ files:
 - app/views/catalog/_document_split.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_metadata.html.erb
-- app/views/catalog/_relations_container.html.erb
 - app/views/catalog/index.html.erb
 - app/views/catalog/metadata.html.erb
 - app/views/catalog/metadata/_content.html.erb
@@ -543,14 +543,19 @@ files:
 - lib/geoblacklight.rb
 - lib/geoblacklight/bounding_box.rb
 - lib/geoblacklight/configuration.rb
+- lib/geoblacklight/configuration/case_insensitive_settings.rb
 - lib/geoblacklight/configuration/default_settings_builder.rb
 - lib/geoblacklight/configuration/display_note_shown_config.rb
 - lib/geoblacklight/configuration/fields_config.rb
+- lib/geoblacklight/configuration/layer_config.rb
 - lib/geoblacklight/configuration/leaflet_config.rb
 - lib/geoblacklight/configuration/leaflet_layers_config.rb
 - lib/geoblacklight/configuration/leaflet_sleep_config.rb
-- lib/geoblacklight/configuration/legacy_settings_builder.rb
+- lib/geoblacklight/configuration/relationship_config.rb
+- lib/geoblacklight/configuration/relationships_config.rb
+- lib/geoblacklight/configuration/settings_builder.rb
 - lib/geoblacklight/constants.rb
+- lib/geoblacklight/deprecation.rb
 - lib/geoblacklight/download.rb
 - lib/geoblacklight/download/csv_download.rb
 - lib/geoblacklight/download/geojson_download.rb
@@ -604,6 +609,7 @@ files:
 - spec/components/geoblacklight/attribute_table_component_spec.rb
 - spec/components/geoblacklight/citation_component_spec.rb
 - spec/components/geoblacklight/display_note_component_spec.rb
+- spec/components/geoblacklight/document/sidebar_component_spec.rb
 - spec/components/geoblacklight/document_component_spec.rb
 - spec/components/geoblacklight/download_links_component_spec.rb
 - spec/components/geoblacklight/header_icons_component_spec.rb
@@ -654,7 +660,6 @@ files:
 - spec/features/search_spec.rb
 - spec/features/show_page_download_spec.rb
 - spec/features/show_page_metadata_spec.rb
-- spec/features/show_page_sidebar_static_map_spec.rb
 - spec/features/sms_spec.rb
 - spec/features/suppressed_records_spec.rb
 - spec/features/tilejson_spec.rb
@@ -741,6 +746,9 @@ files:
 - spec/javascripts/metadata_download_button_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
 - spec/lib/geoblacklight/configuration/default_settings_builder_spec.rb
+- spec/lib/geoblacklight/configuration/layer_config_spec.rb
+- spec/lib/geoblacklight/configuration/leaflet_layers_config_spec.rb
+- spec/lib/geoblacklight/configuration/settings_builder_spec.rb
 - spec/lib/geoblacklight/configuration_spec.rb
 - spec/lib/geoblacklight/download/csv_download_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb

data/app/javascript/geoblacklight/initializers/relations.js

@@ -1,40 +0,0 @@
-const fadeIn = (element, duration) => {
-  element.style.opacity = 0
-  element.style.display = "block"
-
-  let start = null
-  function step(timestamp) {
-    if (!start) start = timestamp
-    const progress = timestamp - start
-    element.style.opacity = Math.min(progress / duration, 1)
-    if (progress < duration) {
-      window.requestAnimationFrame(step)
-    }
-  }
-
-  window.requestAnimationFrame(step)
-}
-
-// Set up the relations widgets by querying the relations endpoint
-export default function initializeRelations() {
-  document.querySelectorAll('[data-relations="true"]').forEach((element) => {
-    const attributes = element.dataset
-    const relationUrl = `${attributes.url}/relations`
-
-    fetch(relationUrl, { headers: { "X-Requested-With": "XMLHttpRequest" } })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error("Network response was not ok")
-        }
-        return response.text()
-      })
-      .then((data) => {
-        const div = document.createElement("div")
-        div.innerHTML = data
-        element.appendChild(div)
-        div.style.display = "none"
-        fadeIn(div, 200)
-      })
-      .catch((error) => console.error("Error:", error))
-  })
-}

data/app/views/catalog/_relations_container.html.erb

@@ -1 +0,0 @@
-<%= content_tag(:div, nil, data: {relations: true, url: solr_document_path(document.id)}) %>

data/lib/geoblacklight/configuration/legacy_settings_builder.rb

@@ -1,94 +0,0 @@
-module Geoblacklight
-  class Configuration
-    # Builds a configuration from legacy (uppercase) settings
-    class LegacySettingsBuilder
-      def self.build
-        new.build
-      end
-
-      def initialize
-        @configuration = Configuration.new
-      end
-
-      def build
-        @configuration.tap do |config|
-          config.arcgis_base_url = Settings.ARCGIS_BASE_URL
-          config.bbox_within_boost = Settings.BBOX_WITHIN_BOOST
-          config.overlap_ratio_boost = Settings.OVERLAP_RATIO_BOOST
-          config.display_notes_shown = Settings.DISPLAY_NOTES_SHOWN
-          config.institution = Settings.INSTITUTION
-          config.help_text = Settings.HELP_TEXT.to_h
-          config.sidebar_static_map = Settings.SIDEBAR_STATIC_MAP
-          config.iiif_drag_drop_link = Settings.IIIF_DRAG_DROP_LINK
-          config.homepage_map_geom = Settings.HOMEPAGE_MAP_GEOM
-          config.vector_download_formats = Settings.DOWNLOAD_FORMATS&.VECTOR
-          config.metadata_shown = Settings.METADATA_SHOWN
-          config.webservices_shown = Settings.WEBSERVICES_SHOWN
-          config.relationships_shown = Settings.RELATIONSHIPS_SHOWN
-          config.download_path = Settings.DOWNLOAD_PATH if Settings.DOWNLOAD_PATH
-          config.gbl_params = Settings.GBL_PARAMS
-          config.wms_params = Settings.WMS_PARAMS.to_h
-          config.timeout_wms = Settings.TIMEOUT_WMS
-
-          build_fields(config)
-          build_leaflet_options(config)
-        end
-      end
-
-      private
-
-      def build_leaflet_options(config)
-        config.leaflet_options.bounds_overlay = Settings.LEAFLET.BOUNDSOVERLAY.to_h
-        config.leaflet_options.selected_color = Settings.LEAFLET.SELECTED_COLOR
-        config.leaflet_options.sleep = Settings.LEAFLET.SLEEP.to_h.transform_keys(&:downcase)
-        config.leaflet_options.sidebar = Settings.LEAFLET.SIDEBAR
-        config.leaflet_options.layers = Settings.LEAFLET.LAYERS.to_h.transform_keys(&:downcase)
-      end
-
-      def build_fields(config)
-        config.fields.access_rights = Settings.FIELDS.ACCESS_RIGHTS
-        config.fields.alternative_title = Settings.FIELDS.ALTERNATIVE_TITLE
-        config.fields.centroid = Settings.FIELDS.CENTROID
-        config.fields.creator = Settings.FIELDS.CREATOR
-        config.fields.date_issued = Settings.FIELDS.DATE_ISSUED
-        config.fields.date_range = Settings.FIELDS.DATE_RANGE
-        config.fields.description = Settings.FIELDS.DESCRIPTION
-        config.fields.display_note = Settings.FIELDS.DISPLAY_NOTE
-        config.fields.format = Settings.FIELDS.FORMAT
-        config.fields.file_size = Settings.FIELDS.FILE_SIZE
-        config.fields.georeferenced = Settings.FIELDS.GEOREFERENCED
-        config.fields.id = Settings.FIELDS.ID
-        config.fields.identifier = Settings.FIELDS.IDENTIFIER
-        config.fields.index_year = Settings.FIELDS.INDEX_YEAR
-        config.fields.is_part_of = Settings.FIELDS.IS_PART_OF
-        config.fields.is_replaced_by = Settings.FIELDS.IS_REPLACED_BY
-        config.fields.theme = Settings.FIELDS.THEME
-        config.fields.keyword = Settings.FIELDS.KEYWORD
-        config.fields.language = Settings.FIELDS.LANGUAGE
-        config.fields.license = Settings.FIELDS.LICENSE
-        config.fields.member_of = Settings.FIELDS.MEMBER_OF
-        config.fields.metadata_version = Settings.FIELDS.METADATA_VERSION
-        config.fields.modified = Settings.FIELDS.MODIFIED
-        config.fields.overlap_field = Settings.FIELDS.OVERLAP_FIELD
-        config.fields.publisher = Settings.FIELDS.PUBLISHER
-        config.fields.provider = Settings.FIELDS.PROVIDER
-        config.fields.references = Settings.FIELDS.REFERENCES
-        config.fields.relation = Settings.FIELDS.RELATION
-        config.fields.replaces = Settings.FIELDS.REPLACES
-        config.fields.resource_class = Settings.FIELDS.RESOURCE_CLASS
-        config.fields.resource_type = Settings.FIELDS.RESOURCE_TYPE
-        config.fields.rights = Settings.FIELDS.RIGHTS
-        config.fields.rights_holder = Settings.FIELDS.RIGHTS_HOLDER
-        config.fields.source = Settings.FIELDS.SOURCE
-        config.fields.spatial_coverage = Settings.FIELDS.SPATIAL_COVERAGE
-        config.fields.geometry = Settings.FIELDS.GEOMETRY
-        config.fields.subject = Settings.FIELDS.SUBJECT
-        config.fields.suppressed = Settings.FIELDS.SUPPRESSED
-        config.fields.temporal_coverage = Settings.FIELDS.TEMPORAL_COVERAGE
-        config.fields.title = Settings.FIELDS.TITLE
-        config.fields.version = Settings.FIELDS.VERSION
-        config.fields.wxs_identifier = Settings.FIELDS.WXS_IDENTIFIER
-      end
-    end
-  end
-end

data/spec/features/show_page_sidebar_static_map_spec.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.feature "Display sidebar static map on catalog#show page" do
-  scenario "Document viewer protocol: IIIF (show)" do
-    visit solr_document_path "princeton-02870w62c"
-    within ".page-sidebar" do
-      expect(page).to have_content "Location"
-      expect(page).to have_css "div#static-map"
-    end
-  end
-
-  scenario "Document viewer protocol: WMS (do not show)" do
-    visit solr_document_path "stanford-cg357zz0321"
-    within ".page-sidebar" do
-      expect(page).to have_no_content "Location"
-      expect(page).to have_no_css "div#static-map"
-    end
-  end
-end