blacklight-spotlight 3.6.0.beta7 → 3.6.0.beta9

data/app/assets/stylesheets/spotlight/_exhibit_admin.scss

@@ -35,10 +35,13 @@
   }
 
   .constraint-value {
-     @include border-right-radius($border-radius-sm);
+    border-top-right-radius: $border-radius-sm;
+    border-bottom-right-radius: $border-radius-sm;
   }
 
-  .form-control-plaintext { display: none; }
+  .form-control-plaintext {
+    display: none;
+  }
 }
 
 .analytics {
@@ -52,7 +55,8 @@
     text-align: center;
   }
 
-  th, td {
+  th,
+  td {
     &:first-child {
       border-left: 0;
     }

data/app/components/spotlight/document_component.rb

@@ -5,7 +5,9 @@ module Spotlight
   # This overrides the title method to provide an edit link.
   class DocumentComponent < Blacklight::DocumentComponent
     def title
-      safe_join([exhibit_edit_link, super, add_document_meta_content(@document)])
+      return safe_join([exhibit_edit_link, super, add_document_meta_content(@document)]) if current_exhibit
+
+      super
     end
 
     attr_reader :document

data/app/controllers/spotlight/catalog_controller.rb

@@ -23,7 +23,16 @@ module Spotlight
     before_action :load_document, only: %i[edit update make_private make_public manifest]
 
     before_action only: :show do
-      blacklight_config.show.document_component = Spotlight::DocumentComponent
+      # Substitute the default document component with the custom one for Blacklight 8,
+      # and add the necessary partials for Blacklight 7 (if they haven't configured the document component)
+      if blacklight_config.show.document_component.nil? || blacklight_config.show.document_component == Blacklight::DocumentComponent
+        if Blacklight::VERSION > '8'
+          blacklight_config.show.document_component = Spotlight::DocumentComponent
+        else
+          blacklight_config.show.partials.unshift 'tophat'
+          blacklight_config.show.partials.unshift 'curation_mode_toggle'
+        end
+      end
     end
 
     before_action only: :admin do

data/app/controllers/spotlight/resources/upload_controller.rb

@@ -9,7 +9,7 @@ module Spotlight
       helper :all
 
       before_action :authenticate_user!
-      before_action :set_tab, only: %i[new create]
+      before_action :set_tab, only: %i[create]
 
       load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
       before_action :build_resource

data/app/controllers/spotlight/resources_controller.rb

@@ -4,7 +4,7 @@ module Spotlight
   ##
   # CRUD actions for exhibit resources
   class ResourcesController < Spotlight::ApplicationController
-    before_action :authenticate_user!, except: [:show]
+    before_action :authenticate_user!
     before_action :set_tab, only: %i[new create]
 
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit

data/app/controllers/spotlight/solr_controller.rb

@@ -20,7 +20,10 @@ module Spotlight
 
       data = solr_documents
 
-      repository.connection.update params: { commitWithin: 500 }, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?
+      unless data.empty?
+        repository.connection.update params: { commitWithin: 500 }, data: data.to_json,
+                                     headers: { 'Content-Type' => 'application/json' }
+      end
 
       if params[:resources_json_upload]
         redirect_back fallback_location: exhibit_resources_path(@exhibit)
@@ -31,6 +34,10 @@ module Spotlight
 
     private
 
+    def repository
+      @repository ||= blacklight_config.repository
+    end
+
     def solr_documents
       req = ActiveSupport::JSON.decode(json_content)
 

data/app/helpers/spotlight/meta_helper.rb

@@ -46,7 +46,7 @@ module Spotlight
         graph.type 'article'
         graph.site_name application_name
         graph.title page.title
-        graph.send('og:image', page.thumbnail.iiif_url) if page.thumbnail
+        graph.send('image', page.thumbnail.iiif_url) if page.thumbnail
         graph.send('article:published_time', page.created_at.iso8601)
         graph.send('article:modified_time', page.updated_at.iso8601)
       end
@@ -69,7 +69,7 @@ module Spotlight
         graph.type 'article'
         graph.site_name application_name
         graph.title browse.title
-        graph.send('og:image', browse.thumbnail.iiif_url) if browse.thumbnail
+        graph.send('image', browse.thumbnail.iiif_url) if browse.thumbnail
         graph.send('article:published_time', browse.created_at.iso8601)
         graph.send('article:modified_time', browse.updated_at.iso8601)
       end
@@ -95,7 +95,7 @@ module Spotlight
       opengraph do |graph|
         graph.site_name application_name
         graph.title presenter.heading
-        graph.send('og:image', document.first(blacklight_config.index.thumbnail_field))
+        graph.send('image', document.first(blacklight_config.index.thumbnail_field))
       end
     end
   end

data/app/javascript/spotlight/admin/blocks/uploaded_items_block.js

@@ -129,9 +129,9 @@ SirTrevor.Blocks.UploadedItems = (function(){
             <div class="panels dd nestable-item-grid" data-behavior="nestable" data-max-depth="1">
               <ol class="dd-list">
               </ol>
-            </div>,
+            </div>
             <input type="file" id="uploaded_item_url" name="file[file_0][file_data]" />
-          </div>'
+          </div>
           <div class="col-md-4">
             <input name="${this.zpr_key}" type="hidden" value="false" />
             <input name="${this.zpr_key}" id="${this.formId(this.zpr_key)}" data-key=${this.zpr_key}" type="checkbox" value="true" />

data/app/models/spotlight/blacklight_configuration.rb

@@ -10,15 +10,27 @@ module Spotlight
     has_paper_trail
 
     belongs_to :exhibit, touch: true, optional: true
-    serialize :facet_fields, Hash, coder: YAML
-    serialize :index_fields, Hash, coder: YAML
-    serialize :search_fields, Hash, coder: YAML
-    serialize :sort_fields, Hash, coder: YAML
-    serialize :default_solr_params, Hash, coder: YAML
-    serialize :show, Hash, coder: YAML
-    serialize :index, Hash, coder: YAML
-    serialize :per_page, Array, coder: YAML
-    serialize :document_index_view_types, Array, coder: YAML
+    if Rails.version > '7.1'
+      serialize :facet_fields, type: Hash, coder: YAML
+      serialize :index_fields, type: Hash, coder: YAML
+      serialize :search_fields, type: Hash, coder: YAML
+      serialize :sort_fields, type: Hash, coder: YAML
+      serialize :default_solr_params, type: Hash, coder: YAML
+      serialize :show, type: Hash, coder: YAML
+      serialize :index, type: Hash, coder: YAML
+      serialize :per_page, type: Array, coder: YAML
+      serialize :document_index_view_types, type: Array, coder: YAML
+    else
+      serialize :facet_fields, Hash, coder: YAML
+      serialize :index_fields, Hash, coder: YAML
+      serialize :search_fields, Hash, coder: YAML
+      serialize :sort_fields, Hash, coder: YAML
+      serialize :default_solr_params, Hash, coder: YAML
+      serialize :show, Hash, coder: YAML
+      serialize :index, Hash, coder: YAML
+      serialize :per_page, Array, coder: YAML
+      serialize :document_index_view_types, Array, coder: YAML
+    end
 
     include Spotlight::BlacklightConfigurationDefaults
 

data/app/models/spotlight/contact.rb

@@ -7,8 +7,11 @@ module Spotlight
     belongs_to :exhibit, touch: true, optional: true
     scope :published, -> { where(show_in_sidebar: true) }
     default_scope { order('weight ASC') }
-    serialize :contact_info, Hash, coder: YAML
-
+    if Rails.version > '7.1'
+      serialize :contact_info, type: Hash, coder: YAML
+    else
+      serialize :contact_info, Hash, coder: YAML
+    end
     extend FriendlyId
     friendly_id :name, use: %i[slugged scoped finders], scope: :exhibit
 

data/app/models/spotlight/custom_field.rb

@@ -4,7 +4,11 @@ module Spotlight
   ##
   # Exhibit custom fields
   class CustomField < ActiveRecord::Base
-    serialize :configuration, Hash, coder: YAML
+    if Rails.version > '7.1'
+      serialize :configuration, type: Hash, coder: YAML
+    else
+      serialize :configuration, Hash, coder: YAML
+    end
     belongs_to :exhibit, optional: true
 
     extend FriendlyId

data/app/models/spotlight/custom_search_field.rb

@@ -3,7 +3,11 @@
 module Spotlight
   # Exhibit-specific custom search fields
   class CustomSearchField < ApplicationRecord
-    serialize :configuration, Hash, coder: YAML
+    if Rails.version > '7.1'
+      serialize :configuration, type: Hash, coder: YAML
+    else
+      serialize :configuration, Hash, coder: YAML
+    end
     belongs_to :exhibit
 
     def label=(label)

data/app/models/spotlight/exhibit.rb

@@ -35,8 +35,11 @@ module Spotlight
     acts_as_tagger
     acts_as_taggable
     delegate :blacklight_config, to: :blacklight_configuration
-    serialize :facets, Array, coder: YAML
-
+    if Rails.version > '7.1'
+      serialize :facets, type: Array, coder: YAML
+    else
+      serialize :facets, Array, coder: YAML
+    end
     # NOTE: friendly id associations need to be 'destroy'ed to reap the slug history
     has_many :about_pages, -> { for_default_locale }, extend: FriendlyId::FinderMethods
     has_many :attachments, dependent: :destroy

data/app/models/spotlight/page_content.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spotlight/page_content/sir_trevor'
-
 module Spotlight
   # Factory for picking the right page content renderer
   module PageContent

data/app/models/spotlight/resource.rb

@@ -25,7 +25,11 @@ module Spotlight
     has_many :solr_document_sidecars
     has_many :events, as: :resource
 
-    serialize :data, Hash, coder: YAML
+    if Rails.version > '7.1'
+      serialize :data, type: Hash, coder: YAML
+    else
+      serialize :data, Hash, coder: YAML
+    end
 
     ##
     # Persist the record to the database, and trigger a reindex to solr

data/app/models/spotlight/resources/upload.rb

@@ -43,13 +43,13 @@ module Spotlight
       def to_solr
         return {} unless upload&.file_present?
 
-        dimensions = Spotlight::Engine.config.iiif_service.info(id)
+        dimensions = Spotlight::Engine.config.iiif_service.info(upload.id)
 
         {
           spotlight_full_image_width_ssm: dimensions.width,
           spotlight_full_image_height_ssm: dimensions.height,
           Spotlight::Engine.config.thumbnail_field => Spotlight::Engine.config.iiif_service.thumbnail_url(upload),
-          Spotlight::Engine.config.iiif_manifest_field => Spotlight::Engine.config.iiif_service.manifest_url(exhibit, upload)
+          Spotlight::Engine.config.iiif_manifest_field => Spotlight::Engine.config.iiif_service.manifest_url(exhibit, self)
         }
       end
 

data/app/models/spotlight/search.rb

@@ -16,10 +16,14 @@ module Spotlight
     has_many :groups, through: :group_memberships
     accepts_nested_attributes_for :group_memberships
     accepts_nested_attributes_for :groups
-    if defined?(Blacklight::SearchParamsYamlCoder)
-      serialize :query_params, Blacklight::SearchParamsYamlCoder, default: -> { {} }
+    if defined?(Blacklight::SearchParamsYamlCoder) # in Blacklight 7.28.0+
+      serialize :query_params, coder: Blacklight::SearchParamsYamlCoder, default: -> { {} }
     else
-      serialize :query_params, Hash
+      if Rails.version > '7.1' # rubocop:disable Style/IfInsideElse
+        serialize :query_params, type: Hash
+      else
+        serialize :query_params, Hash
+      end
     end
     default_scope { order('weight ASC') }
     scope :published, -> { where(published: true) }

data/app/models/spotlight/solr_document_sidecar.rb

@@ -11,8 +11,14 @@ module Spotlight
     belongs_to :exhibit, optional: false
     belongs_to :resource, optional: true
     belongs_to :document, optional: false, polymorphic: true
-    serialize :data, Hash, coder: YAML
-    serialize :index_status, Hash, coder: YAML
+
+    if Rails.version > '7.1'
+      serialize :data, type: Hash, coder: YAML
+      serialize :index_status, type: Hash, coder: YAML
+    else
+      serialize :data, Hash, coder: YAML
+      serialize :index_status, Hash, coder: YAML
+    end
 
     delegate :has_key?, :key?, to: :data
 

data/app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb

@@ -0,0 +1 @@
+<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>

data/app/views/spotlight/catalog/_index_compact_default.html.erb

@@ -1,6 +1,6 @@
 <% # header bar for doc items in index view -%>
 <td>
-  <%= render_document_partial document, 'spotlight/catalog/admin_thumbnail', document_counter: document_counter %>
+  <%= render_document_partial document, 'admin_thumbnail', document_counter: document_counter %>
 </td>
 <td>
   <%= render_document_partial document, 'admin_index_header', document_counter: document_counter %>

data/app/views/spotlight/catalog/_tophat_default.html.erb

@@ -0,0 +1 @@
+<% add_document_meta_content(@document) %>

data/lib/generators/spotlight/install_generator.rb

@@ -152,15 +152,6 @@ module Spotlight
       end
     end
 
-    def generate_config
-      directory 'config'
-    end
-
-    def add_solr_config_resources
-      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
-      directory 'solr'
-    end
-
     def generate_devise_invitable
       gem 'devise_invitable'
       bundle_install
@@ -168,8 +159,13 @@ module Spotlight
       generate 'devise_invitable', 'User'
     end
 
-    def add_translations
-      copy_file 'config/initializers/translation.rb'
+    def generate_config
+      directory 'config'
+    end
+
+    def add_solr_config_resources
+      copy_file '.solr_wrapper.yml', '.solr_wrapper.yml'
+      directory 'solr'
     end
 
     def configure_logging

data/lib/generators/spotlight/templates/config/initializers/translation.rb

@@ -7,8 +7,10 @@ ActiveSupport::Reloader.to_prepare do
   # Don't allow initializer to break if DB doesn't exist yet
   # see: https://github.com/projectblacklight/spotlight/issues/2133
   if ENV['SKIP_TRANSLATION'].blank?
-    raise unless Translation.table_exists?
-
+    unless Translation.table_exists?
+      warn "Translation table doesn't exist. Skipping translation config."
+      next
+    end
     ##
     # Sets up the new Spotlight Translation backend, backed by ActiveRecord. To
     # turn on the ActiveRecord backend, uncomment the following lines.

data/lib/spotlight/riiif_service.rb

@@ -16,13 +16,13 @@ module Spotlight
     end
 
     # @param [Spotlight::Exhibit] exhibit
-    # @param [Spotlight::FeaturedImage] image
+    # @param [Spotlight::Resource::Upload] resource
     # @return [String]
-    def self.manifest_url(exhibit, image)
-      Spotlight::Engine.routes.url_helpers.manifest_exhibit_solr_document_path(exhibit, "#{exhibit.id}-#{image.id}")
+    def self.manifest_url(exhibit, resource)
+      Spotlight::Engine.routes.url_helpers.manifest_exhibit_solr_document_path(exhibit, "#{exhibit.id}-#{resource.id}")
     end
 
-    # @param [String] id
+    # @param [String] id the ID string of a Spotlight::FeaturedImage
     # @return [Hash]
     def self.info(id)
       Riiif::Image.new(id).info

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.6.0.beta7'
+  VERSION = '3.6.0.beta9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta7
+  version: 3.6.0.beta9
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -183,14 +183,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: devise_invitable
   requirement: !ruby/object:Gem::Requirement
@@ -456,7 +456,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -466,7 +466,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -711,6 +711,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1191,6 +1205,7 @@ files:
 - app/views/spotlight/catalog/_admin_header.html.erb
 - app/views/spotlight/catalog/_admin_index_header_default.html.erb
 - app/views/spotlight/catalog/_admin_thumbnail_default.html.erb
+- app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb
 - app/views/spotlight/catalog/_document.html.erb
 - app/views/spotlight/catalog/_document_admin_table.html.erb
 - app/views/spotlight/catalog/_document_row.html.erb
@@ -1199,6 +1214,7 @@ files:
 - app/views/spotlight/catalog/_edit_sidecar.html.erb
 - app/views/spotlight/catalog/_index_compact_default.html.erb
 - app/views/spotlight/catalog/_reindex_progress_panel.html.erb
+- app/views/spotlight/catalog/_tophat_default.html.erb
 - app/views/spotlight/catalog/admin.html.erb
 - app/views/spotlight/catalog/edit.html.erb
 - app/views/spotlight/catalog/index.iiif_json.jbuilder
@@ -1550,7 +1566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections