geoblacklight 4.4.3 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52b5acf220b42925f6e5f561184695d15258224f89e289a9c136b578b43db42c
-  data.tar.gz: e67f2ad90acf15e3d1557ca3ae1962a491088f7d9d0ff7a0fcaf4f7e641f2b85
+  metadata.gz: 70ec0fdb43d31e4d9c2d4d5902e5a5d19ea35a6171e6b37f74d9a3fbfd937661
+  data.tar.gz: f4b212c5ec24ee1c4c0263e8c0e1ba2c51c0ebcd7e70cf32ae5ccfe6e0a78d15
 SHA512:
-  metadata.gz: 007346f8ec5c7e3b81c33f4b7835a10a3eb07c5a3885f9ba965d7af18263572d21f06d03267598a54e3ebb55207b888797c559f39fcb2df65d3d678d7d390c44
-  data.tar.gz: f9bde64443e74953e95cd77a1324e9d3369944ae693efb518b0bfaca1f0990cdf35027094b185145b38bd341b96bf2427cd94b92f774d7c70f2f7979720c5a95
+  metadata.gz: 9a6612a445ce525cd2610b4cc0c83a509a523b13e27ea3ee6314ee5f48cbb6da479f9e103c50ae75312911780e39740db155c9d1b6015a05e5dddd71e2237710
+  data.tar.gz: 0fc319d965119d9d7dd79456930fd6f4c32288d68967b9f408adf2da44c4096c7e99f39fe8e575021ef515f705a69e61f7513869774d7a87373972bcbfebebaa

data/.github/workflows/ruby.yml

@@ -37,8 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['3.2', '3.3']
-        rails_version: [7.1.3, 7.2.0]
+        ruby_version: ['3.2', '3.3', '3.4']
+        rails_version: ['7.2.2.1', '8.0.2']
+        exclude:
+          - ruby_version: '3.2'
+            rails_version: '8.0.2'
 
     name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }}
     steps:

data/.solr_wrapper

@@ -1,3 +1,4 @@
+version: 8.11.4
 validate: false
 instance_dir: tmp/solr
 download_dir: tmp/solr

data/app/assets/images/blacklight/circle-info-solid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! https://fontawesome.com/license (Commercial License) 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z"/></svg>

data/app/assets/images/blacklight/fire-solid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M159.3 5.4c7.8-7.3 19.9-7.2 27.7 .1c27.6 25.9 53.5 53.8 77.7 84c11-14.4 23.5-30.1 37-42.9c7.9-7.4 20.1-7.4 28 .1c34.6 33 63.9 76.6 84.5 118c20.3 40.8 33.8 82.5 33.8 111.9C448 404.2 348.2 512 224 512C98.4 512 0 404.1 0 276.5c0-38.4 17.8-85.3 45.4-131.7C73.3 97.7 112.7 48.6 159.3 5.4zM225.7 416c25.3 0 47.7-7 68.8-21c42.1-29.4 53.4-88.2 28.1-134.4c-4.5-9-16-9.6-22.5-2l-25.2 29.3c-6.6 7.6-18.5 7.4-24.7-.5c-16.5-21-46-58.5-62.8-79.8c-6.3-8-18.3-8.1-24.7-.1c-33.8 42.5-50.8 69.3-50.8 99.4C112 375.4 162.6 416 225.7 416z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! https://fontawesome.com/license (Commercial License) 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M159.3 5.4c7.8-7.3 19.9-7.2 27.7 .1c27.6 25.9 53.5 53.8 77.7 84c11-14.4 23.5-30.1 37-42.9c7.9-7.4 20.1-7.4 28 .1c34.6 33 63.9 76.6 84.5 118c20.3 40.8 33.8 82.5 33.8 111.9C448 404.2 348.2 512 224 512C98.4 512 0 404.1 0 276.5c0-38.4 17.8-85.3 45.4-131.7C73.3 97.7 112.7 48.6 159.3 5.4zM225.7 416c25.3 0 47.7-7 68.8-21c42.1-29.4 53.4-88.2 28.1-134.4c-4.5-9-16-9.6-22.5-2l-25.2 29.3c-6.6 7.6-18.5 7.4-24.7-.5c-16.5-21-46-58.5-62.8-79.8c-6.3-8-18.3-8.1-24.7-.1c-33.8 42.5-50.8 69.3-50.8 99.4C112 375.4 162.6 416 225.7 416z"/></svg>

data/app/assets/images/blacklight/lightbulb-solid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M272 384c9.6-31.9 29.5-59.1 49.2-86.2l0 0c5.2-7.1 10.4-14.2 15.4-21.4c19.8-28.5 31.4-63 31.4-100.3C368 78.8 289.2 0 192 0S16 78.8 16 176c0 37.3 11.6 71.9 31.4 100.3c5 7.2 10.2 14.3 15.4 21.4l0 0c19.8 27.1 39.7 54.4 49.2 86.2H272zM192 512c44.2 0 80-35.8 80-80V416H112v16c0 44.2 35.8 80 80 80zM112 176c0 8.8-7.2 16-16 16s-16-7.2-16-16c0-61.9 50.1-112 112-112c8.8 0 16 7.2 16 16s-7.2 16-16 16c-44.2 0-80 35.8-80 80z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><!--! https://fontawesome.com/license (Commercial License) 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M272 384c9.6-31.9 29.5-59.1 49.2-86.2l0 0c5.2-7.1 10.4-14.2 15.4-21.4c19.8-28.5 31.4-63 31.4-100.3C368 78.8 289.2 0 192 0S16 78.8 16 176c0 37.3 11.6 71.9 31.4 100.3c5 7.2 10.2 14.3 15.4 21.4l0 0c19.8 27.1 39.7 54.4 49.2 86.2H272zM192 512c44.2 0 80-35.8 80-80V416H112v16c0 44.2 35.8 80 80 80zM112 176c0 8.8-7.2 16-16 16s-16-7.2-16-16c0-61.9 50.1-112 112-112c8.8 0 16 7.2 16 16s-7.2 16-16 16c-44.2 0-80 35.8-80 80z"/></svg>

data/app/assets/images/blacklight/search.svg

@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" aria-label="Search" role="img">
+  <title>Search</title>
+  <path fill="none" d="M0 0h24v24H0V0z"></path>
+  <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
+</svg>

data/app/assets/images/blacklight/triangle-exclamation-solid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480H40c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24V296c0 13.3 10.7 24 24 24s24-10.7 24-24V184c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! https://fontawesome.com/license (Commercial License) 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2023 Fonticons, Inc. --><path fill="#6c757d" d="M256 32c14.2 0 27.3 7.5 34.5 19.8l216 368c7.3 12.4 7.3 27.7 .2 40.1S486.3 480 472 480H40c-14.3 0-27.6-7.7-34.7-20.1s-7-27.8 .2-40.1l216-368C228.7 39.5 241.8 32 256 32zm0 128c-13.3 0-24 10.7-24 24V296c0 13.3 10.7 24 24 24s24-10.7 24-24V184c0-13.3-10.7-24-24-24zm32 224a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"/></svg>

data/geoblacklight.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_rubygems_version = ">= 2.5.2"
 
-  spec.add_dependency "rails", ">= 7", "< 7.3"
-  spec.add_dependency "blacklight", "~> 7.0"
+  spec.add_dependency "rails", ">= 7", "< 8.2"
+  spec.add_dependency "blacklight", ">= 7.41", "< 8.0"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"
   spec.add_dependency "coderay"
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "engine_cart", "~> 2.0"
   spec.add_development_dependency "capybara", ">= 2.5.0"
-  spec.add_development_dependency "webdrivers"
+  spec.add_development_dependency "selenium-webdriver"
   spec.add_development_dependency "factory_bot_rails"
   spec.add_development_dependency "database_cleaner", "~> 2.0"
   spec.add_development_dependency "simplecov", "~> 0.22"

data/lib/generators/geoblacklight/install_generator.rb

@@ -117,6 +117,20 @@ module Geoblacklight
       copy_file "base.html.erb", "app/views/layouts/blacklight/base.html.erb"
     end
 
+    # Ensure Sprockets is used instead of Propshaft
+    def ensure_sprockets
+      gemfile = File.read("Gemfile")
+      propshaft_present = gemfile.match?(/^\s*gem\s+["']propshaft["'].*$/)
+      if propshaft_present
+        gsub_file "Gemfile", /^(\s*gem\s+["']propshaft["'].*)$/, '# \1'
+      end
+      unless gemfile.match?(/gem ['\"]sprockets-rails['\"]/)
+        append_to_file "Gemfile" do
+          "\ngem 'sprockets-rails'\n"
+        end
+      end
+    end
+
     def copy_package_json
       if options[:test]
         # If building engine cart test app, use specific package.json so the

data/lib/generators/geoblacklight/templates/package-test.json

@@ -1,10 +1,10 @@
 {
-  "devDependencies": {
-    "vite": "^5.1.5",
-    "vite-plugin-ruby": "^5.0.0",
-    "vite-plugin-rails": "^0.5.0"
+  "dependencies": {
+    "@geoblacklight/frontend": "^4.4.6"
   },
-  "scripts": {
-    "postinstall": "yarn link @geoblacklight/frontend"
+  "devDependencies": {
+    "vite": "^5.0.0",
+    "vite-plugin-rails": "^0.5.0",
+    "vite-plugin-ruby": "^5.1.0"
   }
 }

data/lib/geoblacklight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geoblacklight
-  VERSION = "4.4.3"
+  VERSION = "4.5.1"
 end

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,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.5.1
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -21,7 +22,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,21 +32,27 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.41'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.41'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: config
   requirement: !ruby/object:Gem::Requirement
@@ -257,7 +264,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:
     - - ">="
@@ -451,6 +458,7 @@ files:
 - app/assets/images/blacklight/raster.svg
 - app/assets/images/blacklight/restricted.svg
 - app/assets/images/blacklight/rutgers.svg
+- app/assets/images/blacklight/search.svg
 - app/assets/images/blacklight/sms.svg
 - app/assets/images/blacklight/stanford.svg
 - app/assets/images/blacklight/table.svg
@@ -891,6 +899,7 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -905,7 +914,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files: []