geoblacklight 6.0.0.pre.beta.1 → 6.0.0.pre.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882883c1ce07c52e32fca43a194ab1d9665e1738c192cc7503aeef299413494a
-  data.tar.gz: a256e2d5e9b40ccf874cecaca59667fc3271498e23704615988e17560ec2540a
+  metadata.gz: 321f6ba33268ae5d69c4ab0030a91515ac2e5f84805fb4b6d11044692d1a9f15
+  data.tar.gz: 4c95b22d126e274ba26fd6402dbe1174c2a4f865e94ef85c6d35451b72683c27
 SHA512:
-  metadata.gz: 7e7464c82018a49901805735257079c12544f947a346392f9547148eaa322b7b973bac198642049aba13b5fe0f367e88702045cc7c8cc2c41d929a0553ee364d
-  data.tar.gz: a7e221097f39e5e0a1cf2ce68d7bd6b6a938930ed4f4e98702c26841019d9587d94b6b4ed23766a9bad3beb17bfc18b92120bdc2afa7b931768de33e7316eb2d
+  metadata.gz: 4b1303681dee3d6ed7c82f00f30d16ee0e12e4f0b8430fd26f0be02416f060ed538976ada2f6b86595ceeec2ce99853f2e812df65347c5e5cfd5994bc43fb459
+  data.tar.gz: b1e70fddc4c7f4d5b423b6e5dee103171386b38668ad0aca54bf1718eeec88e17a2e37ae2319854ffc26d41ca069b0693d0f05459560f6e1a4010c0fc4f5b440

data/.github/workflows/ruby.yml

@@ -51,9 +51,19 @@ jobs:
     strategy:
       matrix:
         ruby_version: ["3.3", "3.4", "4.0"]
-        rails_version: ["8.1.1"]
+        rails_version: ["8.1.4"]
+        auth: ["devise"]
+        include:
+          - ruby_version: "4.0"
+            rails_version: "8.1.4"
+            auth: "rails"
+            blacklight_install_options: "--authentication --skip-solr"
+          - ruby_version: "4.0"
+            rails_version: "8.1.4"
+            auth: "no"
+            blacklight_install_options: "--skip-solr"
 
-    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }}
+    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / ${{ matrix.auth }} auth
     steps:
       - uses: actions/checkout@v7
       - name: Set up Ruby
@@ -71,9 +81,10 @@ jobs:
           BUNDLE_FORCE_RUBY_PLATFORM: true
           RAILS_VERSION: ${{ matrix.rails_version }}
           SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
+          BLACKLIGHT_INSTALL_OPTIONS: ${{ matrix.blacklight_install_options }}
       - name: Upload coverage artifacts
         if: always()
         uses: actions/upload-artifact@v7
         with:
-          name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"
+          name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}-${{ matrix.auth }}-auth"
           path: coverage/

data/app/components/geoblacklight/iiif_drag_drop_component.html.erb

@@ -1,3 +1,3 @@
 <%= link_to @href_link, data: {manifest: @manifest}, class: 'float-end' do %>
-  <%= helpers.geoblacklight_icon('iiif-drag-drop', classes: 'svg_tooltip iiif-icon') %>
+  <%= helpers.geoblacklight_icon('iiif-drag-drop', classes: 'iiif-icon') %>
 <% end %>

data/app/components/geoblacklight/login_link_component.html.erb

@@ -1,3 +1,3 @@
 <%= link_to t('geoblacklight.tools.login_to_view'),
-            new_user_session_path(referrer: request.original_url),
+            helpers.blacklight_login_path,
             class: ['btn', 'login-btn', 'd-block'] %>

data/app/components/geoblacklight/login_link_component.rb

@@ -10,8 +10,24 @@ module Geoblacklight
       super()
     end
 
+    def before_render
+      store_return_location if render?
+    end
+
     def render?
-      document.restricted? && document.same_institution? && !helpers.user_signed_in?
+      document.restricted? &&
+        document.same_institution? &&
+        helpers.blacklight_login_path.present? &&
+        !helpers.current_user_signed_in?
+    end
+
+    private
+
+    # Bring the user back to this record once they've signed in, for either
+    # Devise or Rails auth.
+    def store_return_location
+      controller.store_location_for(:user, request.original_url) if controller.respond_to?(:store_location_for)
+      controller.send(:store_location_for_rails_authentication)
     end
   end
 end

data/app/controllers/relations_controller.rb

@@ -5,6 +5,8 @@ class RelationsController < ApplicationController
 
   copy_blacklight_config_from(CatalogController)
 
+  allow_unauthenticated_access raise: false if respond_to?(:allow_unauthenticated_access)
+
   def index
     @relations = Geoblacklight::Relations::RelationResponse.new(params[:id], repository)
     render layout: !(request.xhr? || request.headers["Turbo-Frame"].present?)

data/app/controllers/viewer_record_controller.rb

@@ -6,6 +6,8 @@ class ViewerRecordController < ApplicationController
 
   copy_blacklight_config_from(CatalogController)
 
+  allow_unauthenticated_access raise: false if respond_to?(:allow_unauthenticated_access)
+
   rescue_from Blacklight::Exceptions::RecordNotFound do
     head :not_found
   end

data/app/helpers/geoblacklight_helper.rb

@@ -24,7 +24,11 @@ module GeoblacklightHelper
   end
 
   def document_available?(document)
-    document.public? || (document.same_institution? && user_signed_in?)
+    document.public? || (document.same_institution? && current_user_signed_in?)
+  end
+
+  def current_user_signed_in?
+    controller.respond_to?(:current_user) && current_user.present?
   end
 
   # If you turn off dark mode support, Geoblacklight will display in light mode,

data/app/javascript/geoblacklight/core.js

@@ -1,5 +1,4 @@
 // Initializers
-import initializeTooltips from "geoblacklight/initializers/tooltips"
 import initializeTruncation from "geoblacklight/initializers/truncation"
 import initializeFieldTruncation from "geoblacklight/initializers/field_truncation"
 import initializeMetadataDownload from "geoblacklight/initializers/metadata_download"
@@ -41,7 +40,6 @@ Geoblacklight.listeners().forEach((listener) =>
 )
 
 // Register our initializers
-Geoblacklight.onLoad(initializeTooltips)
 Geoblacklight.onLoad(initializeTruncation)
 Geoblacklight.onLoad(initializeFieldTruncation)
 Geoblacklight.onLoad(initializeMetadataDownload)

data/config/importmap.rb

@@ -2,13 +2,13 @@
 
 # OGM viewer components: the previewer, the map of where a set of records is, and the map of where
 # one of them is
-pin "ogm-viewer", to: "https://unpkg.com/ogm-viewer@1.2.0/dist/components/ogm-viewer.js"
-pin "ogm-overview", to: "https://unpkg.com/ogm-viewer@1.2.0/dist/components/ogm-overview.js"
-pin "ogm-locator", to: "https://unpkg.com/ogm-viewer@1.2.0/dist/components/ogm-locator.js"
+pin "ogm-viewer", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-viewer.js"
+pin "ogm-overview", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-overview.js"
+pin "ogm-locator", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/ogm-locator.js"
 
 # OGM viewer library, used for constructing the location previewers handed to the results map.
 # Not preloaded because only the pages with that map want it; loaded dynamically there.
-pin "ogm-viewer/lib", to: "https://unpkg.com/ogm-viewer@1.2.0/dist/components/index.js", preload: false
+pin "ogm-viewer/lib", to: "https://unpkg.com/ogm-viewer@1.4.0/dist/components/index.js", preload: false
 
 # Geoblacklight
 pin_all_from Geoblacklight::Engine.root.join("app", "javascript", "geoblacklight"), under: "geoblacklight"

data/lib/generators/geoblacklight/install_generator.rb

@@ -22,7 +22,8 @@ module Geoblacklight
 
     def raise_unpermitted_params
       inject_into_file "config/environments/test.rb",
-        "config.action_controller.action_on_unpermitted_parameters = :raise\n", before: /^end/
+        "config.action_controller.action_on_unpermitted_parameters = :raise\n" \
+        "config.action_controller.always_permitted_parameters = %w[controller action commit]\n", before: /^end/
     end
 
     def mount_geoblacklight_engine
@@ -35,10 +36,6 @@ module Geoblacklight
         resources :solr_documents, only: [:show], path: '/catalog', controller: 'catalog' do
           concerns :gbl_exportable
         end
-        concern :gbl_wms, Geoblacklight::Routes::Wms.new
-        namespace :wms do
-          concerns :gbl_wms
-        end
       ROUTES
 
       inject_into_file "config/routes.rb", routes, before: /^end/
@@ -58,7 +55,7 @@ module Geoblacklight
     end
 
     def add_rsolr_gem
-      gem "rsolr", ">= 1.0", "< 3"
+      gem "rsolr", ">= 1.0", "< 4"
     end
 
     def docker_compose

data/lib/generators/geoblacklight/templates/settings.yml

@@ -33,9 +33,7 @@
 # homepage_map_geom: null
 # # homepage_map_geom: '{"type":"Polygon","coordinates":[[[-73.58,42.93],[-73.58,41.20],[-69.90,41.20],[-69.90,42.93]]]}'
 
-# # Non-search-field GeoBlacklight application permitted params.
-# # Values are left mixed-case on purpose: the uppercase symbols are WMS/OGC
-# # request parameter names (BBOX, WIDTH, etc.) and must match what clients send.
+# # Non-search-field GeoBlacklight application permitted params
 # gbl_params:
 #   - :bbox
 #   - :email
@@ -45,14 +43,6 @@
 #   - :logo
 #   - :provider
 #   - :type
-#   - :BBOX
-#   - :HEIGHT
-#   - :LAYERS
-#   - :QUERY_LAYERS
-#   - :URL
-#   - :WIDTH
-#   - :X
-#   - :Y
 
 # # Solr field mappings
 # fields:
@@ -109,9 +99,6 @@
 #   - "iso19139"
 #   - "html"
 
-# # (For WMS inspection) timeout and open_timeout parameters for Faraday
-# timeout_wms: 4
-
 # # Web services shown in tool panel
 # webservices_shown:
 #   - "wms"
@@ -210,17 +197,6 @@
 #     label: geoblacklight.relations.version_of_descendants
 #     query_type: descendants
 
-# # WMS Parameters. Keys are OGC WMS request parameter names and are sent to
-# # remote WMS servers, so they are intentionally left uppercase.
-# wms_params:
-#   SERVICE: "WMS"
-#   VERSION: "1.1.1"
-#   REQUEST: "GetFeatureInfo"
-#   STYLES: ""
-#   SRS: "EPSG:4326"
-#   EXCEPTIONS: "application/json"
-#   INFO_FORMAT: "application/json"
-
 # iiif_drag_drop_link: "@manifest?manifest=@manifest"
 
 # # Toggle thumbnail images in the search results (index) view

data/lib/geoblacklight/configuration/settings_builder.rb

@@ -26,8 +26,6 @@ module Geoblacklight
           assign(config, :webservices_shown, settings.WEBSERVICES_SHOWN)
           assign(config, :relationships_shown, build_relationships)
           assign(config, :gbl_params, settings.GBL_PARAMS)
-          assign(config, :wms_params, settings.WMS_PARAMS&.to_h)
-          assign(config, :timeout_wms, settings.TIMEOUT_WMS)
           assign(config, :restricted_origins, settings.restricted_origins)
 
           build_fields(config)

data/lib/geoblacklight/configuration.rb

@@ -15,9 +15,6 @@ module Geoblacklight
     # Institution deployed at
     attribute :institution, :string, default: "Stanford"
 
-    # (For WMS inspection) timeout and open_timeout parameters for Faraday
-    attribute :timeout_wms, :integer, default: 4
-
     # Services the item viewer should send cookies to when previewing restricted data a reader is
     # allowed at, as URL prefixes - usually just the service's origin, e.g.
     #   config.restricted_origins = ["https://geoserver-restricted.example.edu/"]
@@ -34,9 +31,6 @@ module Geoblacklight
     # Non-search-field GeoBlacklight application permitted params
     attr_accessor :gbl_params # typed as Array
 
-    # WMS Parameters
-    attr_accessor :wms_params # typed as Hash
-
     attribute :iiif_drag_drop_link, :string, default: "@manifest?manifest=@manifest"
 
     # Toggle thumbnail images in the search results (index) view
@@ -71,19 +65,7 @@ module Geoblacklight
     def initialize
       super
       @relationships_shown = RelationshipsConfig.new
-      @gbl_params = [
-        :bbox, :email, :file, :format, :id, :logo, :provider, :type,
-        :BBOX, :HEIGHT, :LAYERS, :QUERY_LAYERS, :URL, :WIDTH, :X, :Y
-      ]
-      @wms_params = {
-        SERVICE: "WMS",
-        VERSION: "1.1.1",
-        REQUEST: "GetFeatureInfo",
-        STYLES: "",
-        SRS: "EPSG:4326",
-        EXCEPTIONS: "application/json",
-        INFO_FORMAT: "application/json"
-      }
+      @gbl_params = [:bbox, :email, :file, :format, :id, :logo, :provider, :type]
 
       @restricted_origins = []
 

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "6.0.0-beta.1"
+  VERSION = "6.0.0-beta.2"
 end

data/lib/geoblacklight.rb

@@ -4,7 +4,6 @@ require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
 loader.ignore("#{__dir__}/tasks")
-loader.collapse("#{__dir__}/geoblacklight/wms_layer")
 loader.setup
 require "geoblacklight/engine"
 

data/spec/components/geoblacklight/document/sidebar_component_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Geoblacklight::Document::SidebarComponent, type: :component do
     allow_any_instance_of(Blacklight::DocumentHelperBehavior).to receive(:current_bookmarks).and_return([])
 
     with_controller_class(CatalogController) do
-      allow(vc_test_controller).to receive_messages(current_or_guest_user: User.new)
+      allow(vc_test_controller).to receive_messages(current_or_guest_user: nil)
       render_inline(component)
     end
   end

data/spec/components/geoblacklight/document_component_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Geoblacklight::DocumentComponent, type: :component do
 
   before do
     vc_test_controller.action_name = "show"
-    allow(vc_test_controller).to receive_messages(view_context: view_context, current_or_guest_user: User.new, blacklight_config: blacklight_config)
+    allow(vc_test_controller).to receive_messages(view_context: view_context, current_or_guest_user: nil, blacklight_config: blacklight_config)
     allow(view_context).to receive_messages(search_session: {}, current_search_session: nil, current_bookmarks: [])
     render_inline(component)
   end

data/spec/components/geoblacklight/item_map_viewer_component_spec.rb

@@ -45,6 +45,37 @@ RSpec.describe Geoblacklight::ItemMapViewerComponent, type: :component do
     end
   end
 
+  describe "restricted origins in reference URLs" do
+    # Restricted, and provided by this app's own institution
+    let(:document) { SolrDocument.new(JSON.parse(read_fixture("solr_documents/actual-raster1.json"))) }
+
+    before do
+      allow(Geoblacklight.configuration).to receive(:restricted_origins).and_return(["https://stacks.stanford.edu/"])
+    end
+
+    context "when signed in" do
+      before do
+        allow(vc_test_controller).to receive(:current_user).and_return(instance_double(ActiveRecord::Base))
+        render_inline(described_class.new(document: document))
+      end
+
+      it "sends them to the viewer as a separate data param" do
+        expect(page).to have_css('ogm-viewer[data-restricted-origins=\'["https://stacks.stanford.edu/"]\']')
+      end
+    end
+
+    context "when not signed in" do
+      before do
+        allow(vc_test_controller).to receive(:current_user).and_return(nil)
+        render_inline(described_class.new(document: document))
+      end
+
+      it "does not send them to the viewer" do
+        expect(page).to have_css("ogm-viewer:not([data-restricted-origins])")
+      end
+    end
+  end
+
   context "with an oembed record" do
     let(:document) { SolrDocument.new(JSON.parse(read_fixture("solr_documents/oembed.json"))) }
 

data/spec/components/geoblacklight/login_link_component_spec.rb

@@ -3,26 +3,34 @@
 require "spec_helper"
 
 RSpec.describe Geoblacklight::LoginLinkComponent, type: :component do
-  let(:document) { instance_double(SolrDocument, id: 123) }
+  let(:document) { instance_double(SolrDocument, id: 123, restricted?: true, same_institution?: true) }
+  let(:login_path) { "/login" }
 
-  context "when rendering is required" do
-    before do
-      allow(vc_test_controller).to receive(:user_signed_in?).and_return(false)
-      allow(document).to receive(:restricted?).and_return(true)
-      allow(document).to receive(:same_institution?).and_return(true)
-    end
+  before do
+    allow(vc_test_controller).to receive(:blacklight_login_path).and_return(login_path)
+    allow(vc_test_controller).to receive(:current_user).and_return(nil)
+  end
 
-    it "shows download link" do
+  context "when the document is restricted to this institution and no one is signed in" do
+    it "links to the sign-in page" do
       render_inline(described_class.new(document: document))
-      expect(page).to have_text(I18n.t("geoblacklight.tools.login_to_view"))
+      expect(page).to have_link(I18n.t("geoblacklight.tools.login_to_view"), href: login_path)
     end
   end
 
-  context "when rendering is not required" do
+  context "when signed in" do
     before do
-      allow(document).to receive(:restricted?).and_return(false)
-      allow(document).to receive(:same_institution?).and_return(false)
+      allow(vc_test_controller).to receive(:current_user).and_return(instance_double(ActiveRecord::Base))
+    end
+
+    it "does not render anything" do
+      render_inline(described_class.new(document: document))
+      expect(page).not_to have_text(I18n.t("geoblacklight.tools.login_to_view"))
     end
+  end
+
+  context "when the app has no authentication" do
+    let(:login_path) { nil }
 
     it "does not render anything" do
       render_inline(described_class.new(document: document))

data/spec/factories/user.rb

@@ -2,7 +2,12 @@
 
 FactoryBot.define do
   factory :user do
-    sequence(:email) { |n| "user#{n}@example.com" }
+    # Rails' built-in authentication calls the column email_address, where Devise calls it email
+    if AuthenticationHelpers.provider == :rails
+      sequence(:email_address) { |n| "user#{n}@example.com" }
+    else
+      sequence(:email) { |n| "user#{n}@example.com" }
+    end
     password { "password" }
     password_confirmation { "password" }
   end

data/spec/features/axe_spec.rb

@@ -22,6 +22,7 @@ RSpec.feature "Accessibility testing", js: true do
     end
 
     it "validates an bookmarks page" do
+      skip_without_authentication
       visit solr_document_path("berkeley-s7st30")
       click_on "Bookmark"
       visit bookmarks_path

data/spec/features/restricted_viewer_spec.rb

@@ -3,11 +3,9 @@
 require "spec_helper"
 
 RSpec.feature "Restricted item viewer", js: true do
-  scenario "offers to sign in, and shows where the layer is rather than failing to load it" do
+  scenario "shows where the layer is rather than failing to load it" do
     visit solr_document_path("stanford-dp018hs9766")
 
-    expect(page).to have_link("Login to View and Download")
-
     # The viewer was handed a record with no service references, so the only preview it can offer
     # is the record's own extent
     previews = find("ogm-viewer").shadow_root.find("ogm-previews", visible: :all)

data/spec/features/sign_in_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.feature "Signing in to see a restricted record" do
+  let(:restricted) { "stanford-dp018hs9766" }
+
+  scenario "brings the reader back to the record once they're signed in" do
+    skip_without_authentication
+    visit solr_document_path(restricted)
+    click_link "Login to View and Download"
+    fill_in_sign_in_form FactoryBot.create(:user)
+
+    expect(page).to have_current_path(solr_document_path(restricted))
+    expect(page).to have_link "Log Out"
+    expect(page).to have_no_link "Login to View and Download"
+  end
+
+  scenario "is not offered when the app has no authentication" do
+    skip "the test app has authentication" if AuthenticationHelpers.provider
+    visit solr_document_path(restricted)
+
+    expect(page).to have_css "h1", text: "Elkhorn Slough"
+    expect(page).to have_no_link "Login to View and Download"
+  end
+end

data/spec/requests/bookmarks_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 RSpec.describe "Bookmarks", type: :request do
   it "lists a newly created bookmark" do
+    skip_without_authentication
     post bookmarks_path, params: {id: "berkeley-s7pq31"}
     get bookmarks_path
 

data/spec/requests/viewer_record_spec.rb

@@ -3,8 +3,6 @@
 require "spec_helper"
 
 RSpec.describe "Viewer record", type: :request do
-  include Devise::Test::IntegrationHelpers
-
   let(:references) { JSON.parse(response.parsed_body[Geoblacklight.configuration.fields.references]) }
 
   # Restricted, and provided by this app's own institution, so signing in makes the difference
@@ -19,7 +17,7 @@ RSpec.describe "Viewer record", type: :request do
   end
 
   it "hands over the same record once that reader signs in" do
-    sign_in FactoryBot.create(:user)
+    sign_in
     get viewer_solr_document_path(restricted)
 
     expect(references.keys).to include("https://github.com/cogeotiff/cog-spec", "http://schema.org/downloadUrl")

data/spec/requests/viewer_requests_spec.rb

@@ -3,8 +3,6 @@
 require "spec_helper"
 
 RSpec.describe "Viewer requests", type: :request do
-  include Devise::Test::IntegrationHelpers
-
   let(:origins) { ["https://stacks.stanford.edu/"] }
 
   # Restricted, and provided by this app's own institution, so signing in makes the difference
@@ -22,7 +20,7 @@ RSpec.describe "Viewer requests", type: :request do
   end
 
   it "names the services a signed-in reader's requests need to carry cookies to" do
-    sign_in FactoryBot.create(:user)
+    sign_in
     get solr_document_path(restricted)
 
     expect(JSON.parse(restricted_origins)).to eq origins
@@ -35,7 +33,7 @@ RSpec.describe "Viewer requests", type: :request do
   end
 
   it "names none for a public record, which has nothing that needs authorizing" do
-    sign_in FactoryBot.create(:user)
+    sign_in
     get solr_document_path("berkeley-s7pq31")
 
     expect(restricted_origins).to be_nil
@@ -45,7 +43,7 @@ RSpec.describe "Viewer requests", type: :request do
     let(:origins) { [] }
 
     it "names none" do
-      sign_in FactoryBot.create(:user)
+      sign_in
       get solr_document_path(restricted)
 
       expect(restricted_origins).to be_nil

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")
+  # Scroll without animating. Bootstrap puts `scroll-behavior: smooth` on :root, so when
+  # ChromeDriver sets scrollTop to bring an element into view before clicking it, the page only
+  # starts to move and ChromeDriver reads back the element's old, off-screen position. The click
+  # then fails and is left to Capybara's retry, which a busy page can outlast.
+  options.add_argument("--disable-smooth-scrolling")
   # Software WebGL, which the viewer and the overview map both need: they draw with MapLibre, and
   # headless Chrome has no GPU to give them. SwiftShader is Chrome's own CPU renderer, and since
   # Chrome 128 it has to be asked for by name before WebGL will fall back to it at all.
@@ -77,6 +82,6 @@ RSpec.configure do |config|
 
   config.use_transactional_fixtures = true
 
-  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller if defined?(Devise)
   config.include ViewComponent::TestHelpers, type: :component
 end

data/spec/support/authentication.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# The app can be generated using Devise auth, Rails auth, or no auth. These
+# are for signing in and/or skipping tests depending on which is the case.
+module AuthenticationHelpers
+  # :devise, :rails, or nil if the app has no authentication
+  def self.provider
+    if defined?(Devise)
+      :devise
+    elsif ApplicationController.respond_to?(:allow_unauthenticated_access)
+      :rails
+    end
+  end
+
+  def skip_without_authentication
+    skip "the test app has no authentication" unless AuthenticationHelpers.provider
+  end
+
+  module Requests
+    # Sign a new user in by posting the sign-in form
+    def sign_in
+      skip_without_authentication
+      user = FactoryBot.create(:user)
+
+      if AuthenticationHelpers.provider == :devise
+        post user_session_path, params: {user: {email: user.email, password: user.password}}
+      else
+        post session_path, params: {email_address: user.email_address, password: user.password}
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include AuthenticationHelpers
+  config.include AuthenticationHelpers::Requests, type: :request
+end

data/spec/support/features/session_helpers.rb

@@ -2,24 +2,26 @@
 
 module Features
   module SessionHelpers
-    def sign_up_with(email, password)
-      visit new_user_registration_path
-      fill_in "Email", with: email
-      fill_in "Password", with: password
-      click_button "Sign up"
-    end
-
     def sign_in
-      user = FactoryBot.create(:user)
-      user.save
-      visit new_user_session_path
-      fill_in "user_email", with: user.email
-      fill_in "user_password", with: user.password
-      click_button "Log in"
+      skip_without_authentication
+      visit (AuthenticationHelpers.provider == :devise) ? new_user_session_path : new_session_path
+      fill_in_sign_in_form FactoryBot.create(:user)
       # Wait for the persistent "Log Out" nav link rather than the one-shot
       # "Signed in successfully." flash, which can render and then become
       # non-visible before Capybara's default wait time elapses.
       expect(page).to have_link "Log Out"
     end
+
+    def fill_in_sign_in_form(user)
+      if AuthenticationHelpers.provider == :devise
+        fill_in "user_email", with: user.email
+        fill_in "user_password", with: user.password
+        click_button "Log in"
+      else
+        fill_in "email_address", with: user.email_address
+        fill_in "password", with: user.password
+        click_button "Sign in"
+      end
+    end
   end
 end

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

@@ -16,7 +16,7 @@ class TestAppGenerator < Rails::Generators::Base
   # Install blacklight
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)
-    generate "blacklight:install", "--devise", "--skip-solr"
+    generate "blacklight:install", ENV["BLACKLIGHT_INSTALL_OPTIONS"].presence || "--devise --skip-solr"
   end
 
   # Install geoblacklight

data/template.rb

@@ -10,7 +10,7 @@ end
 run "bundle install"
 
 after_bundle do
-  generate "blacklight:install", ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", "--devise")
+  generate "blacklight:install", ENV["BLACKLIGHT_INSTALL_OPTIONS"].presence || "--devise --skip-solr"
   generate "geoblacklight:install"
   rails_command "db:migrate"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.beta.1
+  version: 6.0.0.pre.beta.2
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2026-09-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -492,7 +492,6 @@ files:
 - app/components/geoblacklight/web_services_wms_component.rb
 - app/controllers/relations_controller.rb
 - app/controllers/viewer_record_controller.rb
-- app/controllers/wms_controller.rb
 - app/helpers/geoblacklight_helper.rb
 - app/javascript/geoblacklight/controllers/clipboard_controller.js
 - app/javascript/geoblacklight/controllers/oembed_viewer_controller.js
@@ -501,7 +500,6 @@ files:
 - app/javascript/geoblacklight/index.js
 - app/javascript/geoblacklight/initializers/field_truncation.js
 - app/javascript/geoblacklight/initializers/metadata_download.js
-- app/javascript/geoblacklight/initializers/tooltips.js
 - app/javascript/geoblacklight/initializers/truncation.js
 - app/javascript/geoblacklight/initializers/viewer_requests.js
 - app/javascript/geoblacklight/initializers/viewer_theme.js
@@ -570,11 +568,8 @@ files:
 - lib/geoblacklight/relations/relation_response.rb
 - lib/geoblacklight/routes.rb
 - lib/geoblacklight/routes/exportable.rb
-- lib/geoblacklight/routes/wms.rb
 - lib/geoblacklight/version.rb
 - lib/geoblacklight/viewer_record.rb
-- lib/geoblacklight/wms_layer.rb
-- lib/geoblacklight/wms_layer/feature_info_response.rb
 - lib/tasks/geoblacklight.rake
 - lib/tasks/solr.rb
 - package.json
@@ -617,7 +612,6 @@ files:
 - spec/components/geoblacklight/web_services_component_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/relations_controller_spec.rb
-- spec/controllers/wms_controller_spec.rb
 - spec/factories/user.rb
 - spec/features/axe_spec.rb
 - spec/features/citations_spec.rb
@@ -630,6 +624,7 @@ files:
 - spec/features/restricted_viewer_spec.rb
 - spec/features/search_results_map_spec.rb
 - spec/features/search_spec.rb
+- spec/features/sign_in_spec.rb
 - spec/features/sms_spec.rb
 - spec/features/tilejson_spec.rb
 - spec/features/tms_spec.rb
@@ -732,8 +727,6 @@ files:
 - spec/lib/geoblacklight/relations/descendants_spec.rb
 - spec/lib/geoblacklight/relations/relation_response_spec.rb
 - spec/lib/geoblacklight/viewer_record_spec.rb
-- spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb
-- spec/lib/geoblacklight/wms_layer_spec.rb
 - spec/models/concerns/geoblacklight/bbox_filter_field_spec.rb
 - spec/models/concerns/geoblacklight/bbox_filter_query_spec.rb
 - spec/models/concerns/geoblacklight/solr_document/citation_spec.rb
@@ -760,6 +753,7 @@ files:
 - spec/solr_config_spec.rb
 - spec/solr_fixtures_spec.rb
 - spec/spec_helper.rb
+- spec/support/authentication.rb
 - spec/support/features.rb
 - spec/support/features/map_helpers.rb
 - spec/support/features/session_helpers.rb
@@ -785,7 +779,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files: []

data/app/controllers/wms_controller.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class WmsController < ApplicationController
-  def handle
-    response = Geoblacklight::WmsLayer.new(wms_params).feature_info
-
-    respond_to do |format|
-      format.json { render json: response }
-    end
-  end
-
-  private
-
-  def wms_params
-    params.permit(Geoblacklight.configuration.gbl_params)
-  end
-end

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

@@ -1,51 +0,0 @@
-import { Tooltip } from "bootstrap"
-
-export default function initializeTooltips() {
-  document.body.addEventListener(
-    "mouseenter",
-    (event) => {
-      if (event.target.closest(".blacklight-icons.svg_tooltip svg")) {
-        const svgElement = event.target.closest(".blacklight-icons.svg_tooltip svg")
-        const svgTitleElement = svgElement.querySelector("title")
-        const titleText = svgTitleElement ? svgTitleElement.textContent : ""
-
-        if (titleText !== undefined && titleText !== "") {
-          // Initialize Bootstrap tooltip with native JavaScript
-          const tooltip = new Tooltip(svgElement, {
-            placement: "bottom",
-            title: titleText,
-          })
-          tooltip.show()
-
-          // Store the original title in the data-original-title attribute
-          // and remove the title element to prevent it from interfering with Bootstrap's tooltip.
-          svgElement.setAttribute("data-original-title", titleText)
-          svgTitleElement.remove()
-        }
-      }
-    },
-    true,
-  ) // Use capture to ensure the event is caught as it bubbles up
-
-  document.body.addEventListener(
-    "mouseleave",
-    (event) => {
-      if (event.target.closest(".blacklight-icons.svg_tooltip svg")) {
-        const svgElement = event.target.closest(".blacklight-icons.svg_tooltip svg")
-        const originalTitle = svgElement.getAttribute("data-original-title")
-
-        if (originalTitle !== undefined && originalTitle !== "") {
-          // Restore the SVG title element from data-original-title
-          const newTitleElement = document.createElement("title")
-          newTitleElement.textContent = originalTitle
-          svgElement.prepend(newTitleElement)
-          svgElement.setAttribute("data-original-title", "")
-        }
-      }
-
-      // Remove tooltips
-      document.querySelectorAll(".tooltip").forEach((elem) => elem.remove())
-    },
-    true,
-  ) // Use capture to ensure the event is caught as it bubbles up
-}

data/lib/geoblacklight/routes/wms.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  module Routes
-    class Wms
-      def initialize(defaults = {})
-        @defaults = defaults
-      end
-
-      def call(mapper, _options = {})
-        mapper.post "handle"
-      end
-    end
-  end
-end

data/lib/geoblacklight/wms_layer/feature_info_response.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class FeatureInfoResponse
-    def initialize(response)
-      @response = response
-    end
-
-    def check
-      if error?
-        @response
-      else
-        format
-      end
-    end
-
-    def format
-      JSON.parse(@response.body)
-    rescue
-      page = Nokogiri::HTML(@response.body)
-      properties = {}
-      values = {}
-      page.css("td").each_with_index do |td, index|
-        values[index] = td.text
-      end
-      page.css("th").each_with_index do |th, index|
-        properties[th.text] = values[index] unless index >= values.keys.count
-      end
-      {features: [{properties: properties, isHTML: true}]}
-    end
-
-    def error?
-      @response[:error] ||
-        @response.headers["content-type"].slice(0, 9) == "text/xml"
-    end
-  end
-end

data/lib/geoblacklight/wms_layer.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Geoblacklight
-  class WmsLayer
-    def initialize(params)
-      @params = params.to_h.merge(Geoblacklight.configuration.wms_params)
-      @response = Geoblacklight::FeatureInfoResponse.new(request_response)
-    end
-
-    def url
-      @params["URL"]
-    end
-
-    def search_params
-      @params.except("URL")
-    end
-
-    def feature_info
-      @response.check
-    end
-
-    def request_response
-      conn = Faraday.new(url: url)
-      conn.get do |request|
-        request.params = search_params
-        request.options.timeout = Geoblacklight.configuration.timeout_wms
-        request.options.open_timeout = Geoblacklight.configuration.timeout_wms
-      end
-    rescue Faraday::ConnectionFailed, Faraday::TimeoutError => error
-      Geoblacklight.logger.error error.inspect
-      {error: error.inspect}
-    end
-  end
-end

data/spec/controllers/wms_controller_spec.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe WmsController, type: :controller do
-  let(:wms_layer) { instance_double(Geoblacklight::WmsLayer) }
-  let(:feature_info) { {values: ["fid", "layer:example"]} }
-  let(:params) do
-    {"format" => "json", "URL" => "http://www.example.com/", "LAYERS" => "layer:example",
-     "BBOX" => "-74, 40, -68, 43", "WIDTH" => "500", "HEIGHT" => "400",
-     "QUERY_LAYERS" => "layer:example", "X" => "277", "Y" => "195"}
-  end
-
-  before do
-    allow(Geoblacklight::WmsLayer).to receive(:new).and_return(wms_layer)
-    allow(wms_layer).to receive(:feature_info).and_return(feature_info)
-  end
-
-  describe "#handle" do
-    it "returns feature info as json" do
-      get :handle, params: params
-      expect(response.body).to eq(feature_info.to_json)
-    end
-  end
-
-  describe "#wms_params" do
-    let(:wms_params) { controller.instance_eval { wms_params } }
-
-    it "returns only permitted params" do
-      get :handle, params: params
-      expect(wms_params.to_h).to eq(params)
-    end
-  end
-end

data/spec/lib/geoblacklight/wms_layer/feature_info_response_spec.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Geoblacklight::FeatureInfoResponse do
-  let(:response) { described_class.new(OpenStruct.new(body: "<html><body><table><th>Header1</th><th>Header2</th><td>value1</td><td>value2</td></body></html>", headers: {"content-type" => "all good"})) }
-  let(:response_multiple_features) { described_class.new(OpenStruct.new(body: "<html><body><table><th>Header1</th><th>Header2</th><tr><td>value1</td><td>value2</td></tr><tr><td>value3</td><td>value4</td></tr></body></html>", headers: {"content-type" => "all good"})) }
-  let(:error_response) { described_class.new(error: "bad stuff") }
-  let(:content_response) { described_class.new(OpenStruct.new(headers: {"content-type" => "text/xml"})) }
-
-  describe "#initialize" do
-    it "initializes as a FeatureInfoResponse type" do
-      expect(response).to be_an described_class
-    end
-  end
-
-  describe "#error?" do
-    it "if no error" do
-      expect(response.error?).to be_falsey
-    end
-    it "if error key is present" do
-      expect(error_response.error?).to be_truthy
-    end
-    it "if content-type header is text/xml" do
-      expect(content_response.error?).to be_truthy
-    end
-  end
-
-  describe "#format" do
-    it "returns a formated response" do
-      expect(response.format).not_to be_nil
-      expect(response.format[:features][0][:properties].keys.length).to eq 2
-      expect(response.format[:features][0][:isHTML]).to be true
-      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
-      expect(response.format[:features][0][:properties]["Header2"]).to eq "value2"
-    end
-    it "returns a formated response when multiple features are retrieved" do
-      expect(response_multiple_features.format).not_to be_nil
-      expect(response.format[:features][0][:properties].keys.length).to eq 2
-      expect(response.format[:features][0][:isHTML]).to be true
-      expect(response.format[:features][0][:properties]["Header1"]).to eq "value1"
-      expect(response.format[:features][0][:properties]["Header2"]).to eq "value2"
-    end
-  end
-
-  describe "#check" do
-    it "returns a formated response if no errors" do
-      expect(response.check).to eq response.format
-    end
-    it "returns the unformated response if there are errors" do
-      expect(error_response.check).to eq error_response.instance_variable_get(:@response)
-    end
-  end
-end

data/spec/lib/geoblacklight/wms_layer_spec.rb

@@ -1,115 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Geoblacklight::WmsLayer do
-  let(:wms_layer) { described_class.new(params) }
-  let(:rails_4_params) { {"URL" => "http://www.example.com/", "X" => "277"} }
-  let(:rails_5_params) { instance_double(ActionController::Parameters) }
-
-  before do
-    allow(rails_5_params).to receive(:to_h).and_return("URL" => "http://www.example.com/", "X" => "277")
-  end
-
-  describe "#initialize" do
-    let(:params) { rails_4_params }
-
-    it "initializes as a WmsLayer object" do
-      expect(wms_layer).to be_an described_class
-    end
-  end
-
-  describe "#url" do
-    context "when running on rails 4" do
-      let(:params) { rails_4_params }
-
-      it "returns the correct URL parameter" do
-        expect(wms_layer.url).to eq("http://www.example.com/")
-      end
-    end
-
-    context "when running on rails 5" do
-      let(:params) { rails_5_params }
-
-      it "returns the correct URL parameter" do
-        expect(wms_layer.url).to eq("http://www.example.com/")
-      end
-    end
-  end
-
-  describe "#search_params" do
-    context "when running on rails 4" do
-      let(:params) { rails_4_params }
-
-      it "returns all params except URL plus default params" do
-        expect(wms_layer.search_params.length).to eq 8
-        expect(wms_layer.search_params).not_to include "URL" => "http://www.example.com/"
-      end
-    end
-
-    context "when running on rails 5" do
-      let(:params) { rails_5_params }
-
-      it "returns all params except URL plus default params" do
-        expect(wms_layer.search_params.length).to eq 8
-        expect(wms_layer.search_params).not_to include "URL" => "http://www.example.com/"
-      end
-    end
-  end
-
-  describe "#feature_info" do
-    let(:response) { instance_double(Geoblacklight::FeatureInfoResponse) }
-    let(:params) { rails_4_params }
-
-    before do
-      allow(Geoblacklight::FeatureInfoResponse).to receive(:new).and_return(response)
-      allow(response).to receive(:check)
-    end
-
-    it "returns the response from the FeatureInfoResponse object" do
-      expect(wms_layer.feature_info).to eq(response.check)
-    end
-  end
-
-  describe "#request_response" do
-    subject(:wms_layer) { described_class.new(params) }
-    let(:params) { rails_4_params }
-    let(:connection) { instance_double(Faraday::Connection) }
-    let(:response) { instance_double(Faraday::Response) }
-
-    before do
-      allow(Faraday).to receive(:new).and_return(connection)
-    end
-
-    it "returns a Faraday object" do
-      allow(connection).to receive(:get).and_return(response)
-      expect(wms_layer.request_response).to eq(response)
-    end
-
-    context "when the HTTP connection fails" do
-      before do
-        allow(Geoblacklight.logger).to receive(:error).with("#<Faraday::ConnectionFailed wrapped=#<StandardError: test connection error>>")
-        allow(connection).to receive(:get).and_raise(Faraday::ConnectionFailed.new(StandardError.new("test connection error")))
-      end
-
-      it "logs the Faraday error" do
-        expect(Geoblacklight.logger).to receive(:error).exactly(3).times
-        expect(wms_layer.request_response).to be_a Hash
-        expect(wms_layer.request_response).to include(error: "#<Faraday::ConnectionFailed wrapped=#<StandardError: test connection error>>")
-      end
-    end
-
-    context "when the HTTP connection times out" do
-      before do
-        allow(Geoblacklight.logger).to receive(:error).with("#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>")
-        allow(connection).to receive(:get).and_raise(Faraday::TimeoutError)
-      end
-
-      it "logs the Faraday error" do
-        expect(Geoblacklight.logger).to receive(:error).exactly(3).times
-        expect(wms_layer.request_response).to be_a Hash
-        expect(wms_layer.request_response).to include(error: "#<Faraday::TimeoutError #<Faraday::TimeoutError: timeout>>")
-      end
-    end
-  end
-end