geoblacklight 4.5.0 → 4.6.0

data/spec/lib/geoblacklight/references_spec.rb

@@ -227,4 +227,28 @@ describe Geoblacklight::References do
       expect(direct_download_only.downloads_by_format).to be_nil
     end
   end
+  describe "#format with a document that is not a SolrDocument" do
+    let(:plain_document) do
+      Class.new do
+        def initialize(attributes)
+          @attributes = attributes
+        end
+
+        def [](key)
+          @attributes[key]
+        end
+      end
+    end
+
+    it "warns that GeoBlacklight 5 calls #file_format on the document" do
+      document = plain_document.new(
+        Settings.FIELDS.FORMAT => "Shapefile",
+        Settings.FIELDS.REFERENCES => "{}"
+      )
+
+      expect(Geoblacklight.deprecation).to receive(:warn).with(/does not respond to #file_format/)
+
+      expect(described_class.new(document).format).to eq "Shapefile"
+    end
+  end
 end

data/spec/models/concerns/geoblacklight/solr_document/citation_spec.rb

@@ -11,5 +11,21 @@ describe Geoblacklight::SolrDocument::Citation do
       expect(document.geoblacklight_citation("http://example.com"))
         .to eq "United States. National Oceanic and Atmospheric Administration. Circuit Rider Productions. (2002). 10 Meter Contours: Russian River Basin, California. [Shapefile]. Circuit Rider Productions. Retrieved from http://example.com"
     end
+
+    describe "with more than one publisher" do
+      let(:document) { SolrDocument.new(fixture.merge(Settings.FIELDS.PUBLISHER => ["First", "Second"])) }
+
+      it "warns that GeoBlacklight 5 keeps only the first publisher" do
+        expect(Geoblacklight.deprecation).to receive(:warn).with(/will lose its other publishers/)
+        document.geoblacklight_citation("http://example.com")
+      end
+    end
+
+    describe "with a single publisher" do
+      it "does not warn" do
+        expect(Geoblacklight.deprecation).not_to receive(:warn)
+        document.geoblacklight_citation("http://example.com")
+      end
+    end
   end
 end

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

@@ -64,6 +64,54 @@ describe Geoblacklight::SolrDocument do
       end
     end
   end
+  describe "deprecations for GeoBlacklight 5 behavior changes" do
+    describe "#restricted?" do
+      describe "with rights data that is present but blank" do
+        let(:document_attributes) { {rights_field => ""} }
+        it "warns that GeoBlacklight 5 stops treating the document as restricted" do
+          expect(Geoblacklight.deprecation).to receive(:warn).with(
+            /#restricted\? returns true for a document whose .* is present but blank/
+          )
+          expect(document.restricted?).to be true
+        end
+      end
+
+      describe "without rights data at all" do
+        let(:document_attributes) { {} }
+        it "does not warn" do
+          expect(Geoblacklight.deprecation).not_to receive(:warn)
+          expect(document.restricted?).to be true
+        end
+      end
+    end
+
+    describe "#geom_field and #wxs_identifier" do
+      describe "when the Solr field is missing" do
+        let(:document_attributes) { {} }
+        it "warns that GeoBlacklight 5 returns nil rather than an empty string" do
+          expect(Geoblacklight.deprecation).to receive(:warn).with(/#geom_field returns "" for a document/)
+          expect(document.geom_field).to eq ""
+        end
+
+        it "warns for wxs_identifier too" do
+          expect(Geoblacklight.deprecation).to receive(:warn).with(/#wxs_identifier returns "" for a document/)
+          expect(document.wxs_identifier).to eq ""
+        end
+      end
+
+      describe "when the Solr field is present" do
+        let(:document_attributes) do
+          {Settings.FIELDS.GEOMETRY => "ENVELOPE(-1,1,1,-1)", Settings.FIELDS.WXS_IDENTIFIER => "cite:foo"}
+        end
+        it "does not warn" do
+          expect(Geoblacklight.deprecation).not_to receive(:warn)
+          expect(document.geom_field).to eq "ENVELOPE(-1,1,1,-1)"
+          expect(document.wxs_identifier).to eq "cite:foo"
+        end
+      end
+    end
+  end
+
   describe "#downloadable?" do
     describe "available direct download" do
       let(:document_attributes) do

data/spec/spec_helper.rb

@@ -30,25 +30,28 @@ require "rails-controller-testing" if Rails::VERSION::MAJOR >= 5
 require "rspec/rails"
 require "capybara/rspec"
 require "selenium-webdriver"
-require "webdrivers"
 
 # Setup webmock for specific tests
 require "webmock/rspec"
 WebMock.allow_net_connect!(net_http_connect_on_start: true)
 
-Capybara.register_driver(:selenium) do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new(args: %w[headless disable-gpu disable-setuid-sandbox window-size=7680,4320])
+Capybara.register_driver :chrome_headless do |app|
+  # Set up Chrome options
+  options = Selenium::WebDriver::Chrome::Options.new
+  options.add_argument("--headless")
+  options.add_argument("--disable-gpu")
+  options.add_argument("--no-sandbox")
+  options.add_argument("--window-size=1280,1024")
 
-  http_client = Selenium::WebDriver::Remote::Http::Default.new
-  http_client.read_timeout = 120
-  http_client.open_timeout = 120
-  Capybara::Selenium::Driver.new(app,
-    browser: :chrome,
-    options: browser_options,
-    http_client: http_client)
+  # Allow longer TCP reads to prevent timeout in the case of loading fixture
+  # eee6150b-ce2f-4837-9d17-ce72a0c1c26f, as part of relations_spec.rb
+  client = Selenium::WebDriver::Remote::Http::Default.new
+  client.read_timeout = 120 # seconds
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options, http_client: client)
 end
 
-Capybara.javascript_driver = :selenium
+Capybara.javascript_driver = :chrome_headless
 Capybara.default_max_wait_time = 120
 
 require "geoblacklight"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Mike Graves
@@ -10,7 +10,7 @@ authors:
 - Jack Reed
 bindir: bin
 cert_chain: []
-date: 2025-07-25 00:00:00.000000000 Z
+date: 2026-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,7 +21,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
-  name: webdrivers
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -640,6 +640,7 @@ files:
 - lib/geoblacklight.rb
 - lib/geoblacklight/bounding_box.rb
 - lib/geoblacklight/constants.rb
+- lib/geoblacklight/deprecated_configuration.rb
 - lib/geoblacklight/download.rb
 - lib/geoblacklight/download/geojson_download.rb
 - lib/geoblacklight/download/geotiff_download.rb
@@ -828,6 +829,7 @@ files:
 - spec/javascripts/metadata_download_button_spec.js
 - spec/javascripts/util_spec.js
 - spec/lib/geoblacklight/bounding_box_spec.rb
+- spec/lib/geoblacklight/deprecated_configuration_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