geoblacklight_sidecar_images 1.1.2 → 2.0.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f74fdd81e5f08c824eba396159f470b729ee1647a0b20d75801f05fd697d71a
-  data.tar.gz: 230beb9912150c2a54ed91f2e2af0381edbaef85040d2e6b6f84d5ac735585f2
+  metadata.gz: ab3fbb4fea06b510373aacfcac11b0a9941c088140939a0f58f5cfbd5e7617a2
+  data.tar.gz: 969301942ddb0601b14e2cc05d2d59708a71abda75dd2349f705c918d4007fe2
 SHA512:
-  metadata.gz: a41f54bddf89f1090f161c1138ac6f43216a28240bb95152de1c2d2688cc24e6030bad2b873ce1a801e6efc3ebb8d51c39c38d8f84234e649f55f1a07207e51a
-  data.tar.gz: dcf8b061b2c66f8c3ae772f3a33f5b479cffd991cb0d906a7004dfc9affa0c966395c7469ab89daae038dffe199931761ca818d39107d7b27505176545f13def
+  metadata.gz: d2577da5f702ede9ac232880d3f9d3114aea42c57c34a256c345db46bd075dc6c4729fc10a25dc4f37f4618cb262b139c859ef1142f8b3b62caed497a64f652c
+  data.tar.gz: ab4297ae1e5c68b9adc5fdb81831f2d415c480b52f67baeb33bd65006fcd38fb34b9ce7e103646361eb504b58e6d6c39801cad67042f9474c04c208d3c554263

data/.github/workflows/ruby.yml

@@ -4,74 +4,76 @@ on:
   push:
     branches:
       - main
-      - feature/github-actions
+      - develop
   pull_request:
 
 jobs:
   linter:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        bundler_version: [2.2.8]
-        faraday_version: ['~> 2.0']
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.3.1
-    - name: Install bundler
-      run: gem install bundler -v ${{ matrix.bundler_version }}
-    - name: Install dependencies
-      run: bundle _${{ matrix.bundler_version }}_ install
-      env:
-        FARADAY_VERSION: ${{ matrix.faraday_version }}
-    - name: Run linter
-      run: bundle exec standardrb
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: true
+      - name: Run linter
+        run: bundle exec standardrb
 
   test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby_version: [3.3.1]
-        rails_version: [7.1.3.2, 7.0.8.1]
-        bundler_version: [2.2.8]
-        faraday_version: ['~> 2.0']
+        include:
+          - ruby_version: "3.3"
+            rails_version: "7.2.2"
+            geoblacklight_version: "~> 4.4"
+            engine_cart_options: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-test --skip-docker --skip-rubocop --skip-brakeman --skip-kamal --skip-solid --skip-bundle"
+          - ruby_version: "3.4"
+            rails_version: "8.1.3"
+            geoblacklight_version: "~> 5.3"
+            engine_cart_options: "--skip-docker --skip-action-cable --skip-rubocop --skip-brakeman --skip-kamal --skip-solid --skip-thruster --skip-bundle -a propshaft --css bootstrap --js importmap"
+          - ruby_version: "4.0"
+            rails_version: "8.1.3"
+            geoblacklight_version: "6.0.0.pre.alpha.7"
+            engine_cart_options: "--skip-docker --skip-action-cable --skip-rubocop --skip-brakeman --skip-kamal --skip-solid --skip-thruster --skip-bundle -a propshaft --css bootstrap --js importmap"
 
-    name: test ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / faraday ${{ matrix.faraday_version }}
+    name: ruby ${{ matrix.ruby_version }} / rails ${{ matrix.rails_version }} / gbl ${{ matrix.geoblacklight_version }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-    - name: Create Solr container
-      run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
-    - name: Install bundler
-      run: gem install bundler -v ${{ matrix.bundler_version }}
-    - name: Install dependencies
-      run: bundle _${{ matrix.bundler_version }}_ install
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-        FARADAY_VERSION: ${{ matrix.faraday_version }}
-    - name: Setup Yarn
-      run: exec "yarnpkg"
-    - name: Load config into solr
-      run: |
-          cd solr/conf
-          zip -1 -r solr_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
-          curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: ${{ matrix.rails_version }}
-        FARADAY_VERSION: ${{ matrix.faraday_version }}
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-        SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
-    - name: Upload coverage artifacts
-      uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: coverage
-        path: coverage/
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+      - name: Install libvips and ImageMagick
+        run: sudo apt-get update && sudo apt-get install -y libvips42 imagemagick
+      - name: Create Solr container
+        run: docker run -d -p 8983:8983 geoblacklight/solr:8.9-v1.0.0 server/scripts/ci-start.sh
+      - name: Install dependencies
+        run: bundle install
+        env:
+          RAILS_VERSION: ${{ matrix.rails_version }}
+          GEOBLACKLIGHT_VERSION: ${{ matrix.geoblacklight_version }}
+      - name: Setup Yarn
+        run: exec "yarnpkg"
+      - name: Load config into solr
+        run: |
+            cd solr/conf
+            zip -1 -r solr_config.zip ./*
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_config.zip "http://solr:SolrRocks@127.0.0.1:8983/solr/admin/configs?action=UPLOAD&name=blacklight"
+            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8983/api/collections/  -d '{create: {name: blacklight-core, config: blacklight, numShards: 1}}'
+      - name: Run tests
+        run: bundle exec rake ci
+        env:
+          RAILS_VERSION: ${{ matrix.rails_version }}
+          GEOBLACKLIGHT_VERSION: ${{ matrix.geoblacklight_version }}
+          ENGINE_CART_RAILS_OPTIONS: ${{ matrix.engine_cart_options }}
+          SOLR_URL: http://solr:SolrRocks@localhost:8983/solr/blacklight-core
+          BUNDLE_SPECIFIC_PLATFORM: "true"
+      - name: Upload coverage artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: coverage-ruby${{ matrix.ruby_version }}-rails${{ matrix.rails_version }}
+          path: coverage/

data/Gemfile

@@ -1,27 +1,13 @@
 source "https://rubygems.org"
 
-# Declare your gem's dependencies in geoblacklight_sidecar_images.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-
-# Please see geoblacklight_sidecar_images.gemspec for dependency information.
 gemspec
 
-# Declare any dependencies that are still in development here instead of in
-# your gemspec. These might include edge Rails or gems from your path or
-# Git. Remember to move these dependencies to your gemspec before releasing
-# your gem to rubygems.org.
-
-group :development, :test do
-end
-
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
+# Ruby 4 removed cgi from default gems
+gem "cgi" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("4.0.0")
 
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 1.2.0
 # engine_cart stanza: 0.10.0
-# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
 file = File.expand_path("Gemfile", ENV["ENGINE_CART_DESTINATION"] || ENV["RAILS_ROOT"] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
 
 if File.exist?(file)
@@ -33,8 +19,7 @@ if File.exist?(file)
   end
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-  gem "geoblacklight", ">= 2.0"
-  gem "mini_magick", "~> 4.9.4"
+  gem "geoblacklight", ENV["GEOBLACKLIGHT_VERSION"] || ">= 4.0"
   gem "image_processing", "~> 1.6"
   gem "statesman", ">= 3.4"
   gem "marcel", ">= 1.0"
@@ -48,9 +33,6 @@ else
   end
 end
 
-if File.exist?("spec/test_app_templates/Gemfile.extra")
-  # rubocop:disable Security/Eval
-  eval File.read("spec/test_app_templates/Gemfile.extra"), nil, "spec/test_app_templates/Gemfile.extra"
-  # rubocop:enable Security/Eval
-end
+extra = File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))
+eval_gemfile extra if File.exist?(extra)
 # END ENGINE_CART BLOCK

data/README.md

@@ -12,34 +12,34 @@ Store local copies of remote imagery in GeoBlacklight.
 * [Development](#development)
 
 ## Description
+
 This GeoBlacklight plugin captures remote images from geographic web services and saves them locally. It borrows the concept of a [SolrDocumentSidecar](https://github.com/projectblacklight/spotlight/blob/master/app/models/spotlight/solr_document_sidecar.rb) from [Spotlight](https://github.com/projectblacklight/spotlight), to have an ActiveRecord-based "sidecar" to match each non-AR SolrDocument. This allows us to use [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage) to attach images to our solr documents.
 
 ### Example Screenshot
+
 ![Screenshot](screenshot.png)
 
 ## Requirements
 
-* [Ruby on Rails >= 5.2, < 8.0](https://weblog.rubyonrails.org/releases/)
-* [GeoBlacklight v4 or v3](https://github.com/geoblacklight/geoblacklight)
-* [ImageMagick](https://github.com/ImageMagick/ImageMagick)
+* Ruby >= 3.3 (CI also runs on 3.4 and 4.0)
+* Rails >= 7.2, < 9 (tested on 7.2 with GeoBlacklight 4 and 8.1 with GeoBlacklight 5/6)
+* GeoBlacklight 4.x, 5.x, or 6.x
+* [libvips](https://www.libvips.org/) (Rails default) or [ImageMagick](https://github.com/ImageMagick/ImageMagick)
 
 ### Suggested
 
-* Background Job Processor
-
-[Sidekiq](https://github.com/mperham/sidekiq) is an excellent choice if you need an opinion.
+* Background job processor — [Solid Queue](https://github.com/rails/solid_queue) (Rails 8) or [Sidekiq](https://github.com/sidekiq/sidekiq)
 
 ## Installation
 
-### Existing GeoBlacklight Instance
-
-GeoBlacklight v4 with Aardvark metadata / Add the gem to your Gemfile.
+### Existing GeoBlacklight instance
 
 ```ruby
-gem "geoblacklight_sidecar_images", "~> 1.0"
+gem "geoblacklight_sidecar_images", "~> 2.0"
 ```
 
-GeoBlacklight v3 with GBL v1.0 metadata / Add the gem to your Gemfile.
+GeoBlacklight v3 with GBL 1.0 metadata still uses the 0.9.x series:
+
 ```ruby
 gem "geoblacklight_sidecar_images", "~> 0.9.1", "< 1.0"
 ```
@@ -50,13 +50,15 @@ Run the generator.
 $ bin/rails generate geoblacklight_sidecar_images:install
 ```
 
+Use `--skip-views` on GeoBlacklight 5/6 apps that render results with ViewComponents rather than the GBL 4 split catalog partial. Use `--skip-assets` when the host is not using Sprockets.
+
 Run the database migration.
 
 ```bash
 $ bin/rails db:migrate
 ```
 
-Complete any necessary [Active Storage setup](https://edgeguides.rubyonrails.org/active_storage_overview.html#setup) steps, for example:
+Complete any necessary [Active Storage setup](https://guides.rubyonrails.org/active_storage_overview.html#setup) steps, for example:
 
 1. Add a config/storage.yml file
 
@@ -66,23 +68,24 @@ local:
   root: <%= Rails.root.join("storage") %>
 ```
 
-2. Add config/environments declarations, development.rb for example:  
+2. Add config/environments declarations, development.rb for example:
 
 ```
 # Store uploaded files on the local file system (see config/storage.yml for options)
 config.active_storage.service = :local
 ```
 
-### New GeoBlacklight Instance
+The install generator appends Sidecar Images settings to `config/settings.yml` (`GBLSI_THUMBNAIL_FIELD`, optional GeoServer proxy keys, and optional `GBLSI_OGM_API_URL`). Leave the GeoServer URLs blank unless you need authenticated local WMS harvesting. Leave `GBLSI_OGM_API_URL` blank unless you want to skip harvest and render OpenGeoMetadata API thumbnails instead.
 
-Create a new GeoBlacklight instance with the GBLSI code
+`SolrDocument#sidecar` is included by the engine. You do not need to copy a method into `app/models/solr_document.rb`. If you are upgrading from 1.x, you can remove the generator-injected `sidecar` method from that file.
+
+### New GeoBlacklight instance
 
 ```bash
 $ rails new app-name -m https://raw.githubusercontent.com/geoblacklight/geoblacklight_sidecar_images/develop/template.rb
-
 ```
 
-### Ingest Test Documents
+### Ingest test documents
 
 ```bash
   # Run your GBL instance
@@ -98,9 +101,11 @@ bundle exec rake gblsci:sample_data:seed
 
 ### Harvest images
 
+Harvest is only needed when you store thumbnails in Active Storage. If `GBLSI_OGM_API_URL` is set, skip these tasks and see [OpenGeoMetadata API thumbnails](#opengeometadata-api-thumbnails).
+
 #### Harvest all images
 
-Spawns background jobs to harvest images for all documents in your Solr index.
+Spawns background jobs to harvest images for all documents in your Solr index (paginated with Solr cursorMarks).
 
 ```bash
 bundle exec rake gblsci:images:harvest_all
@@ -141,40 +146,38 @@ We use a state machine library to track success/failure of our harvest tasks. Th
 SolrDocumentSidecar.in_state(:succeeded) => [#<SolrDocumentSidecar:0x0000000170697960 ... ]
 SolrDocumentSidecar.image.attached? => false
 SolrDocumentSidecar.image_state.current_state => "placeheld"
-SolrDocumentSidecar.image_state.last_transition => #<SidecarImageTransition id: 207, to_state: "placeheld", metadata: {"solr_doc_id"=>"stanford-cg357zz0321", "solr_version"=>1616509329754554368, "placeheld"=>true, "viewer_protocol"=>"wms", "image_url"=>"http://geowebservices-restricted.stanford.edu/geoserver/wms/reflect?&FORMAT=image%2Fpng&TRANSPARENT=TRUE&LAYERS=druid:cg357zz0321&WIDTH=300&HEIGHT=300", "service_url"=>"http://geowebservices-restricted.stanford.edu/geoserver/wms/reflect?&FORMAT=image%2Fpng&TRANSPARENT=TRUE&LAYERS=druid:cg357zz0321&WIDTH=300&HEIGHT=300", "gblsi_thumbnail_uri"=>false, "error"=>"Faraday::Error::ConnectionFailed"},...>
+SolrDocumentSidecar.image_state.last_transition => #<SidecarImageTransition id: 207, to_state: "placeheld", metadata: {"solr_doc_id"=>"stanford-cg357zz0321", ...>
 ```
 
 ### Destroy images
 
-#### Remove everything
+Destructive tasks require `CONFIRM=1`.
 
-Remove all sidecar objects and attached images
+#### Remove everything
 
 ```bash
-bundle exec rake gblsci:images:harvest_purge_all
+CONFIRM=1 bundle exec rake gblsci:images:harvest_purge_all
 ```
 
 #### Remove orphaned AR objects
 
-Remove all sidecar objects and attached images for AR objects without a corresponding Solr document
-
 ```bash
-bundle exec rake gblsci:images:harvest_purge_orphans
+CONFIRM=1 bundle exec rake gblsci:images:harvest_purge_orphans
 ```
 
 #### Remove a batch
 
-Remove sidecar objects and attached images via a CSV file of document ids
+Remove sidecar objects and attached images via a CSV file of document ids at `tmp/destroy_batch.csv`.
 
 ```bash
-bundle exec rake gblsci:images:harvest_destroy_batch
+CONFIRM=1 bundle exec rake gblsci:images:harvest_destroy_batch
 ```
 
 ### Troubleshooting
 
 #### Harvest report
 
-Generate a CSV file of sidecar objects and associated image state. Useful for debugging problem items.
+Generate a CSV file of sidecar objects and associated image state under `tmp/`.
 
 ```bash
 bundle exec rake gblsci:images:harvest_report
@@ -197,63 +200,64 @@ If you add a thumbnail uri to your geoblacklight solr documents...
 ```json
 {
   ...
-  "dc_format_s":"TIFF",
-  "dc_creator_sm":["Minnesota. Department of Highways."],
-  "thumbnail_path_ss":"https://umedia.lib.umn.edu/sites/default/files/imagecache/square300/reference/562/image/jpeg/1089695.jpg",
-  "dc_type_s":"Still image",
+  "dct_format_s": "TIFF",
+  "dct_creator_sm": ["Minnesota. Department of Highways."],
+  "thumbnail_path_ss": "https://umedia.lib.umn.edu/sites/default/files/imagecache/square300/reference/562/image/jpeg/1089695.jpg",
+  "gbl_resourceClass_sm": ["Imagery"],
   ...
 }
 ```
 
-Then you can edit your GeoBlacklight settings.yml file to point at that solr field (Settings.GBLSI_THUMBNAIL_FIELD). Any docs in your index that have a value for that field will harvest the image at that URI instead of trying to retrieve an image via IIIF or the other web services.
+Then you can edit your GeoBlacklight settings.yml file to point at that solr field (`Settings.GBLSI_THUMBNAIL_FIELD`). Any docs in your index that have a value for that field will harvest the image at that URI instead of trying to retrieve an image via IIIF or the other web services.
+
+## OpenGeoMetadata API thumbnails
+
+To skip harvest, Active Storage, and the sidecar state machine entirely, point views at the OpenGeoMetadata API. Thumbnails are loaded in the browser from:
+
+`https://ogm.geo4lib.app/api/v1/resources/{id}/thumbnail`
+
+Set the API root in `config/settings.yml`:
+
+```yaml
+GBLSI_OGM_API_URL: 'https://ogm.geo4lib.app/api/v1'
+```
+
+`sidecar_thumbnail_tag document` then renders an `img` for that URL (for example `stanford-mp692kw6192` → `/resources/stanford-mp692kw6192/thumbnail`). No sidecar row is created. Harvest rake tasks are unused in this mode.
+
+The harvest/Active Storage path remains the default when `GBLSI_OGM_API_URL` is blank.
 
 ## View customization
 
-Use basic Active Storage patterns to display imagery in your application.
+Use basic Active Storage patterns, or the engine helper, to display imagery in your application.
 
-### Example Methods
+### Example methods
 
 ```ruby
-# Is there an image?
-document.sidecar.image.attached?
+# Helper (available in host views). Uses the OGM API when GBLSI_OGM_API_URL is
+# set; otherwise uses a harvested Active Storage attachment.
+<%= sidecar_thumbnail_tag document, size: [200, 200] %>
 
-# Can the image size be manipulated?
+# Harvested Active Storage (only when OGM API thumbnails are not enabled)
+document.sidecar.image.attached?
 document.sidecar.image.variable?
-
-# Example image_tag with resize
 <%= image_tag document.sidecar.image.variant(resize_to_fit: [100, 100]), {class: 'media-object'} %>
-
 ```
 
 ### Search results
 
-This GBL plugin includes a custom [catalog/_index_split_default.html.erb file](https://github.com/geoblacklight/geoblacklight_sidecar_images/blob/develop/lib/generators/geoblacklight_sidecar_images/templates/views/catalog/_index_split_default.html.erb). Look there for examples on calling the image method.
+On GeoBlacklight 4, the install generator can copy a catalog `_index_split_default.html.erb` partial. GeoBlacklight 5/6 apps should call `sidecar_thumbnail_tag` (or `document.sidecar.image`) from their result component instead of replacing Blacklight helpers.
 
 ### Show pages
 
 Example for adding a thumbnail to the show page sidebar.
 
-*catalog/_show_sidebar.html.erb*
-
 ```ruby
-# Add to end of file
-<% if @document.sidecar.image.attached? %>
-  <% if @document.sidecar.image.variable? %>
-    <div class="card">
-      <div class="card-header">Thumbnail</div>
-      <div class="card-body">
-        <%= image_tag @document.sidecar.image.variant(resize_to_fit: [200, 200]), {class: 'mr-3'} %>
-      </div>
-    </div>
-  <% end %>
-<% end %>
-
+<%= sidecar_thumbnail_tag @document, size: [200, 200], class: "mr-3" %>
 ```
 
 ## Development
 
 ```bash
-
 # Run test suite
 bundle exec rake ci
 
@@ -269,8 +273,12 @@ bundle exec rake gblsci:images:harvest_all
 
 # Tail image service log file
 tail -f log/image_service_development.log
+```
 
+Test against a specific stack with environment variables:
+
+```bash
+RAILS_VERSION=8.1.3 GEOBLACKLIGHT_VERSION="~> 5.3" bundle exec rake ci
 ```
 
 [See Localhost Results](http://localhost:3000/?per_page=50&q=&search_field=all_fields)
-

data/Rakefile

@@ -22,11 +22,23 @@ RuboCop::RakeTask.new(:rubocop)
 require "solr_wrapper/rake_task"
 require "engine_cart/rake_task"
 require "geoblacklight_sidecar_images/version"
+require "fileutils"
+
+# EngineCart bundles the test app before TestAppGenerator runs. Copy Bundler
+# platform settings so Nokogiri uses the precompiled native gem.
+Rake::Task["engine_cart:inject_gemfile_extras"].enhance do
+  dest = File.join(EngineCart.destination, ".bundle")
+  FileUtils.mkdir_p(dest)
+  File.write(File.join(dest, "config"), <<~YAML)
+    ---
+    BUNDLE_FORCE_RUBY_PLATFORM: "false"
+    BUNDLE_SPECIFIC_PLATFORM: "true"
+  YAML
+end
 
 desc "Run test suite"
 task ci: ["engine_cart:generate"] do
   ENV["environment"] = "test"
-  # run the tests
   Rake::Task["spec"].invoke
 end
 

data/app/controllers/geoblacklight_sidecar_images/application_controller.rb

@@ -2,6 +2,5 @@
 
 module GeoblacklightSidecarImages
   class ApplicationController < ActionController::Base
-    protect_from_forgery with: :exception
   end
 end

data/app/helpers/geoblacklight_sidecar_images/application_helper.rb

@@ -2,5 +2,20 @@
 
 module GeoblacklightSidecarImages
   module ApplicationHelper
+    def sidecar_thumbnail_tag(document, size: [200, 200], **options)
+      options = {alt: "", role: "presentation"}.merge(options)
+
+      ogm_url = document.try(:ogm_thumbnail_url)
+      return image_tag(ogm_url, options) if ogm_url.present?
+
+      sidecar = document.sidecar
+      return unless sidecar.image.attached?
+
+      if sidecar.image.variable?
+        image_tag sidecar.image.variant(resize_to_fit: size), options
+      else
+        image_tag sidecar.image, options
+      end
+    end
   end
 end

data/app/jobs/geoblacklight_sidecar_images/store_image_job.rb

@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 
+require "faraday"
+
 module GeoblacklightSidecarImages
   class StoreImageJob < ApplicationJob
-    queue_as :default
+    queue_as :gblsci
+
+    retry_on Faraday::TimeoutError, wait: :polynomially_longer, attempts: 5
+    retry_on Faraday::ConnectionFailed, wait: :polynomially_longer, attempts: 3
+    discard_on Blacklight::Exceptions::RecordNotFound
 
     def perform(solr_document_id)
       document = Geoblacklight::SolrDocument.find(solr_document_id)
 
-      metadata = {}
-      metadata["solr_doc_id"] = document.id
-      metadata["solr_version"] = document.sidecar.version
+      metadata = {
+        "solr_doc_id" => document.id,
+        "solr_version" => document.sidecar.version
+      }
 
       document.sidecar.image_state.transition_to!(:queued, metadata)
       GeoblacklightSidecarImages::ImageService.new(document).store

data/app/models/concerns/geoblacklight_sidecar_images/solr_document_behavior.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module GeoblacklightSidecarImages
+  module SolrDocumentBehavior
+    extend ActiveSupport::Concern
+
+    def ogm_thumbnail_url
+      GeoblacklightSidecarImages::OgmThumbnail.url_for(self)
+    end
+
+    def sidecar
+      record = SolrDocumentSidecar.find_or_initialize_by(
+        document_id: id,
+        document_type: self.class.to_s
+      )
+      version = _source["_version_"]
+      if record.new_record? || record.version != version
+        record.version = version
+        record.save!
+      end
+      record
+    end
+  end
+end

data/app/models/concerns/wms_rewrite_concern.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 module WmsRewriteConcern
-  extend Geoblacklight::SolrDocument
+  extend ActiveSupport::Concern
 
   def viewer_endpoint
-    if local_restricted?
-      # replace wms prefix with cas authed proxy
+    if local_restricted? && geoserver_proxy_configured?
       super.gsub(Settings.INSTITUTION_GEOSERVER_URL, Settings.PROXY_GEOSERVER_URL)
     else
       super
@@ -17,6 +16,16 @@ module WmsRewriteConcern
   end
 
   def local?
-    fetch(Settings.FIELDS.PROVIDER, "").casecmp(Settings.INSTITUTION_LOCAL_NAME).zero?
+    name = Settings.INSTITUTION_LOCAL_NAME.to_s
+    return false if name.blank?
+
+    fetch(GeoblacklightSidecarImages::FieldMap[:provider], "").casecmp(name).zero?
+  end
+
+  private
+
+  def geoserver_proxy_configured?
+    Settings.INSTITUTION_GEOSERVER_URL.to_s.present? &&
+      Settings.PROXY_GEOSERVER_URL.to_s.present?
   end
 end

data/app/models/sidecar_image_transition.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class SidecarImageTransition < ApplicationRecord
+class SidecarImageTransition < GeoblacklightSidecarImages::ApplicationRecord
+  self.table_name = "sidecar_image_transitions"
+
   include Statesman::Adapters::ActiveRecordTransition
 
   validates :to_state, inclusion: {in: SidecarImageStateMachine.states}

data/app/models/solr_document_sidecar.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 ##
-# Metadata for indexed documents
-class SolrDocumentSidecar < ApplicationRecord
+# ActiveRecord sidecar for a Solr document, with an attached thumbnail image.
+class SolrDocumentSidecar < GeoblacklightSidecarImages::ApplicationRecord
+  self.table_name = "solr_document_sidecars"
+
   include Statesman::Adapters::ActiveRecordQueries[
     transition_class: SidecarImageTransition,
     initial_state: :initialized
@@ -12,6 +14,7 @@ class SolrDocumentSidecar < ApplicationRecord
   has_many :sidecar_image_transitions, autosave: false, dependent: :destroy
   has_one_attached :image
 
+  # SolrDocument is not an ActiveRecord model. Reconstruct from the stored id.
   def document
     document_type.new document_type.unique_key => document_id
   end
@@ -35,7 +38,9 @@ class SolrDocumentSidecar < ApplicationRecord
     :initialized
   end
 
-  def self.image_url
+  def image_url
+    return unless image.attached?
+
     Rails.application.routes.url_helpers.rails_blob_path(image, only_path: true)
   end