geoblacklight 3.2.0 → 4.0.0.pre.alpha

data/spec/javascripts/geoblacklight_spec.js

@@ -1,5 +1,3 @@
-//= require geoblacklight
-
 describe('GeoBlacklight', function() {
   describe('loads and makes available libraries', function() {
     it('Leaflet is defined', function() {
@@ -9,9 +7,5 @@ describe('GeoBlacklight', function() {
     it('History.js is defined', function() {
       expect(History).toBeDefined();
     });
-
-    it('MetadataDownloadButton is defined', function() {
-      expect(GeoBlacklight.MetadataDownloadButton).toBeDefined();
-    });
   });
 });

data/spec/javascripts/metadata_download_button_spec.js

@@ -1,11 +1,13 @@
-//= require geoblacklight
+const MetadataDownloadButton = require('../../app/assets/javascripts/geoblacklight/modules/metadata_download_button');
 
 describe('MetadataDownloadButton', function() {
   describe('initialize', function() {
-    fixture.set('<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>');
+    beforeEach(() => {
+      document.body.innerHTML = '<button id="foo" data-ref-endpoint="http://testdomain" data-ref-download="#bar">test element</button><a href="http://testdomain" id="bar">another test element</a>';
+    });
 
     it('creates a new instance and sets the download button @href value', function() {
-      var button = new GeoBlacklight.MetadataDownloadButton('#foo');
+      var button = new MetadataDownloadButton('#foo');
       expect(button.$el.attr('id')).toBe('foo');
       expect(button.$download.attr('id')).toBe('bar');
       expect(button.$download.attr('href')).toBe('http://testdomain');

data/spec/javascripts/util_spec.js

@@ -1,11 +1,9 @@
-//= require geoblacklight
-
-'use strict';
+const Util = require('../../app/assets/javascripts/geoblacklight/modules/util');
 
 describe('GeoBlacklight.Util', function() {
   describe('linkify', function() {
     it('returns a linkified string', function() {
-      expect(GeoBlacklight.Util.linkify('http://www.example.com'))
+      expect(Util.linkify('http://www.example.com'))
         .toEqual("<a href='http://www.example.com'>http://www.example.com</a>");
     });
   });

data/spec/lib/geoblacklight/download/geojson_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::GeojsonDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a GeojsonDownload object with specific options' do

data/spec/lib/geoblacklight/download/geotiff_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::GeotiffDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a GeotiffDownload object with specific options' do

data/spec/lib/geoblacklight/download/hgl_download_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Geoblacklight::HglDownload do
   subject(:download) { described_class.new(document, options) }
 
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', layer_id_s: 'cite:harvard-test') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', Settings.FIELDS.WXS_IDENTIFIER => 'cite:harvard-test') }
   let(:options) { 'foo@example.com' }
 
   describe '#initialize' do

data/spec/lib/geoblacklight/download/kmz_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::KmzDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a KmzDownload object with specific options' do
@@ -10,7 +10,7 @@ describe Geoblacklight::KmzDownload do
       options = download.instance_variable_get(:@options)
       expect(options[:content_type]).to eq 'application/vnd.google-earth.kmz'
       expect(options[:request_params][:layers]).to eq 'stanford-test'
-      expect(options[:request_params][:bbox]).to eq '-180, -90, 180, 90'
+      expect(options[:request_params][:bbox]).to eq '-180.0, -90.0, 180.0, 90.0'
     end
     it 'merges custom options' do
       download = described_class.new(document, timeout: 33)

data/spec/lib/geoblacklight/download/shapefile_download_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Geoblacklight::ShapefileDownload do
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', solr_wfs_url: 'http://www.example.com/wfs', layer_id_s: 'stanford-test', solr_geom: 'ENVELOPE(-180, 180, 90, -90)') }
+  let(:document) { SolrDocument.new(Settings.FIELDS.ID => 'test', solr_wfs_url: 'http://www.example.com/wfs', Settings.FIELDS.WXS_IDENTIFIER => 'stanford-test', Settings.FIELDS.SPATIAL_EXTENT => 'ENVELOPE(-180, 180, 90, -90)') }
   let(:download) { described_class.new(document) }
   describe '#initialize' do
     it 'initializes as a ShapefileDownload object with specific options' do

data/spec/lib/geoblacklight/download_spec.rb

@@ -7,7 +7,7 @@ describe Geoblacklight::Download do
   let(:faraday_connection) { instance_double(Faraday::Connection) }
   let(:faraday_response) { instance_double(Faraday::Response) }
   let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:document) { SolrDocument.new(layer_slug_s: 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
+  let(:document) { SolrDocument.new("#{Settings.FIELDS.ID}": 'test', references_field => { 'http://www.opengis.net/def/serviceType/ogc/wms' => 'http://www.example.com/wms' }.to_json) }
   let(:options) { { type: 'shapefile', extension: 'zip', service_type: 'wms', content_type: 'application/zip' } }
 
   describe '#initialize' do

data/spec/lib/geoblacklight/geometry_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Geoblacklight::Geometry do
+  let(:wkt_geom) { 'MULTIPOLYGON(((-180 81.66, -180 -12.93, -168.35 -12.93, -168.35 81.66, -180 81.66)), ((180 81.66, 25 81.66, 25 -12.93, 180 -12.93, 180 81.66)))' }
+  let(:envelope_geom) { 'ENVELOPE(25, -168.35, 81.66, -12.93)' }
+  let(:invalid_geom) { 'INVALID' }
+  let(:non_polygon_geom) { 'ENVELOPE(130, 130, 33, 33)' }
+
+  describe '#geojson' do
+    context 'with standard WKT geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(wkt_geom).geojson).to include('MultiPolygon', 'coordinates', '[[[[-180.0,81.66]')
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns geojson' do
+        expect(described_class.new(envelope_geom).geojson).to include('Polygon', 'coordinates', '[[[25.0,81.66]')
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(invalid_geom).geojson).to include('coordinates', '-180.0,90.0')
+      end
+    end
+
+    context 'with a non-polygon geometry' do
+      before do
+        allow(RGeo::GeoJSON).to receive(:encode).and_raise(RGeo::Error::InvalidGeometry)
+      end
+
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(non_polygon_geom).geojson).to include('coordinates', '-180.0,90.0')
+      end
+    end
+  end
+
+  describe '#bounding_box' do
+    context 'with standard WKT geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(wkt_geom).bounding_box).to eq '-180.0, -12.93, 180.0, 81.66'
+      end
+    end
+
+    context 'with envelope syntax geometry' do
+      it 'returns a bounding_box' do
+        expect(described_class.new(envelope_geom).bounding_box).to eq '-168.35, -12.93, 25.0, 81.66'
+      end
+    end
+
+    context 'with an invalid geometry' do
+      it 'returns a default GeoJSON extent' do
+        expect(described_class.new(invalid_geom).bounding_box).to include('coordinates', '-180.0,90.0')
+      end
+    end
+  end
+end

data/spec/lib/geoblacklight/item_viewer_spec.rb

@@ -26,6 +26,18 @@ describe Geoblacklight::ItemViewer do
         expect(item_viewer.viewer_preference).to eq wms: 'http://www.example.com/wms'
       end
     end
+    describe 'for tms reference' do
+      let(:document_attributes) do
+        {
+          references_field => {
+            'https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification' => 'http://www.example.com/tms'
+          }.to_json
+        }
+      end
+      it 'tms if tms is present' do
+        expect(item_viewer.viewer_preference).to eq tms: 'http://www.example.com/tms'
+      end
+    end
     describe 'for iiif only reference' do
       let(:document_attributes) do
         {

data/spec/lib/geoblacklight/references_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Geoblacklight::References do
   let(:references_field) { Settings.FIELDS.REFERENCES }
-  let(:file_format_field) { Settings.FIELDS.FILE_FORMAT }
+  let(:file_format_field) { Settings.FIELDS.FORMAT }
   let(:typical_ogp_shapefile) do
     described_class.new(
       SolrDocument.new(
@@ -76,7 +76,7 @@ describe Geoblacklight::References do
         file_format_field => 'Raster',
         references_field => {
           'http://schema.org/url' => 'http://arks.princeton.edu/ark:/88435/02870w62c',
-          'http://iiif.io/api/image' => 'http://libimages.princeton.edu/loris2/pudl0076%2Fmap_pownall%2F00000001.jp2/info.json'
+          'http://iiif.io/api/image' => 'https://iiif-cloud.princeton.edu/iiif/2/6c%2F52%2F12%2F6c5212e81bc845f59bb1cdc740a88bad%2Fintermediate_file/info.json'
         }.to_json
       )
     )
@@ -135,7 +135,7 @@ describe Geoblacklight::References do
       let(:settings_klass) { class_double('Settings').as_stubbed_const }
       before do
         allow(settings_klass).to receive(:METADATA_SHOWN).and_return %w[iso19139 mods]
-        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FILE_FORMAT: 'dc_format_s')
+        allow(settings_klass).to receive(:FIELDS).and_return OpenStruct.new(FORMAT: 'dc_format_s')
       end
       it 'is ordered by the configuration' do
         expect(complex_shapefile.shown_metadata_refs.first.type.to_s).to eq 'iso19139'

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 describe Geoblacklight::Relation::Ancestors do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:ancestors) { described_class.new('nyu_2451_34502', repository) }
-  let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
+  let(:ancestors) { described_class.new('nyu_2451_34502', Settings.FIELDS.SOURCE, repository) }
+  let(:empty_ancestors) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding ancestor documents' do
-      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=layer_slug_s}layer_slug_s:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(ancestors.create_search_params).to eq(fq: ["{!join from=#{Settings.FIELDS.SOURCE} to=#{Settings.FIELDS.ID}}#{Settings.FIELDS.ID}:nyu_2451_34502"], fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
     end
   end
 

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 
 describe Geoblacklight::Relation::Descendants do
   let(:repository) { Blacklight::Solr::Repository.new(CatalogController.blacklight_config) }
-  let(:descendants) { described_class.new('nyu_2451_34636', repository) }
-  let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', repository) }
+  let(:descendants) { described_class.new('nyu_2451_34636', Settings.FIELDS.SOURCE, repository) }
+  let(:empty_descendants) { described_class.new('harvard-g7064-s2-1834-k3', Settings.FIELDS.SOURCE, repository) }
 
   describe '#create_search_params' do
     it 'assembles the correct search params for finding descendant documents' do
-      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, 'layer_slug_s', 'layer_geom_type_s'])
+      expect(descendants.create_search_params).to eq(fq: "#{Settings.FIELDS.SOURCE}:nyu_2451_34636", fl: [Settings.FIELDS.TITLE.to_s, Settings.FIELDS.ID, Settings.FIELDS.RESOURCE_TYPE])
     end
   end
 

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

@@ -11,34 +11,49 @@ describe Geoblacklight::Relation::RelationResponse do
     end
   end
 
-  describe '#ancestors' do
+  describe '#method_missing' do
     it 'returns a hash of ancestor documents' do
-      expect(relation_resp.ancestors).to include('numFound')
-      expect(relation_resp.ancestors).to include('docs')
+      expect(relation_resp.SOURCE_ANCESTORS).to include('numFound')
+      expect(relation_resp.SOURCE_ANCESTORS).to include('docs')
     end
-  end
 
-  describe '#descendants' do
     it 'returns a hash of descendant documents' do
-      expect(relation_resp.ancestors).to include('numFound')
-      expect(relation_resp.ancestors).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
+      expect { relation_resp.FAIL }.to raise_error NoMethodError
     end
   end
 
-  describe '#empty?' do
-    it 'returns false if document has ancestors or descendants' do
-      expect(relation_resp.empty?).to be false
+  describe '#respond_to_missing?' do
+    it 'returns true for configured relationships' do
+      Settings.RELATIONSHIPS_SHOWN.each_key do |key|
+        expect(relation_resp).to respond_to(key)
+      end
     end
-    it 'returns true if document has neither ancestors nor descendants' do
-      expect(empty_relation_resp.empty?).to be true
+
+    it 'returns false for non-configured options' do
+      expect(relation_resp).not_to respond_to('fail')
     end
+  end
 
-    context 'with a layer slug containing a colon' do
-      let(:empty_relation_resp) { described_class.new('uva-Norfolk:police_point', repository) }
+  describe '#query_type' do
+    it 'fails for a bad query type request' do
+      Settings.add_source!({
+                             RELATIONSHIPS_SHOWN: {
+                               BAD: {
+                                 field: 'dct_source_sm',
+                                 query_type: 'bad_query_type',
+                                 icon: 'pagelines-brands',
+                                 label: 'geoblacklight.relations.ancestor'
+                               }
+                             }
+                           })
+      Settings.reload!
 
-      it 'returns true if document has neither ancestors nor descendants' do
-        expect(empty_relation_resp.empty?).to be true
-      end
+      expect { relation_resp.BAD }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/models/concerns/geoblacklight/solr_document_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe Geoblacklight::SolrDocument do
   let(:document) { SolrDocument.new(document_attributes) }
-  let(:rights_field) { Settings.FIELDS.RIGHTS }
-  let(:provenance_field) { Settings.FIELDS.PROVENANCE }
+  let(:rights_field) { Settings.FIELDS.ACCESS_RIGHTS }
+  let(:provider_field) { Settings.FIELDS.PROVIDER }
   let(:references_field) { Settings.FIELDS.REFERENCES }
   describe '#available?' do
     let(:document_attributes) { {} }
@@ -80,7 +80,7 @@ describe Geoblacklight::SolrDocument do
   end
   describe '#same_institution?' do
     describe 'within the same institution' do
-      let(:document_attributes) { { provenance_field => 'STANFORD' } }
+      let(:document_attributes) { { provider_field => 'STANFORD' } }
       it 'is true' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_truthy
@@ -91,7 +91,7 @@ describe Geoblacklight::SolrDocument do
       end
     end
     describe 'within a different institution' do
-      let(:document_attributes) { { provenance_field => 'MIT' } }
+      let(:document_attributes) { { provider_field => 'MIT' } }
       it 'is false' do
         allow(Settings).to receive('Institution').and_return('Stanford')
         expect(document.same_institution?).to be_falsey

data/spec/spec_helper.rb

@@ -79,4 +79,6 @@ RSpec.configure do |config|
   end
 
   config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include ViewComponent::TestHelpers, type: :component
+  config.include ViewComponentCapybaraTestHelpers, type: :component
 end

data/spec/support/view_component_capybara_test_helpers.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ViewComponentCapybaraTestHelpers
+  # Work around for https://github.com/teamcapybara/capybara/issues/2466
+  def render_inline_to_capybara_node(component)
+    Capybara::Node::Simple.new(render_inline(component).to_s)
+  end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,2 @@
 gem 'sprockets', '< 4'
+gem 'view_component', '!= 2.26.0'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -14,8 +14,6 @@ class TestAppGenerator < Rails::Generators::Base
 
   def add_gems
     gem 'blacklight'
-    gem 'teaspoon'
-    gem 'teaspoon-jasmine'
     gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
     Bundler.with_clean_env do
       run 'bundle install'
@@ -42,9 +40,4 @@ class TestAppGenerator < Rails::Generators::Base
     FileUtils.mkdir_p 'spec/fixtures/metadata'
     directory 'metadata', 'spec/fixtures/metadata'
   end
-
-  def install_teaspoon
-    # Implicit copy of GeoBlacklight checked-in teaspoon_env.rb
-    copy_file '../teaspoon_env.rb', 'spec/teaspoon_env.rb'
-  end
 end

data/spec/views/catalog/_document_split.html.erb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/spec/views/catalog/_index_split.html.erb_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe 'catalog/_document_split.html.erb' do
+describe 'catalog/_document_split.html.erb', type: :view do
   # TODO: js plugin refactor really needs to be redone so that the views can be testable
 end

data/template.rb

@@ -2,6 +2,7 @@
 gem 'blacklight', '~> 7.0'
 gem 'geoblacklight', '~> 3.0'
 gem 'webpacker' unless Rails.version.to_s.start_with? '6.1.'
+gem 'sprockets', '< 4.0' # Use sprockets less than 4.0, let webpacker users set this up themselves
 
 # Hack for https://github.com/rails/rails/issues/35153
 # Adapted from https://github.com/projectblacklight/blacklight/pull/2065

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0.pre.alpha
 platform: ruby
 authors:
 - Mike Graves
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,14 +39,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.8'
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rgeo-geojson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +286,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bixby
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+- !ruby/object:Gem::Dependency
+  name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -286,47 +314,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: foreman
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
-  name: teaspoon
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 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
@@ -341,8 +369,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -388,6 +416,7 @@ files:
 - app/assets/images/blacklight/maryland.svg
 - app/assets/images/blacklight/massgis.svg
 - app/assets/images/blacklight/metadata.svg
+- app/assets/images/blacklight/michigan-state-university.svg
 - app/assets/images/blacklight/michigan-state.svg
 - app/assets/images/blacklight/michigan.svg
 - app/assets/images/blacklight/minnesota.svg
@@ -401,11 +430,13 @@ files:
 - app/assets/images/blacklight/pagelines-brands.svg
 - app/assets/images/blacklight/paper-map.svg
 - app/assets/images/blacklight/penn-state.svg
+- app/assets/images/blacklight/pennsylvania-state-university.svg
 - app/assets/images/blacklight/point.svg
 - app/assets/images/blacklight/polygon.svg
 - app/assets/images/blacklight/polyline.svg
 - app/assets/images/blacklight/princeton.svg
 - app/assets/images/blacklight/public.svg
+- app/assets/images/blacklight/purdue-university.svg
 - app/assets/images/blacklight/purdue.svg
 - app/assets/images/blacklight/raster.svg
 - app/assets/images/blacklight/restricted.svg
@@ -414,11 +445,21 @@ files:
 - app/assets/images/blacklight/table.svg
 - app/assets/images/blacklight/tags.svg
 - app/assets/images/blacklight/texas.svg
+- app/assets/images/blacklight/the-ohio-state-university.svg
 - app/assets/images/blacklight/tufts.svg
 - app/assets/images/blacklight/ucla.svg
+- app/assets/images/blacklight/university-of-chicago.svg
+- app/assets/images/blacklight/university-of-illinois-urbana-champaign.svg
+- app/assets/images/blacklight/university-of-iowa.svg
+- app/assets/images/blacklight/university-of-maryland.svg
+- app/assets/images/blacklight/university-of-michigan.svg
+- app/assets/images/blacklight/university-of-minnesota.svg
+- app/assets/images/blacklight/university-of-nebraska-lincoln.svg
+- app/assets/images/blacklight/university-of-wisconsin-madison.svg
 - app/assets/images/blacklight/uva.svg
 - app/assets/images/blacklight/web_services.svg
 - app/assets/images/blacklight/wisconsin.svg
+- app/assets/images/favicon.ico
 - app/assets/javascripts/geoblacklight/basemaps.js
 - app/assets/javascripts/geoblacklight/controls.js
 - app/assets/javascripts/geoblacklight/controls/opacity.js
@@ -427,6 +468,7 @@ files:
 - app/assets/javascripts/geoblacklight/downloaders/hgl_downloader.js
 - app/assets/javascripts/geoblacklight/geoblacklight.js
 - app/assets/javascripts/geoblacklight/modules.js
+- app/assets/javascripts/geoblacklight/modules/bookmarks.js
 - app/assets/javascripts/geoblacklight/modules/download.js
 - app/assets/javascripts/geoblacklight/modules/geosearch.js
 - app/assets/javascripts/geoblacklight/modules/help_text.js
@@ -451,6 +493,7 @@ files:
 - app/assets/javascripts/geoblacklight/viewers/index_map.js
 - app/assets/javascripts/geoblacklight/viewers/map.js
 - app/assets/javascripts/geoblacklight/viewers/oembed.js
+- app/assets/javascripts/geoblacklight/viewers/tms.js
 - app/assets/javascripts/geoblacklight/viewers/viewer.js
 - app/assets/javascripts/geoblacklight/viewers/wms.js
 - app/assets/stylesheets/geoblacklight/geoblacklight.scss
@@ -476,12 +519,15 @@ files:
 - app/assets/stylesheets/geoblacklight/modules/sidebar.scss
 - app/assets/stylesheets/geoblacklight/modules/toolbar.scss
 - app/assets/stylesheets/geoblacklight/modules/web_services.scss
+- app/components/geoblacklight/homepage_feature_facet_component.html.erb
+- app/components/geoblacklight/homepage_feature_facet_component.rb
 - app/controllers/download_controller.rb
 - app/controllers/relation_controller.rb
 - app/controllers/wms_controller.rb
 - app/helpers/arcgis_helper.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/carto_helper.rb
+- app/helpers/geoblacklight/geoblacklight_helper_behavior.rb
 - app/helpers/geoblacklight_helper.rb
 - app/models/concerns/geoblacklight/solr_document.rb
 - app/models/concerns/geoblacklight/solr_document/arcgis.rb
@@ -495,15 +541,12 @@ files:
 - app/views/catalog/_carto.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_data_dictionary.html.erb
-- app/views/catalog/_document_action.html.erb
 - app/views/catalog/_document_split.html.erb
 - app/views/catalog/_download_generated_link.html.erb
 - app/views/catalog/_download_link.html.erb
 - app/views/catalog/_downloads_generated.html.erb
 - app/views/catalog/_downloads_primary.html.erb
 - app/views/catalog/_downloads_secondary.html.erb
-- app/views/catalog/_facet_tag_item.html.erb
-- app/views/catalog/_facet_tag_layout.html.erb
 - app/views/catalog/_header_icons.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_icon_facet.html.erb
@@ -528,15 +571,17 @@ files:
 - app/views/catalog/metadata/_missing.html.erb
 - app/views/catalog/web_services.html.erb
 - app/views/download/hgl.html.erb
-- app/views/relation/_ancestors.html.erb
-- app/views/relation/_descendants.html.erb
+- app/views/relation/_relations.html.erb
 - app/views/relation/index.html.erb
 - app/views/relation/index.json.jbuilder
 - app/views/shared/_header_navbar.html.erb
+- babel.config.json
 - bin/coverage.rb
+- config/initializers/new_gbl_settings_defaults_3_4.yml
 - config/initializers/rails_config.rb
 - config/locales/geoblacklight.en.yml
 - geoblacklight.gemspec
+- jest.config.js
 - lib/generators/geoblacklight/assets_generator.rb
 - lib/generators/geoblacklight/install_generator.rb
 - lib/generators/geoblacklight/templates/Procfile
@@ -547,6 +592,7 @@ files:
 - lib/generators/geoblacklight/templates/assets/geoblacklight.js
 - lib/generators/geoblacklight/templates/catalog_controller.rb
 - lib/generators/geoblacklight/templates/package.json
+- lib/generators/geoblacklight/templates/settings.gbl_v1.yml
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/webpacker.yml
 - lib/generators/geoblacklight/webpacker_generator.rb
@@ -562,7 +608,7 @@ files:
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
-- lib/geoblacklight/geoblacklight_helper_behavior.rb
+- lib/geoblacklight/geometry.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
 - lib/geoblacklight/metadata/base.rb
@@ -588,15 +634,9 @@ files:
 - lib/geoblacklight/wms_layer/feature_info_response.rb
 - lib/tasks/geoblacklight.rake
 - package.json
-- schema/format-values.md
-- schema/geoblacklight-schema-deprecated.md
-- schema/geoblacklight-schema.json
-- schema/geoblacklight-schema.md
-- schema/geometry-type-values.md
-- schema/references.md
-- schema/schema-commentary.md
-- schema/subjects.md
-- schema/type-values.md
+- schema/geoblacklight-schema-1.0.json
+- schema/geoblacklight-schema-aardvark.json
+- setupJest.js
 - solr/conf/_rest_managed.json
 - solr/conf/admin-extra.html
 - solr/conf/core.properties
@@ -614,6 +654,8 @@ files:
 - solr/conf/xslt/example_atom.xsl
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
+- spec/components/geoblacklight/homepage_feature_facet_component_spec.rb
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -649,6 +691,7 @@ files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -659,6 +702,7 @@ files:
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json
 - spec/fixtures/solr_documents/actual-raster1.json
+- spec/fixtures/solr_documents/all-relationships.json
 - spec/fixtures/solr_documents/baruch_ancestor1.json
 - spec/fixtures/solr_documents/baruch_ancestor2.json
 - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -676,10 +720,10 @@ files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
-- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
-- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
-- spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/metadata_no_geom.json
+- spec/fixtures/solr_documents/metadata_no_provider.json
 - spec/fixtures/solr_documents/multiple-downloads.json
+- spec/fixtures/solr_documents/no_locn_geometry.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -691,20 +735,20 @@ files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/the-related-record.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
 - spec/fixtures/solr_documents/uva_slug_colon.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
+- spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
-- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -712,7 +756,7 @@ files:
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
-- spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -741,8 +785,8 @@ files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html
@@ -788,11 +832,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files:
+- spec/components/geoblacklight/homepage_feature_facet_component_spec.rb
+- spec/config/initializers/rails_config_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/download_controller_spec.rb
 - spec/controllers/relation_controller_spec.rb
@@ -828,6 +874,7 @@ test_files:
 - spec/features/sms_spec.rb
 - spec/features/split_view.html.erb_spec.rb
 - spec/features/suppressed_records_spec.rb
+- spec/features/tms_spec.rb
 - spec/features/web_services_modal_spec.rb
 - spec/fixtures/fgdc/harvard-g7064-s2-1834-k3.xml
 - spec/fixtures/iso19139/stanford-cg357zz0321.xml
@@ -838,6 +885,7 @@ test_files:
 - spec/fixtures/solr_documents/actual-point1.json
 - spec/fixtures/solr_documents/actual-polygon1.json
 - spec/fixtures/solr_documents/actual-raster1.json
+- spec/fixtures/solr_documents/all-relationships.json
 - spec/fixtures/solr_documents/baruch_ancestor1.json
 - spec/fixtures/solr_documents/baruch_ancestor2.json
 - spec/fixtures/solr_documents/baruch_documentation_download.json
@@ -855,10 +903,10 @@ test_files:
 - spec/fixtures/solr_documents/index-map-polygon.json
 - spec/fixtures/solr_documents/index-map-stanford.json
 - spec/fixtures/solr_documents/index_map_point.json
-- spec/fixtures/solr_documents/metadata_no_dct_provenance_s.json
-- spec/fixtures/solr_documents/metadata_no_layer_geom_type_s.json
-- spec/fixtures/solr_documents/metadata_no_solr_geom.json
+- spec/fixtures/solr_documents/metadata_no_geom.json
+- spec/fixtures/solr_documents/metadata_no_provider.json
 - spec/fixtures/solr_documents/multiple-downloads.json
+- spec/fixtures/solr_documents/no_locn_geometry.json
 - spec/fixtures/solr_documents/no_spatial.json
 - spec/fixtures/solr_documents/oembed.json
 - spec/fixtures/solr_documents/princeton-child1.json
@@ -870,20 +918,20 @@ test_files:
 - spec/fixtures/solr_documents/public_iiif_princeton.json
 - spec/fixtures/solr_documents/public_polygon_mit.json
 - spec/fixtures/solr_documents/restricted-line.json
+- spec/fixtures/solr_documents/the-related-record.json
+- spec/fixtures/solr_documents/tms.json
 - spec/fixtures/solr_documents/umn_metro_result1.json
 - spec/fixtures/solr_documents/umn_state_result1.json
 - spec/fixtures/solr_documents/umn_state_result2.json
 - spec/fixtures/solr_documents/uva_slug_colon.json
 - spec/helpers/arcgis_helper_spec.rb
 - spec/helpers/carto_helper_spec.rb
+- spec/helpers/geoblacklight/geoblacklight_helper_behavior_spec.rb
 - spec/helpers/geoblacklight_helper_spec.rb
-- spec/javascripts/geoblacklight/viewers/esri/tiled_map_layer_spec.js
 - spec/javascripts/geoblacklight_spec.js
 - spec/javascripts/metadata_download_button_spec.js
-- spec/javascripts/spec_helper.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
-- spec/lib/geoblacklight/controller_override_spec.rb
 - spec/lib/geoblacklight/document_presenter_spec.rb
 - spec/lib/geoblacklight/download/geojson_download_spec.rb
 - spec/lib/geoblacklight/download/geotiff_download_spec.rb
@@ -891,7 +939,7 @@ test_files:
 - spec/lib/geoblacklight/download/kmz_download_spec.rb
 - spec/lib/geoblacklight/download/shapefile_download_spec.rb
 - spec/lib/geoblacklight/download_spec.rb
-- spec/lib/geoblacklight/geoblacklight_helper_behavior_spec.rb
+- spec/lib/geoblacklight/geometry_spec.rb
 - spec/lib/geoblacklight/item_viewer_spec.rb
 - spec/lib/geoblacklight/metadata/base_spec.rb
 - spec/lib/geoblacklight/metadata/html_spec.rb
@@ -920,8 +968,8 @@ test_files:
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fixtures.rb
+- spec/support/view_component_capybara_test_helpers.rb
 - spec/tasks/geoblacklight_spec.rb
-- spec/teaspoon_env.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/metadata/fgdc.html