geoblacklight 4.4.2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6820d2f267605af373b65ad7bb940b1787eea36cb85ebde3a75d0ba198a5bb24
-  data.tar.gz: f2e9a5800739987386f67d4e9b248175102d5c347b42d05c80e754f567c11cb8
+  metadata.gz: bce174ac6134dedcbce46d7f91cb9b1cbcafce1f0eb74df43cdbbbc92b02506c
+  data.tar.gz: bfd8b45faefa2c480a519c171255baa4e8d0a578dae1f47992451d02c4b3c5cf
 SHA512:
-  metadata.gz: 7247b6f2706fe1e9b857a745b43efccddd4b05e93632afa1030ab76af71606759439a90830c03df5e637979e5c4dd68fe8f56fd1790cf7f3971119b0f03799e6
-  data.tar.gz: 7c2aaf7bc4c748a6afb5b943d3f908d1f8dd465d27d065a115ef45665a671d2c20e8d0ba8d9ae4c86383e8011fc64fa0dbdd9aeeb6ea379aa3566af9d8be7b54
+  metadata.gz: 27342c0aee318bfb0a322d312ec908fe42f5da4811da89cd281ffd983e4fb42090c43ec595cbc92b0310bc08682addcd57af56eb57915181153e1b48cf8a9b96
+  data.tar.gz: 9802692c62ef7ded4908e7bab01e9e56d3ee7b7125036f724907d51b286284f6a9fe9baed539a433ff30ef52abda33ba535c92a76800d68b3e758e48db2b5988

data/.github/workflows/ruby.yml

@@ -10,7 +10,7 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -23,7 +23,7 @@ jobs:
   aardvark-fixture-linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -37,12 +37,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version: ['3.2', '3.3']
-        rails_version: [6.1.7.6, 7.1.3, 7.2.0]
+        ruby_version: ['3.2', '3.3', '3.4']
+        rails_version: ['7.1.5.1', '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:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -68,8 +71,8 @@ jobs:
         ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-webpack-install --skip-javascript'
         SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
     - name: Upload coverage artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: coverage
+        name: "coverage-${{ matrix.ruby_version }}-${{ matrix.rails_version }}"
         path: coverage/

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", ">= 6.1", "< 7.3"
-  spec.add_dependency "blacklight", "~> 7.0"
+  spec.add_dependency "rails", ">= 7", "< 8.1"
+  spec.add_dependency "blacklight", ">= 7.41", "< 8.0"
   spec.add_dependency "config"
   spec.add_dependency "faraday", "~> 2.0"
   spec.add_dependency "coderay"

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.2"
+  VERSION = "4.5.0"
 end

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

@@ -8,14 +8,6 @@ class TestAppGenerator < Rails::Generators::Base
   def add_gems
     gem "blacklight"
 
-    # In CI, Javascript and Webpacker are removed when generating Rails 6.x
-    # applications to enable Vite. Disabling javascript during test app
-    # generation removes Turbolinks. This gem is required and needs to be
-    # re-added.
-    if ENV["RAILS_VERSION"] && Gem::Version.new(ENV["RAILS_VERSION"]) < Gem::Version.new("7.0")
-      gem "turbolinks"
-    end
-
     Bundler.with_clean_env do
       run "bundle install"
     end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.5.0
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2025-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,34 +18,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.3'
+        version: '8.1'
 - !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
@@ -385,7 +390,6 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/blacklight/american-geographical-society-library-uwm-libraries.svg
-- app/assets/images/blacklight/arizona.svg
 - app/assets/images/blacklight/arrow-circle-down.svg
 - app/assets/images/blacklight/baruch-cuny.svg
 - app/assets/images/blacklight/book.svg
@@ -453,6 +457,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
@@ -462,6 +467,7 @@ files:
 - app/assets/images/blacklight/triangle-exclamation-solid.svg
 - app/assets/images/blacklight/tufts.svg
 - app/assets/images/blacklight/ucla.svg
+- app/assets/images/blacklight/university-of-arizona.svg
 - app/assets/images/blacklight/university-of-california-berkeley.svg
 - app/assets/images/blacklight/university-of-chicago.svg
 - app/assets/images/blacklight/university-of-colorado-boulder.svg
@@ -892,7 +898,6 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -907,8 +912,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.2
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A discovery platform for geospatial holdings
 test_files: []