blacklight-spotlight 5.0.0 → 5.0.1

data/app/components/spotlight/blocks/heading_block_component.erb

@@ -0,0 +1,2 @@
+<p>I am in the component</p>
+<%= content_tag heading_tag, text %>

data/app/components/spotlight/blocks/heading_block_component.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Spotlight
+  module Blocks
+    # Sir Trevor Heading Block
+    class HeadingBlockComponent < ViewComponent::Base
+      def initialize(heading_block:)
+        @heading_block = heading_block
+        super
+      end
+
+      attr_reader :heading_block
+
+      delegate :level, to: :heading_block
+      delegate :format, to: :heading_block
+      delegate :text, to: :heading_block
+
+      def heading_tag
+        return "h#{level}" if html? && valid_level?
+
+        # h2 was Spotlight's default heading tag for 10+ years.
+        'h2'
+      end
+
+      private
+
+      def valid_level?
+        level.to_i.between?(1, 6)
+      end
+
+      def html?
+        heading_block.format.to_s == 'html'
+      end
+    end
+  end
+end

data/app/controllers/concerns/spotlight/catalog.rb

@@ -34,7 +34,7 @@ module Spotlight
     # rubocop:enable Metrics/MethodLength
 
     def render_curator_actions?
-      (current_exhibit && can?(:curate, current_exhibit)) &&
+      current_exhibit && can?(:curate, current_exhibit) &&
         !(params[:controller] == 'spotlight/catalog' && params[:action] == 'admin')
     end
   end

data/app/controllers/concerns/spotlight/controller.rb

@@ -57,7 +57,7 @@ module Spotlight
     end
 
     def exhibit_masthead?
-      current_exhibit&.masthead && current_exhibit.masthead.display?
+      current_exhibit&.masthead&.display?
     end
 
     def set_locale

data/app/controllers/spotlight/browse_controller.rb

@@ -73,7 +73,7 @@ module Spotlight
     end
 
     def attach_search_breadcrumb
-      add_breadcrumb(@search.full_title, (@group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search)))
+      add_breadcrumb(@search.full_title, @group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search))
     end
 
     def _prefixes
@@ -89,7 +89,7 @@ module Spotlight
     end
 
     def resource_masthead?
-      @search&.masthead && @search.masthead.display?
+      @search&.masthead&.display?
     end
 
     # This is overidden for the browse controller context from where it is defined in a helper

data/app/controllers/spotlight/searches_controller.rb

@@ -35,7 +35,8 @@ module Spotlight
     end
 
     def create
-      @search.assign_attributes(search_params.except((:title unless @search.new_record?)))
+      params_to_exclude = :title unless @search.new_record?
+      @search.assign_attributes(search_params.except(params_to_exclude))
       @search.query_params = query_params
 
       if @search.save

data/app/models/sir_trevor_rails/blocks/displayable.rb

@@ -20,7 +20,8 @@ module SirTrevorRails
       private
 
       def item_values
-        Array((item.values if item.present?))
+        values = item.values if item.present?
+        Array(values)
       end
     end
   end

data/app/models/spotlight/lock.rb

@@ -16,7 +16,7 @@ module Spotlight
     end
 
     def stale?
-      created_at < (12.hours.ago)
+      created_at < 12.hours.ago
     end
   end
 end

data/app/views/spotlight/about_pages/_contact.html.erb

@@ -1,4 +1,4 @@
-<%= render layout: 'spotlight/shared/dd3_item', locals: { id: f.object.id.to_s, field: f, enabled_method: :show_in_sidebar, label_method: :name } do |_, section| %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: f.object.id.to_s, field: f, index: f.index, enabled_method: :show_in_sidebar, label_method: :name } do |_, section| %>
   <% case section when nil %>
     <div class="d-flex flex-grow-1">
       <%= f.check_box :show_in_sidebar, hide_label: true, inline: true %>

data/app/views/spotlight/pages/_page.html.erb

@@ -1,5 +1,5 @@
 <% page = f.object %>
-<%= render layout: 'spotlight/shared/dd3_item', locals: { id: page.id.to_s, field: f, label: page.title, label_method: :title, enabled_method: :published } do |_, section| %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: page.id.to_s, index: f.index, field: f, label: page.title, label_method: :title, enabled_method: :published } do |_, section| %>
   <% case section when :additional_options %>
     <%= render Spotlight::EditViewLinksComponent.new(page:, delete_link: true) %>
     <%- if page.feature_page? -%>

data/app/views/spotlight/search_configurations/_facets.html.erb

@@ -6,7 +6,7 @@
         <% metadata = @field_metadata.field(key) %>
         <% next unless metadata[:document_count] > 0 || config.custom_field %>
         <%= idxf.fields_for key, config do |facet| %>
-          <%= render layout: 'spotlight/shared/dd3_item', locals: { id: key, field: facet, dd3_content_classes: "facet-config-#{key.parameterize} page" , enabled_method: :show, label_method: :label, label: facet_field_label(key) } do |_, section| %>
+          <%= render layout: 'spotlight/shared/dd3_item', locals: { id: key, field: facet, index: facet.index, dd3_content_classes: "facet-config-#{key.parameterize} page" , enabled_method: :show, label_method: :label, label: facet_field_label(key) } do |_, section| %>
             <% case section when :additional_content %>
               <div class="mt-2">
                 <%= facet.form_group :terms, label_col: 'col-md-2 offset-md-1', label: { text: t(:'spotlight.search_configurations.facets.sort_by.label') } do %>

data/app/views/spotlight/searches/_group.html.erb

@@ -1,5 +1,5 @@
 <% group = f.object %>
-<%= render layout: 'spotlight/shared/dd3_item', locals: { id: group.id.to_s, field: f, dd3_content_classes: "group" , enabled_method: :published, label_method: :title, label: group.title } do |_, section| %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: group.id.to_s, index: f.index, field: f, dd3_content_classes: "group" , enabled_method: :published, label_method: :title, label: group.title } do |_, section| %>
   <% case section when nil %>
   <div class="d-flex flex-grow-1">
     <div>

data/app/views/spotlight/searches/_search.html.erb

@@ -1,5 +1,5 @@
 <% search = f.object %>
-<%= render layout: 'spotlight/shared/dd3_item', locals: { id: search.id.to_s, field: f, dd3_content_classes: "search" , enabled_method: :published, label_method: :title, label: search.title } do |_, section| %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: search.id.to_s, field: f, index: f.index, dd3_content_classes: "search" , enabled_method: :published, label_method: :title, label: search.title } do |_, section| %>
   <% case section when nil %>
   <div class="d-flex flex-grow-1">
     <div>

data/app/views/spotlight/tags/_tag.html.erb

@@ -1,6 +1,6 @@
 <% tag = f.object %>
 
-<%= render layout: 'spotlight/shared/dd3_item', locals: { id: tag.id.to_s, field: f, dd3_content_classes: "tag" , enabled_method: :present?, label_method: :name, label: tag.name } do |_, section| %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: tag.id.to_s, field: f, index: f.index, dd3_content_classes: "tag" , enabled_method: :present?, label_method: :name, label: tag.name } do |_, section| %>
   <% case section when nil %>
   <div class="d-flex flex-grow-1">
     <div class="flex-grow-1 mx-2 main">

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '5.0.0'
+  VERSION = '5.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-24 00:00:00.000000000 Z
+date: 2025-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -865,6 +865,8 @@ files:
 - app/components/spotlight/analytics/aggregation_component.rb
 - app/components/spotlight/analytics/dashboard_component.html.erb
 - app/components/spotlight/analytics/dashboard_component.rb
+- app/components/spotlight/blocks/heading_block_component.erb
+- app/components/spotlight/blocks/heading_block_component.rb
 - app/components/spotlight/breadcrumbs_component.html.erb
 - app/components/spotlight/breadcrumbs_component.rb
 - app/components/spotlight/bulk_action_component.html.erb
@@ -1546,7 +1548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections