geoblacklight 6.0.0.pre.alpha.2 → 6.0.0.pre.alpha.4

data/lib/geoblacklight.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_support/dependencies"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")

data/solr/conf/schema.xml

@@ -66,15 +66,15 @@
     <fieldType name="string"  class="solr.StrField"  sortMissingLast="true" />
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
 
-    <fieldType name="int"    class="solr.TrieIntField"     precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="float"  class="solr.TrieFloatField"   precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="long"   class="solr.TrieLongField"    precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField"  precisionStep="8" positionIncrementGap="0"/>
+    <fieldType name="int"    class="solr.IntPointField"    docValues="true"/>
+    <fieldType name="float"  class="solr.FloatPointField"  docValues="true"/>
+    <fieldType name="long"   class="solr.LongPointField"   docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" docValues="true"/>
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
          The trailing "Z" designates UTC time and is mandatory.
-         A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
+         A Point based date field for faster date range queries and date faceting. -->
+    <fieldType name="date" class="solr.DatePointField" docValues="true"/>
 
     <!-- A DateRange based date field for truly faster date range queries. -->
     <fieldType name="dateRange" class="solr.DateRangeField"/>
@@ -98,7 +98,8 @@
       </analyzer>
       <analyzer type="query">
         <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.FlattenGraphFilterFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.EnglishPossessiveFilterFactory"/>

data/solr/conf/solrconfig.xml

@@ -27,7 +27,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>7.6</luceneMatchVersion>
+  <luceneMatchVersion>9.0</luceneMatchVersion>
 
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />

data/spec/components/geoblacklight/download_links_component_spec.rb

@@ -114,8 +114,11 @@ RSpec.describe Geoblacklight::DownloadLinksComponent, type: :component do
       allow(component).to receive(:t).with("geoblacklight.download.export_shapefile_link").and_return("Shapefile Export Customization")
       allow(component).to receive(:t).with("geoblacklight.download.export_link",
         {download_format: "Shapefile Export Customization"}).and_return("Export Shapefile Export Customization")
+      allow(component).to receive(:t).with("geoblacklight.download.preparing").and_return("Preparing download...")
+      allow(component).to receive(:t).with("geoblacklight.download.ready", {type: "SHAPEFILE"}).and_return("Download ready (SHAPEFILE)")
+      allow(component).to receive(:t).with("geoblacklight.download.failed", {type: "SHAPEFILE"}).and_return("Download failed (SHAPEFILE)")
       expect(component.download_link_generated(download_type,
-        document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-action="downloads#download:once" data-download-type="SHAPEFILE" data-download-id="test-id" href="">Export Shapefile Export Customization</a>'
+        document)).to eq '<a data-download-path="/download/test-id?type=SHAPEFILE" data-download="trigger" data-action="downloads#download:once" data-download-type="SHAPEFILE" data-download-id="test-id" data-download-preparing-message="Preparing download..." data-download-ready-message="Download ready (SHAPEFILE)" data-download-failed-message="Download failed (SHAPEFILE)" href="">Export Shapefile Export Customization</a>'
     end
   end
 end

data/spec/helpers/geoblacklight_helper_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe GeoblacklightHelper, type: :helper do
     context "with multiple values" do
       let(:document) { SolrDocument.new(value: %w[short description]) }
       it "wraps in correct DIV class" do
-        expect(helper.render_value_as_truncate_abstract(document)).to eq '<div class="truncate-abstract">short description</div>'
+        expect(helper.render_value_as_truncate_abstract(document)).to eq '<div class="truncate-abstract" data-read-more-text="Read more" data-close-text="Close"><p>short</p><p>description</p></div>'
       end
     end
   end

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

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Geoblacklight::Configuration::LeafletConfig do
+  subject(:config) { described_class.new }
+
+  describe "#sleep=" do
+    it "replaces the default sleep config with a LeafletSleepConfig" do
+      config.sleep = {sleep: false, margin_distance: 50, message: "Wake up!"}
+
+      expect(config.sleep).to be_a(Geoblacklight::Configuration::LeafletSleepConfig)
+      expect(config.sleep.sleep).to be(false)
+      expect(config.sleep.margin_distance).to eq(50)
+      expect(config.sleep.message).to eq("Wake up!")
+    end
+
+    it "applies LeafletSleepConfig defaults for unspecified attributes" do
+      config.sleep = {message: "Custom message"}
+
+      expect(config.sleep.message).to eq("Custom message")
+      expect(config.sleep.sleep).to be(true)
+      expect(config.sleep.sleeptime).to eq(750)
+      expect(config.sleep.waketime).to eq(750)
+      expect(config.sleep.background).to eq("rgba(214, 214, 214, .7)")
+    end
+
+    it "replaces rather than merges with the previous sleep config" do
+      config.sleep = {sleep: false}
+
+      expect(config.sleep.sleep).to be(false)
+      expect(config.sleep.margin_distance).to eq(100)
+    end
+
+    it "produces a fresh independent object on each assignment" do
+      original = config.sleep
+      config.sleep = {sleep: false}
+
+      expect(config.sleep).not_to be(original)
+      expect(original.sleep).to be(true)
+    end
+
+    it "accepts an empty hash, falling back entirely to defaults" do
+      config.sleep = {}
+
+      expect(config.sleep).to be_a(Geoblacklight::Configuration::LeafletSleepConfig)
+      expect(config.sleep.sleep).to be(true)
+      expect(config.sleep.message).to eq("Click to Wake")
+    end
+
+    it "is reflected in #to_h" do
+      config.sleep = {sleep: false, message: "Hello"}
+
+      expect(config.to_h[:sleep]).to include("sleep" => false, "message" => "Hello")
+    end
+  end
+
+  describe "#layers=" do
+    let(:attributes) do
+      {
+        detect_retina: false,
+        index: {
+          DEFAULT: {color: "#7FCDBB", sr_color_name: "Green"},
+          UNAVAILABLE: Geoblacklight::Configuration::LayerConfig.new(
+            color: "#EDF8B1", sr_color_name: "Yellow"
+          )
+        }
+      }
+    end
+
+    it "replaces the default layers config with a LeafletLayersConfig" do
+      config.layers = attributes
+
+      expect(config.layers).to be_a(Geoblacklight::Configuration::LeafletLayersConfig)
+      expect(config.layers.detect_retina).to be(false)
+    end
+
+    it "coerces hash entries under index into LayerConfig instances" do
+      config.layers = attributes
+
+      default = config.layers.index[:DEFAULT]
+      expect(default).to be_a(Geoblacklight::Configuration::LayerConfig)
+      expect(default.color).to eq("#7FCDBB")
+      expect(default.sr_color_name).to eq("Green")
+      expect(default.weight).to eq(1)
+    end
+
+    it "preserves existing LayerConfig instances under index" do
+      config.layers = attributes
+
+      unavailable = config.layers.index[:UNAVAILABLE]
+      expect(unavailable).to be_a(Geoblacklight::Configuration::LayerConfig)
+      expect(unavailable.color).to eq("#EDF8B1")
+    end
+
+    it "replaces rather than merges with the previous layers config" do
+      config.layers = {index: {DEFAULT: {color: "#000000"}}}
+
+      expect(config.layers.index.keys).to eq([:DEFAULT])
+      expect(config.layers.index[:SELECTED]).to be_nil
+    end
+
+    it "produces a fresh independent object on each assignment" do
+      original = config.layers
+      config.layers = {index: {}}
+
+      expect(config.layers).not_to be(original)
+      expect(original.index).to include(:DEFAULT, :UNAVAILABLE, :SELECTED)
+    end
+
+    it "accepts an empty hash, resulting in an empty index" do
+      config.layers = {}
+
+      expect(config.layers).to be_a(Geoblacklight::Configuration::LeafletLayersConfig)
+      expect(config.layers.index).to eq({})
+    end
+
+    it "is reflected in #to_h" do
+      config.layers = attributes
+
+      expect(config.to_h[:layers]).to include(
+        "detect_retina" => false,
+        "index" => hash_including(
+          DEFAULT: {color: "#7FCDBB", weight: 1, radius: 4, sr_color_name: "Green"}
+        )
+      )
+    end
+  end
+end

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

@@ -2,12 +2,13 @@ require "spec_helper"
 
 RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
   describe ".build" do
+    before {
+      Settings.institution = "MIT"
+    }
     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)
+      expect(config.institution).to eq("MIT")
     end
   end
 
@@ -89,6 +90,112 @@ RSpec.describe Geoblacklight::Configuration::SettingsBuilder do
         expect(config.institution).to eq("Stanford")
       end
     end
+
+    describe "display_notes_shown" do
+      it "preserves the defaults when DISPLAY_NOTES_SHOWN is absent" do
+        expect(described_class.new(settings: {}).build.display_notes_shown).to(
+          include(:danger, :info, :tip, :warning)
+        )
+      end
+
+      it "builds DisplayNoteShownConfig objects from a lowercase hash" do
+        settings = {
+          display_notes_shown: {
+            danger: {
+              bootstrap_alert_class: "alert-danger",
+              icon: "fire-solid",
+              note_prefix: "Danger: "
+            }
+          }
+        }
+
+        result = described_class.new(settings: settings).build.display_notes_shown
+
+        expect(result.keys).to eq([:danger])
+        danger = result[:danger]
+        expect(danger).to be_a(Geoblacklight::Configuration::DisplayNoteShownConfig)
+        expect(danger.bootstrap_alert_class).to eq("alert-danger")
+        expect(danger.icon).to eq("fire-solid")
+        expect(danger.note_prefix).to eq("Danger: ")
+      end
+
+      it "builds each entry as a DisplayNoteShownConfig when multiple are given" do
+        settings = {
+          display_notes_shown: {
+            info: {bootstrap_alert_class: "alert-info", icon: "circle-info-solid", note_prefix: "Info: "},
+            tip: {bootstrap_alert_class: "alert-success", icon: "lightbulb-solid", note_prefix: "Tip: "}
+          }
+        }
+
+        result = described_class.new(settings: settings).build.display_notes_shown
+
+        expect(result.keys).to contain_exactly(:info, :tip)
+        expect(result.values).to all(be_a(Geoblacklight::Configuration::DisplayNoteShownConfig))
+        expect(result[:tip].note_prefix).to eq("Tip: ")
+      end
+
+      it "coerces non-hash values into hashes before constructing the config" do
+        struct = Struct.new(:bootstrap_alert_class, :icon, :note_prefix)
+        note = struct.new("alert-warning", "triangle-exclamation-solid", "Warning: ")
+
+        settings = {display_notes_shown: {warning: note}}
+
+        result = described_class.new(settings: settings).build.display_notes_shown[:warning]
+
+        expect(result).to be_a(Geoblacklight::Configuration::DisplayNoteShownConfig)
+        expect(result.bootstrap_alert_class).to eq("alert-warning")
+        expect(result.icon).to eq("triangle-exclamation-solid")
+        expect(result.note_prefix).to eq("Warning: ")
+      end
+
+      it "supports partially-specified notes by leaving unset attributes blank" do
+        settings = {display_notes_shown: {custom: {icon: "star-solid"}}}
+
+        result = described_class.new(settings: settings).build.display_notes_shown[:custom]
+
+        expect(result).to be_a(Geoblacklight::Configuration::DisplayNoteShownConfig)
+        expect(result.icon).to eq("star-solid")
+        expect(result.bootstrap_alert_class).to be_nil
+        expect(result.note_prefix).to be_nil
+      end
+
+      it "replaces the defaults entirely rather than merging" do
+        settings = {display_notes_shown: {custom: {icon: "star-solid"}}}
+
+        result = described_class.new(settings: settings).build.display_notes_shown
+
+        expect(result.keys).to eq([:custom])
+        expect(result).not_to include(:danger, :info, :tip, :warning)
+      end
+
+      it "handles an empty display_notes_shown hash" do
+        settings = {display_notes_shown: {}}
+
+        expect(described_class.new(settings: settings).build.display_notes_shown).to eq({})
+      end
+
+      it "resolves an uppercase DISPLAY_NOTES_SHOWN key for backwards compatibility" do
+        allow(Geoblacklight::Deprecation).to receive(:warn)
+
+        settings = {
+          DISPLAY_NOTES_SHOWN: {
+            danger: {
+              bootstrap_alert_class: "alert-danger",
+              icon: "fire-solid",
+              note_prefix: "Danger: "
+            }
+          }
+        }
+
+        result = described_class.new(settings: settings).build.display_notes_shown[:danger]
+
+        expect(result).to be_a(Geoblacklight::Configuration::DisplayNoteShownConfig)
+        expect(result.bootstrap_alert_class).to eq("alert-danger")
+        expect(result.icon).to eq("fire-solid")
+        expect(result.note_prefix).to eq("Danger: ")
+        expect(Geoblacklight::Deprecation).to have_received(:warn).with(a_string_matching(/DISPLAY_NOTES_SHOWN/i))
+      end
+    end
   end
 end
 

data/spec/lib/geoblacklight/metadata/base_spec.rb

@@ -130,7 +130,7 @@ RSpec.describe Geoblacklight::Metadata::Base do
     before do
       allow(GeoCombine::Metadata).to receive(:new).and_return(geocombine_metadata)
 
-      allow(connection).to receive(:use)
+      allow(connection).to receive(:response)
       allow(connection).to receive(:adapter)
       allow(Faraday).to receive(:new).and_yield(connection).and_return(connection)
 

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", "--devise"
   end
 
   # Install geoblacklight

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.alpha.2
+  version: 6.0.0.pre.alpha.4
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2026-06-27 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9'
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: deprecation
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: geo_combine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: mime-types
+  name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rgeo-geojson
+  name: geo_combine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: rsolr
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: rgeo-geojson
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -564,7 +550,6 @@ files:
 - lib/geoblacklight/download/shapefile_download.rb
 - lib/geoblacklight/engine.rb
 - lib/geoblacklight/exceptions.rb
-- lib/geoblacklight/faraday_middleware/follow_redirects.rb
 - lib/geoblacklight/geometry.rb
 - lib/geoblacklight/item_viewer.rb
 - lib/geoblacklight/metadata.rb
@@ -747,6 +732,7 @@ files:
 - 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_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

data/lib/geoblacklight/faraday_middleware/follow_redirects.rb

@@ -1,179 +0,0 @@
-# frozen_string_literal: true
-
-# :nocov:
-# standard:disable Lint/RedundantRequireStatement
-require "faraday"
-require "set"
-# standard:enable Lint/RedundantRequireStatement
-
-module Geoblacklight
-  # NOTE: We copied this class from faraday_middleware in order to support
-  # both Faraday 1 & 2. If this middleware is ever extracted from
-  # faraday_middleware into its own gem we should remove this and use that
-  # instead.
-  module FaradayMiddleware
-    # Exception thrown when the maximum amount of requests is
-    # exceeded.
-    class RedirectLimitReached < ::Faraday::ClientError
-      attr_reader :response
-
-      def initialize(response)
-        super("too many redirects; last one to: #{response["location"]}")
-        @response = response
-      end
-    end
-
-    # Public: Follow HTTP 301, 302, 303, 307, and 308 redirects.
-    #
-    # For HTTP 301, 302, and 303, the original GET, POST, PUT, DELETE, or PATCH
-    # request gets converted into a GET. With `:standards_compliant => true`,
-    # however, the HTTP method after 301/302 remains unchanged. This allows you
-    # to opt into HTTP/1.1 compliance and act unlike the major web browsers.
-    #
-    # This middleware currently only works with synchronous requests; i.e. it
-    # doesn't support parallelism.
-    #
-    # If you wish to persist cookies across redirects, you could use
-    # the faraday-cookie_jar gem:
-    #
-    #   Faraday.new(:url => url) do |faraday|
-    #     faraday.use FaradayMiddleware::FollowRedirects
-    #     faraday.use :cookie_jar
-    #     faraday.adapter Faraday.default_adapter
-    #   end
-    #
-    class FollowRedirects < ::Faraday::Middleware
-      # HTTP methods for which 30x redirects can be followed
-      ALLOWED_METHODS = Set.new [:head, :options, :get, :post, :put, :patch, :delete]
-      # HTTP redirect status codes that this middleware implements
-      REDIRECT_CODES = Set.new [301, 302, 303, 307, 308]
-      # Keys in env hash which will get cleared between requests
-      ENV_TO_CLEAR = Set.new [:status, :response, :response_headers]
-
-      # Default value for max redirects followed
-      FOLLOW_LIMIT = 3
-
-      # Regex that matches characters that need to be escaped in URLs, sans
-      # the "%" character which we assume already represents an escaped sequence.
-      URI_UNSAFE = %r{[^\-_.!~*'()a-zA-Z\d;/?:@&=+$,\[\]%]}
-
-      AUTH_HEADER = "Authorization"
-
-      # Public: Initialize the middleware.
-      #
-      # options - An options Hash (default: {}):
-      #     :limit                      - A Numeric redirect limit (default: 3)
-      #     :standards_compliant        - A Boolean indicating whether to respect
-      #                                  the HTTP spec when following 301/302
-      #                                  (default: false)
-      #     :callback                   - A callable used on redirects
-      #                                  with the old and new envs
-      #     :cookies                    - An Array of Strings (e.g.
-      #                                  ['cookie1', 'cookie2']) to choose
-      #                                  cookies to be kept, or :all to keep
-      #                                  all cookies (default: []).
-      #     :clear_authorization_header - A Boolean indicating whether the request
-      #                                  Authorization header should be cleared on
-      #                                  redirects (default: true)
-      def initialize(app, options = {})
-        super(app)
-        @options = options
-
-        @convert_to_get = Set.new [303]
-        @convert_to_get << 301 << 302 unless standards_compliant?
-      end
-
-      def call(env)
-        perform_with_redirection(env, follow_limit)
-      end
-
-      private
-
-      def convert_to_get?(response)
-        [:head, :options].exclude?(response.env[:method]) &&
-          @convert_to_get.include?(response.status)
-      end
-
-      def perform_with_redirection(env, follows)
-        request_body = env[:body]
-        response = @app.call(env)
-
-        response.on_complete do |response_env|
-          if follow_redirect?(response_env, response)
-            fail RedirectLimitReached, response if follows.zero?
-
-            new_request_env = update_env(response_env.dup, request_body, response)
-            callback&.call(response_env, new_request_env)
-            response = perform_with_redirection(new_request_env, follows - 1)
-          end
-        end
-        response
-      end
-
-      def update_env(env, request_body, response)
-        redirect_from_url = env[:url].to_s
-        redirect_to_url = safe_escape(response["location"] || "")
-        env[:url] += redirect_to_url
-
-        ENV_TO_CLEAR.each { |key| env.delete key }
-
-        if convert_to_get?(response)
-          env[:method] = :get
-          env[:body] = nil
-        else
-          env[:body] = request_body
-        end
-
-        clear_authorization_header(env, redirect_from_url, redirect_to_url)
-
-        env
-      end
-
-      def follow_redirect?(env, response)
-        ALLOWED_METHODS.include?(env[:method]) &&
-          REDIRECT_CODES.include?(response.status)
-      end
-
-      def follow_limit
-        @options.fetch(:limit, FOLLOW_LIMIT)
-      end
-
-      def standards_compliant?
-        @options.fetch(:standards_compliant, false)
-      end
-
-      def callback
-        @options[:callback]
-      end
-
-      # Internal: escapes unsafe characters from an URL which might be a path
-      # component only or a fully qualified URI so that it can be joined onto an
-      # URI:HTTP using the `+` operator. Doesn't escape "%" characters so to not
-      # risk double-escaping.
-      def safe_escape(uri)
-        uri = uri.split("#")[0] # we want to remove the fragment if present
-        uri.to_s.gsub(URI_UNSAFE) do |match|
-          "%#{match.unpack("H2" * match.bytesize).join("%").upcase}"
-        end
-      end
-
-      def clear_authorization_header(env, from_url, to_url)
-        return env if redirect_to_same_host?(from_url, to_url)
-        return env unless @options.fetch(:clear_authorization_header, true)
-
-        env[:request_headers].delete(AUTH_HEADER)
-      end
-
-      def redirect_to_same_host?(from_url, to_url)
-        return true if to_url.start_with?("/")
-
-        from_uri = URI.parse(from_url)
-        to_uri = URI.parse(to_url)
-
-        [from_uri.scheme, from_uri.host, from_uri.port] ==
-          [to_uri.scheme, to_uri.host, to_uri.port]
-      end
-    end
-  end
-end
-# :nocov: