geoblacklight 5.0.2 → 5.2.0

data/template.rb

@@ -1,29 +1,16 @@
 # frozen_string_literal: true
 
-gem "blacklight", "~> 8.0"
-
-# Ensure the app generates with Propshaft; sprockets is no longer supported
-# https://github.com/geoblacklight/geoblacklight/issues/1265
-ENV["ENGINE_CART_RAILS_OPTIONS"] = ENV["ENGINE_CART_RAILS_OPTIONS"].to_s + " -a propshaft --css bootstrap"
-
-# Use importmaps for JS if requested, otherwise default to vite
-ENV["ENGINE_CART_RAILS_OPTIONS"] += if ENV["ASSET_PIPELINE"] == "importmap"
-  " --js importmap"
-else
-  " --js rollup"
-end
-
-# Install latest version of geoblacklight gem if running
-# generator with a development branch.
+# Set BRANCH=<branch_name> to install from a specific branch
 if ENV["BRANCH"]
   gem "geoblacklight", github: "geoblacklight/geoblacklight", branch: ENV["BRANCH"]
 else
-  gem "geoblacklight", "~> 5.0"
+  gem "geoblacklight"
 end
 
 run "bundle install"
 
-generate "blacklight:install", "--devise", "--skip-solr"
-generate "geoblacklight:install", "-f"
-
-rake "db:migrate"
+after_bundle do
+  generate "blacklight:install", ENV.fetch("BLACKLIGHT_INSTALL_OPTIONS", "--devise --skip-solr")
+  generate "geoblacklight:install"
+  rails_command "db:migrate"
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: geoblacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.2.0
 platform: ruby
 authors:
 - Mike Graves
 - Darren Hardy
 - Eliot Jordan
 - Jack Reed
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -370,8 +369,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/build-demo-app.yml"
-- ".github/workflows/prune-containers.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".standard.yml"
@@ -543,7 +541,6 @@ files:
 - app/controllers/wms_controller.rb
 - app/helpers/geoblacklight_helper.rb
 - app/javascript/geoblacklight/controllers/clipboard_controller.js
-- app/javascript/geoblacklight/controllers/clover_viewer_controller.js
 - app/javascript/geoblacklight/controllers/downloads_controller.js
 - app/javascript/geoblacklight/controllers/leaflet_viewer_controller.js
 - app/javascript/geoblacklight/controllers/oembed_viewer_controller.js
@@ -608,9 +605,6 @@ files:
 - lib/generators/geoblacklight/templates/assets/geoblacklight.scss
 - lib/generators/geoblacklight/templates/base.html.erb
 - lib/generators/geoblacklight/templates/catalog_controller.rb
-- lib/generators/geoblacklight/templates/demo-app/Dockerfile
-- lib/generators/geoblacklight/templates/demo-app/compose.yml
-- lib/generators/geoblacklight/templates/demo-app/start-server.sh
 - lib/generators/geoblacklight/templates/settings.yml
 - lib/generators/geoblacklight/templates/vite.config.ts
 - lib/generators/geoblacklight/templates/vite.json
@@ -785,7 +779,6 @@ files:
 - spec/features/full_screen_control_spec.rb
 - spec/features/help_text_spec.rb
 - spec/features/home_page_spec.rb
-- spec/features/iiif_viewer_spec.rb
 - spec/features/index_map_spec.rb
 - spec/features/index_view_spec.rb
 - spec/features/layer_inspection_spec.rb
@@ -940,7 +933,6 @@ homepage: http://github.com/geoblacklight/geoblacklight
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -955,8 +947,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: []

data/.github/workflows/build-demo-app.yml

@@ -1,156 +0,0 @@
-name: Build demo app
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-  schedule:
-    - cron: "0 1 * * SUN"  # every sunday at 1AM
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-  BRANCH: ${{ github.head_ref || github.ref_name }}
-
-jobs:
-  build-app:
-    runs-on: ubuntu-latest
-    outputs:
-      artifact-url: ${{ steps.artifact-upload-step.outputs.artifact-url }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3.4
-
-      - name: Install dependencies
-        run: bundle install
-        env:
-          RAILS_VERSION: "7.2.2.1"
-
-      - name: Build frontend package
-        run: |
-          yarn install
-          yarn build
-          yarn link
-
-      - name: Build
-        run: BRANCH=${{ env.BRANCH }} rails new build -m template.rb -a propshaft --css bootstrap --js rollup
-
-      - name: Cleanup
-        run: rm -rf build/node_modules build/Gemfile.lock build/yarn.lock build/tmp
-
-      - name: Copy Dockerfile
-        run: cp lib/generators/geoblacklight/templates/demo-app/Dockerfile build/.
-
-      - name: Copy demo-app compose.yml
-        run: cp -f lib/generators/geoblacklight/templates/demo-app/compose.yml build/.
-
-      - name: Copy start-server script
-        run: cp lib/generators/geoblacklight/templates/demo-app/start-server.sh build/.
-
-      - name: Copy fixture solr documents
-        run:  mkdir -p build/spec/fixtures && cp -R spec/fixtures/solr_documents build/spec/fixtures/.
-
-      - name: Replace main image tag with pr tag
-        if: github.ref_name != 'main'
-        run: sed -i 's/main/pr-${{ github.event.number }}/g'  build/compose.yml
-
-      - name: Upload app build
-        uses: actions/upload-artifact@v4
-        id: artifact-upload-step
-        with:
-          name: build-${{ env.BRANCH }}
-          path: build/
-
-  build-docker:
-    runs-on: ubuntu-latest
-    needs:
-      - build-app
-    steps:
-      - name: Download app build
-        uses: actions/download-artifact@v4
-        with:
-          name: build-${{ env.BRANCH }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=sha
-        env:
-          DOCKER_METADATA_PR_HEAD_SHA: true
-
-        # Rebuild base context when triggered by schedule or workflow_dispatch
-      - name: Build and push base Docker image
-        uses: docker/build-push-action@v6
-        if: github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
-        with:
-          context: "${{ github.workspace }}"
-          file: "${{ github.workspace }}/Dockerfile"
-          push: true
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ghcr.io/geoblacklight/geoblacklight:base
-          target: "base"
-
-        # Build only the app context. Build times are faster because most
-        # gems and node packages are already installed in the base context.
-      - name: Build and push branch Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: "${{ github.workspace }}"
-          file: "${{ github.workspace }}/Dockerfile"
-          push: true
-          platforms: linux/amd64,linux/arm64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          target: "app"
-
-  notify:
-    runs-on: ubuntu-latest
-    if: github.ref_name != 'main'
-    needs:
-      - build-app
-      - build-docker
-    permissions:
-      contents: read
-      packages: write
-      pull-requests: write
-    steps:
-      - name: Add artifact link to PR comments
-        uses: mshick/add-pr-comment@v2
-        with:
-          message: |
-            Demo app download link: ${{ needs.build-app.outputs.artifact-url }}
-
-            1. Download demo app and unzip file
-            2. Change into app directory
-                - run `docker compose pull`
-                - run `docker compose up`
-            3. Open in browser
-                - App:  http://127.0.0.1:3001
-                - Solr: http://127.0.0.1:8984

data/.github/workflows/prune-containers.yml

@@ -1,19 +0,0 @@
-name: Prune containers
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * SUN"  # every sunday at midnight
-
-jobs:
-  clean:
-    runs-on: ubuntu-latest
-    name: Delete old images
-    steps:
-      - uses: snok/container-retention-policy@v3.0.0
-        with:
-          account: geoblacklight
-          image-names: geoblacklight
-          token: ${{ secrets.GITHUB_TOKEN }}
-          image-tags: "!main !base"
-          cut-off: 2w

data/app/javascript/geoblacklight/controllers/clover_viewer_controller.js

@@ -1,47 +0,0 @@
-import { createElement } from "react";
-import { createRoot } from "react-dom/client";
-import Viewer from "@samvera/clover-iiif/viewer";
-import Image from "@samvera/clover-iiif/image";
-import { Controller } from "@hotwired/stimulus";
-
-const viewerOptions = {
-  showTitle: false,
-  showIIIFBadge: false,
-  informationPanel: {
-    renderToggle: false,
-    renderAbout: false,
-  },
-};
-
-export default class CloverViewerController extends Controller {
-  static values = {
-    url: String,
-    protocol: String,
-  };
-
-  connect() {
-    const root = createRoot(this.element);
-    root.render(this.getViewer(this.protocolValue, this.urlValue));
-  }
-
-  getViewer(protocol, url) {
-    if (protocol == "Iiif") {
-      // Create a wrapper div with inline style, as recommended in the docs:
-      // https://samvera-labs.github.io/clover-iiif/docs/image#react
-      return createElement(
-        "div",
-        { style: { height: 400 } },
-        createElement(Image, {
-          src: url.replace(/\/info\.json$/, ""),
-          isTiledImage: true,
-        })
-      );
-    }
-    if (protocol == "IiifManifest")
-      return createElement(Viewer, {
-        iiifContent: url,
-        options: viewerOptions,
-      });
-    console.error(`Unsupported protocol name: "${protocol}"`);
-  }
-}

data/lib/generators/geoblacklight/templates/demo-app/Dockerfile

@@ -1,31 +0,0 @@
-# syntax = docker/dockerfile:1
-
-# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.4
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
-
-RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y build-essential git pkg-config nodejs npm curl libsqlite3-0
-
-RUN npm install --global yarn
-
-ENV RAILS_ENV="development" \
-    BUNDLE_PATH="/usr/local/bundle"
-
-# Rails app lives here
-WORKDIR /rails
-
-# Install gems and javascript packages
-COPY Gemfile .
-RUN bundle install
-COPY package.json .
-RUN yarn install
-
-FROM ghcr.io/geoblacklight/geoblacklight:base AS app
-
-# Add application code
-COPY . .
-
-# Run the server script by default, this can be overwritten at runtime
-EXPOSE 3000
-CMD ["sh", "start-server"]

data/lib/generators/geoblacklight/templates/demo-app/compose.yml

@@ -1,26 +0,0 @@
-services:
-  app:
-    image: ghcr.io/geoblacklight/geoblacklight:main
-    ports:
-      - "3001:3001"
-    links:
-      - "solr:solr"
-    environment:
-      SOLR_URL: "http://solr:8983/solr/blacklight-core"
-      RAILS_DEVELOPMENT_HOSTS: ".githubpreview.dev,.preview.app.github.dev,.app.github.dev,.csb.app"
-    depends_on:
-      - solr
-    command: sh start-server.sh
-  solr:
-    image: solr:9.6.1
-    volumes:
-      - $PWD/solr/conf:/opt/solr/conf
-    ports:
-      - 8984:8983
-    entrypoint:
-      - docker-entrypoint.sh
-      - solr-precreate
-      - blacklight-core
-      - /opt/solr/conf
-      - "-Xms256m"
-      - "-Xmx512m"

data/lib/generators/geoblacklight/templates/demo-app/start-server.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-bundle install
-yarn install
-
-# Build and Install local copy of @geoblackligt/frontend
-# These steps are included in the docker image instead if the image build script
-# to reduce the size of the layers that docker compose has to pull with each new version.
-gempath=$(bundle exec gem which geoblacklight | sed 's/\/lib\/geoblacklight.rb//')
-if [ ! -d "$gempath/dist/" ]; then
-  cd $gempath
-  yarn install
-  yarn vite build
-  cd -
-fi
-yarn add file:$gempath
-
-# Start the server
-bundle exec rake db:prepare
-bundle exec rake geoblacklight:index:seed
-bundle exec rails server -b 0.0.0.0 -p 3001

data/spec/features/iiif_viewer_spec.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-feature "iiif reference" do
-  scenario "displays leaflet viewer", js: true do
-    visit solr_document_path("princeton-02870w62c")
-    expect(page).to have_css '[data-button="zoom-in"]', visible: true
-  end
-end