arclight 0.3.0 → 1.6.2

data/app/models/concerns/arclight/solr_document.rb

@@ -4,8 +4,34 @@ module Arclight
   ##
   # Extends Blacklight::Solr::Document to provide Arclight specific behavior
   module SolrDocument
-    extend Blacklight::Solr::Document
-    include Arclight::EadFormatHelpers
+    extend ActiveSupport::Concern
+
+    included do
+      attribute :collection_id, :string, '_root_'
+      Arclight.deprecation.deprecate_methods(self, collection_id: 'Use `root` instead')
+      attribute :parent_ids, :array, 'parent_ids_ssim'
+      attribute :legacy_parent_ids, :array, 'parent_ssim'
+      Arclight.deprecation.deprecate_methods(self, legacy_parent_ids: 'Use `parent_ids` instead')
+      attribute :parent_labels, :array, 'parent_unittitles_ssm'
+      attribute :parent_levels, :array, 'parent_levels_ssm'
+      attribute :unitid, :string, 'unitid_ssm'
+      attribute :extent, :array, 'extent_ssm'
+      attribute :abstract, :string, 'abstract_html_tesm'
+      attribute :scope, :string, 'scopecontent_html_tesm'
+      attribute :creator, :string, 'creator_ssm'
+      attribute :level, :string, 'level_ssm'
+      attribute :terms, :string, 'userestrict_html_tesm'
+      # Restrictions for component sidebar
+      attribute :parent_restrictions, :string, 'parent_access_restrict_tesm'
+      # Terms for component sidebar
+      attribute :parent_terms, :string, 'parent_access_terms_tesm'
+      attribute :reference, :string, 'ref_ssm'
+      attribute :normalized_title, :string, 'normalized_title_ssm'
+      attribute :normalized_date, :string, 'normalized_date_ssm'
+      attribute :total_component_count, :string, 'total_component_count_is'
+      attribute :online_item_count, :string, 'online_item_count_is'
+      attribute :last_indexed, :date, 'timestamp'
+    end
 
     def repository_config
       return unless repository
@@ -13,61 +39,51 @@ module Arclight
       @repository_config ||= Arclight::Repository.find_by(name: repository)
     end
 
-    def parent_ids
-      fetch('parent_ssim', [])
-    end
-
-    def parent_labels
-      fetch('parent_unittitles_ssm', [])
-    end
-
-    def parent_levels
-      fetch('parent_levels_ssm', [])
-    end
-
-    def parent_document
-      self.class.new fetch('parent').fetch('docs', []).first
+    def parents
+      @parents ||= Arclight::Parents.from_solr_document(self).as_parents
     end
 
+    # Get this document's EAD ID, or fall back to the collection (especially
+    # for components that may not have their own.
     def eadid
-      fetch('ead_ssi', nil)&.strip
+      first('ead_ssi')&.strip || collection&.first('ead_ssi')&.strip
     end
 
-    def unitid
-      first('unitid_ssm')
+    def normalized_eadid
+      Arclight::NormalizedId.new(eadid).to_s
     end
+    Arclight.deprecation.deprecate_methods(self, normalized_eadid: 'Use `root` instead')
 
     def repository
-      first('repository_ssm')
+      first('repository_ssm') || collection&.first('repository_ssm')
     end
 
     def repository_and_unitid
       [repository, unitid].compact.join(': ')
     end
 
-    def collection_name
-      first('collection_ssm')
-    end
+    # @return [SolrDocument] a SolrDocument representing the EAD collection
+    #   that this document belongs to
+    def collection
+      return self if collection?
 
-    def collection_unitid
-      first('collection_unitid_ssm')
+      @collection ||= self.class.new(self['collection']&.dig('docs', 0), @response)
     end
 
-    def extent
-      first('extent_ssm')
+    def collection_name
+      collection&.normalized_title
     end
 
-    def abstract_or_scope
-      value = first('abstract_ssm') || first('scopecontent_ssm')
-      render_html_tags(value: [value]) if value.present?
+    def collection_unitid
+      collection&.unitid
     end
 
-    def creator
-      first('creator_ssm')
+    def abstract_or_scope
+      abstract || scope
     end
 
     def collection_creator
-      first('collection_creator_ssm')
+      collection&.creator
     end
 
     def online_content?
@@ -75,41 +91,19 @@ module Arclight
     end
 
     def number_of_children
-      first('child_component_count_isim') || 0
+      first('child_component_count_isi') || 0
     end
 
     def children?
       number_of_children.positive?
     end
 
-    def reference
-      first('ref_ssm')
-    end
-
     def component_level
       first('component_level_isim')
     end
 
-    def level
-      first('level_ssm')
-    end
-
-    def digital_object_viewer
-      @digital_object_viewer ||= Arclight::Viewer.render(self)
-    end
-
-    def terms
-      render_html_tags(value: [first('userestrict_ssm')])
-    end
-
-    # Restrictions for component sidebar
-    def parent_restrictions
-      render_html_tags(value: [first('parent_access_restrict_ssm')])
-    end
-
-    # Terms for component sidebar
-    def parent_terms
-      render_html_tags(value: [first('parent_access_terms_ssm')])
+    def collection?
+      level&.parameterize == 'collection'
     end
 
     def digital_objects
@@ -122,26 +116,18 @@ module Arclight
     end
 
     def containers
-      # note that .titlecase strips punctuation, like hyphens, we want to keep
-      fetch('containers_ssim', []).map(&:capitalize)
-    end
-
-    def normalized_title
-      first('normalized_title_ssm')
-    end
+      # NOTE: Keep uppercase characters if present, but upcase the first if not already
+      containers_field = fetch('containers_ssim', []).reject(&:empty?)
+      return [] if containers_field.blank?
 
-    def normalized_date
-      first('normalized_date_ssm')
+      containers_field.map do |container|
+        container.dup.sub!(/\A./, &:upcase)
+      end
     end
 
     # @return [Array<String>] with embedded highlights using <em>...</em>
     def highlights
-      highlight_response = response[:highlighting]
-      return if highlight_response.blank? ||
-                highlight_response[id].blank? ||
-                highlight_response[id][:text].blank?
-
-      highlight_response[id][:text]
+      highlight_field(CatalogController.blacklight_config.highlight_field)
     end
 
     # Factory method for constructing the Object modeling downloads
@@ -149,5 +135,26 @@ module Arclight
     def downloads
       @downloads ||= DocumentDownloads.new(self)
     end
+
+    def ead_file
+      @ead_file ||= begin
+        files = Arclight::DocumentDownloads.new(self, collection_unitid).files
+        files.find do |file|
+          file.type == 'ead'
+        end
+      end
+    end
+
+    def nest_path
+      self['_nest_path_']
+    end
+
+    def root
+      self['_root_'] || self['id']
+    end
+
+    def requestable?
+      repository_config&.request_types&.any?
+    end
   end
 end

data/app/presenters/arclight/show_presenter.rb

@@ -3,25 +3,52 @@
 module Arclight
   # Custom presentation methods for show partial
   class ShowPresenter < Blacklight::ShowPresenter
+    attr_accessor :field_group
+
+    delegate :collection?, to: :document
+
     def heading
       document.normalized_title
     end
 
     def with_field_group(group)
-      self.field_group = group
-      self
+      if block_given?
+        old_group = field_group
+
+        begin
+          self.field_group = group
+          yield(self)
+        ensure
+          self.field_group = old_group if block_given?
+        end
+      else
+        dup.tap { |x| x.field_group = group }
+      end
     end
 
     private
 
-    def field_group
-      @field_group || 'show_field'
+    # @return [Hash<String,Configuration::Field>] all the fields for this index view
+    def fields
+      if field_group
+        configuration["#{field_group}s"] || []
+      else
+        super
+      end
     end
 
-    attr_writer :field_group
-
     def field_config(field)
-      BlacklightFieldConfigurationFactory.for(config: configuration, field: field, field_group: field_group)
+      return super unless field_group
+
+      fields.fetch(field) do
+        if defined?(Blacklight::Configuration::NullDisplayField)
+          # For Blacklight 8:
+          Blacklight::Configuration::NullDisplayField.new(field)
+        else
+          # Blacklight 7
+          Blacklight::Configuration::NullField.new(field)
+        end
+      end
     end
   end
 end

data/app/views/arclight/_requests.html.erb

@@ -1,5 +1,5 @@
-<% if item_requestable?('', { document: document }) %>
-  <div class='mr-4 al-show-actions-box-request flex-md-fill'>
+<% if document.requestable? %>
+  <div class='al-request'>
     <% document.repository_config.available_request_types.each do |request_type| %>
       <%= render partial: "arclight/requests/#{request_type}", locals: { document: document } %>
     <% end %>

data/app/views/arclight/repositories/_repository.html.erb

@@ -1,59 +1,40 @@
-<div class="al-repository">
+<div class="mb-3 mx-auto al-repository">
   <div class="container">
     <div class='row'>
-      <div class='col-2 align-self-center al-repository-thumbnail hidden-md-down'>
-        <%= image_tag repository.thumbnail_url, alt: repository.name, class: 'img-fluid' %>
+      <div class='col-2 align-self-center d-none d-lg-block al-repository-thumbnail'>
+        <%= image_tag repository.thumbnail_url, alt: repository.name, class: 'img-fluid d-block mx-auto' %>
       </div>
 
-      <div class="col-sm-12 col-lg-10 al-repository-information">
-        <%= content_tag(params[:id] == repository.slug ? :h1 : :h2, class: 'h5 repo-name') do %>
-          <%= link_to_unless(params[:id] == repository.slug, repository.name, arclight_engine.repository_path(repository.slug)) %>
+      <div class="col-sm-12 col-lg-10 py-3 al-repository-information">
+        <%= content_tag(params[:id] == repository.slug ? :h1 : :h2, class: 'h5 mb-3 repo-name') do %>
+        <%= link_to_unless(params[:id] == repository.slug, repository.name, arclight_engine.repository_path(repository.slug)) %>
         <% end %>
-        <div class='row no-gutters justify-content-md-center'>
-          <div class='col-4 col-md-3 al-repository-contact'>
-            <address>
-              <div class="al-repository-street-address">
-                <% %i[building address1 address2 city_state_zip_country].each do |f| %>
-                  <% if repository.send(f).present? %>
-                    <div class='al-repository-street-address-<%= f %>'>
-                      <%= repository.send(f) %>
-                    </div>
-                  <% end %>
-                <% end %>
-             </div>
+        <div class='row no-gutters justify-content-center'>
+          <div class='col-12 col-sm-4 col-md-3 fw-light al-repository-contact'>
+            <address class="text-break">
+              <div class="mb-3 al-repository-street-address">
+                <%= repository.location %>
+              </div>
 
               <div class="al-repository-contact-info">
-                <% if repository.phone.present? %>
-                  <div class='al-repository-contact-info-phone'>
-                    <%= repository.phone %>
-                  </div>
-                <% end %>
-                <% if repository.contact_info.present? %>
-                  <div class='al-repository-contact-info-contact_info'>
-                    <% if repository.contact_info.include?('@') %>
-                      <%= mail_to repository.contact_info %>
-                    <% else %>
-                      <%= repository.contact_info %>
-                    <% end %>
-                  </div>
-                <% end %>
+                <%= repository.contact %>
               </div>
             </address>
           </div>
 
-          <div class='col al-repository-description'>
+          <div class='col-12 col-sm mt-3 mt-sm-0 al-repository-description'>
             <%= repository.description %>
           </div>
 
           <% if on_repositories_index? %>
-            <div class='col col-lg-2 al-repository-extra align-self-center hidden-md-down'>
-              <div class='al-repository-extra-collection-count'>
-                <span class="al-repository-collection-count">
-                  <%= t(:'arclight.views.repositories.number_of_collections', count: repository.collection_count) %>
-                </span>
-               </div>
-               <%= link_to(t(:'arclight.views.repositories.view_more'), arclight_engine.repository_path(repository.slug), class: 'btn btn-secondary btn-sm') %>
+          <div class='col-12 col-lg-2 mt-3 mt-lg-0 text-center al-repository-extra'>
+            <div class='mb-1 fst-italic fw-bold'>
+              <%= t(:'arclight.views.repositories.number_of_collections', count: repository.collection_count) %>
             </div>
+            <% if repository.collection_count&.positive? %>
+            <%= link_to(t(:'arclight.views.repositories.view_more'), arclight_engine.repository_path(repository.slug), class: 'btn btn-secondary btn-sm') %>
+            <% end %>
+          </div>
           <% end %>
         </div>
       </div>

data/app/views/arclight/repositories/index.html.erb

@@ -1,4 +1,6 @@
-<h1 class="sr-only"><%= t('arclight.repositories') %></h1>
+<% breadcrumb :repositories %>
+
+<h1 class="sr-only visually-hidden"><%= t('arclight.repositories') %></h1>
 
 <div class="al-repositories">
   <% @page_title = t('arclight.views.repositories.title') %>

data/app/views/arclight/repositories/show.html.erb

@@ -1,4 +1,5 @@
 <% @page_title = t(:'arclight.views.repositories.show', name: @repository.name) %>
+<% breadcrumb :repository, @repository %>
 <%= render 'shared/breadcrumbs' %>
 <%= render @repository %>
 <div class="row al-repository-show-header">
@@ -16,16 +17,13 @@
 
 <div class="row">
   <% @collections.each do |document| %>
+    <% doc_presenter = Arclight::IndexPresenter.new(document, self, CatalogController.blacklight_config) %>
     <div class="col-md-12">
       <div class='al-document-title-bar'>
         <div class='row'>
           <div class='col-md-10 col-lg-9'>
-            <h3 class="h5"><%= link_to document.normalized_title, solr_document_path(document.id) %></h3>
-            <%= content_tag('div', class: 'al-document-abstract-or-scope') do %>
-              <%= content_tag('div', 'data-arclight-truncate' => true) do %>
-                <%= document.abstract_or_scope %>
-              <% end %>
-            <% end if document.abstract_or_scope %>
+            <h3 class="h5"><%= link_to doc_presenter.label, solr_document_path(document.id) %></h3>
+            <%= render Arclight::IndexMetadataFieldComponent.with_collection(doc_presenter.field_presenters.select { |p| p.field_config.repository_context }) %>
           </div>
           <% if document.unitid %>
             <div class='col text-right al-collection-id'>

data/app/views/arclight/requests/_aeon_external_request_endpoint.html.erb

@@ -1,9 +1,8 @@
-<% document ||= @document %>
-<% aeon_external_request ||= Arclight::Requests::AeonExternalRequest.new(document, show_presenter(document)) %>
+<% aeon_external_request ||= Arclight::Requests::AeonExternalRequest.new(document, document_presenter(document)) %>
 
-<%= form_tag aeon_external_request.url, method: :post, class: 'al-request-form' do |f| %>
-  <%= render_hash_as_hidden_fields(aeon_external_request.form_mapping) %>
-  <button type='submit' class='al-request-button btn-link'>
+<%= form_tag aeon_external_request.url, method: :post, class: 'd-inline-block al-request-form' do |f| %>
+  <%= render(Blacklight::HiddenSearchStateComponent.new(params: aeon_external_request.form_mapping)) %>
+  <button type='submit' class='al-request-button btn btn-primary btn-sm me-1'>
     <%= t('arclight.request.container') %>
   </button>
 <% end %>

data/app/views/arclight/requests/_aeon_web_ead.html.erb

@@ -1,7 +1,6 @@
-<% document ||= @document %>
-<% if parsed_files = ead_files(document) %>
+<% if parsed_files = document.ead_file %>
   <% aeon_web_ead ||= Arclight::Requests::AeonWebEad.new(document, parsed_files.href) %>
-  <% aeon_web_ead_url = aeon_web_ead.try(:url) %>
+  <% aeon_web_ead_url = aeon_web_ead&.url %>
 
-  <%= link_to 'Request', aeon_web_ead_url, class: 'btn btn-secondary btn-sm' %>
+  <%= link_to 'Request', aeon_web_ead_url, class: 'al-request-button btn btn-primary btn-sm me-1' %>
 <% end %>

data/app/views/arclight/requests/_google_form.html.erb

@@ -1,12 +1,10 @@
-<% document ||= @document %>
-<% google_form ||= Arclight::Requests::GoogleForm.new(document, show_presenter(document), solr_document_path(document)) %>
+<% google_form ||= Arclight::Requests::GoogleForm.new(document, document_presenter(document), solr_document_path(document)) %>
 
-<%= form_tag google_form.url, method: :get, class: 'al-request-form' do |f| %>
+<%= form_tag google_form.url, method: :get, class: 'd-inline-block al-request-form' do |f| %>
   <% google_form.form_mapping.each do |key, value| %>
-    <%= hidden_field_tag value, google_form.send(key) %>
+    <%= hidden_field_tag value, google_form.public_send(key) %>
   <% end %>
-  <!-- Note: previous button class was 'al-request-button btn-link' -->
-  <button type='submit' class='btn btn-secondary btn-sm'>
+  <button type='submit' class='al-request-button btn btn-primary btn-sm me-1'>
     <%= t('arclight.request.container') %>
   </button>
 <% end %>

data/app/views/catalog/_document_list.html.erb

@@ -0,0 +1,8 @@
+<% # Override to conditionally add id="documents" on div. When documents are grouped it causes duplicate id issues %>
+<% # https://github.com/projectblacklight/blacklight/blob/v8.1.0/app/views/catalog/_document_list.html.erb %>
+<% # container for all documents in index list view -%>
+<% view_config = local_assigns[:view_config] || blacklight_config&.view_config(document_index_view_type) %>
+<div <%= 'id="documents"'.html_safe unless grouped? %> class="al-document-listings documents-<%= view_config&.key || document_index_view_type %>">
+  <% document_presenters = documents.map { |doc| document_presenter(doc) } -%>
+  <%= render view_config.document_component.with_collection(document_presenters, partials: view_config.partials, counter_offset: @response&.start || 0) %>
+</div>

data/app/views/catalog/_group.html.erb

@@ -1,21 +1,4 @@
 <% # container for all groups in index view -%>
-<div class='al-grouped-results'>
-  <% @response.groups.each do |g| %>
-    <% parent_document = g.docs.first.parent_document %>
-    <%= render_document_partial(parent_document, :group_header) %>
-    <div class="grouped-documents">
-      <div class="al-grouped-more">
-        <% if g.total > 3 %>
-          <%= t('arclight.views.index.top_group_results', count: 3) %>
-          <%= link_to(
-            t('arclight.views.index.all_group_results', count: g.total),
-            search_catalog_path(search_within_collection(parent_document.collection_name, search_without_group)))
-          %>
-        <% else %>
-          <%= t('arclight.views.index.group_results_count', count: g.total) %>
-        <% end %>
-      </div>
-      <%= render_grouped_documents(g.docs) %>
-    </div>
-  <% end %>
+<div id="documents" class='al-grouped-results'>
+  <%= render (blacklight_config.view_config(document_index_view_type).group_component || Arclight::GroupComponent).with_collection(@response.groups) %>
 </div>

data/app/views/catalog/_group_toggle.html.erb

@@ -1,4 +1,4 @@
-<div class="result-type-group mb-2 mb-lg-0 btn-group float-lg-left float-md-right" role="group" aria-label="<%= t('arclight.views.index.group_results') %>">
+<div class="result-type-group btn-group" role="group" aria-label="<%= t('arclight.views.index.group_results') %>">
   <%= link_to t('arclight.views.index.all_results'),
               search_catalog_path(search_without_group),
               class: "btn btn-outline-secondary #{'active' unless grouped?}"

data/app/views/catalog/_search_results_header.html.erb

@@ -0,0 +1,3 @@
+<%= render 'shared/breadcrumbs' %>
+
+<h1 class="sr-only visually-hidden top-content-title"><%= search_results_header_text %></h1>

data/app/views/catalog/hierarchy.html.erb

@@ -0,0 +1,19 @@
+<p><%= params[:id] %></p>
+<%= turbo_frame_tag "al-hierarchy-#{params[:id]}#{params[:key]}" do %>
+  <%= render partial: "paginate_compact", object: @response if show_pagination? && params[:paginate] %>
+  <% presenters = @response.documents.map{ | document | document_presenter(document) } %>
+  <% if params[:hierarchy].present? %>
+    <ul class="documents">
+      <%= render Arclight::DocumentCollectionHierarchyComponent.with_collection(presenters,
+                                                                                blacklight_config: blacklight_config,
+                                                                                nest_path: params[:nest_path]) %>
+    </ul>
+  <% else %>
+    <table class="table table-striped">
+      <%= render Arclight::DocumentCollectionContextComponent.with_collection(presenters,
+                                                                              blacklight_config: blacklight_config) %>
+    </table>
+  <% end %>
+
+  <%= render 'results_pagination' if params[:paginate] %>
+<% end %>

data/app/views/catalog/index.html.erb

@@ -1,8 +1,17 @@
-<% unless has_search_parameters? %>
-  <%= render 'home' %>
-<% else %>
-  <% content_for(:sidebar) do %>
-    <%= render 'search_sidebar' %>
-  <% end %>
-  <%= render 'search_results' %>
+<% content_for(:sidebar) do %>
+  <% conf = blacklight_config.view_config(document_index_view_type) %>
+  <%= render conf.sidebar_component.new(blacklight_config: blacklight_config,
+                                        response: @response,
+                                        view_config: conf) %>
+<% end %>
+
+<% breadcrumb :search_results, search_state %>
+
+<%= render 'search_results' %>
+
+<%# override upstream to override the search results header, similar to https://github.com/projectblacklight/blacklight/pull/2831 %>
+<%# This section can be omitted in Blacklight 8 %>
+<% content_for(:container_header, flush: true) do -%>
+  <%= render 'search_results_header' %>
+  <%= render 'constraints' %>
 <% end %>

data/app/views/shared/_breadcrumbs.html.erb

@@ -1,15 +1,3 @@
-<nav class='al-search-breadcrumb' role='navigation' aria-label=<%= t('arclight.breadcrumbs.aria_label') %> >
-  <%= link_to t('arclight.routes.home'), root_path %>
-  <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
-  <% if collection_active? %>
-    <%= t('arclight.routes.collections') %>
-  <% elsif on_repositories_index? %>
-    <%= t('arclight.routes.repositories') %>
-  <% elsif on_repositories_show? %>
-    <%= link_to t('arclight.routes.repositories'), arclight_engine.repositories_path %>
-    <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
-    <%= @repository.name %>
-  <% else %>
-    <%= t('arclight.routes.search_results') %>
-  <% end %>
+<nav class='al-search-breadcrumb' role='navigation' aria-label="<%= t('arclight.breadcrumbs.aria_label') %>">
+  <%= breadcrumbs style: :bootstrap5, aria_current: 'page', autoroot: true %>
 </nav>

data/app/views/shared/_main_menu_links.html.erb

@@ -1,6 +1,6 @@
 <li class="nav-item <%= repositories_active_class %>">
   <%= link_to t('arclight.routes.repositories'), arclight_engine.repositories_path, class: 'nav-link' %>
 </li>
-<li class="nav-item ml-3 <%= collection_active_class %>">
+<li class="nav-item ms-3 <%= collection_active_class %>">
   <%= link_to t('arclight.routes.collections'), arclight_engine.collections_path, class: 'nav-link' %>
 </li>

data/arclight.gemspec

@@ -10,35 +10,37 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Darren Hardy', 'Jessie Keck', 'Gordon Leacock', 'Jack Reed']
   spec.email         = ['drh@stanford.edu', 'jessie.keck@gmail.com', 'gordonl@umich.edu', 'phillipjreed@gmail.com']
 
-  spec.summary       = ''
+  spec.summary       = 'A Blacklight-based environment to support discovery and delivery for archives and special collections'
   spec.description   = ''
-  spec.homepage      = 'https://github.com/sul-dlss/arclight'
-  spec.license       = 'Apache-2.0'
+  spec.homepage      = 'https://library.stanford.edu/projects/arclight'
+  spec.metadata = { 'source_code_uri' => 'https://github.com/projectblacklight/arclight' }
+  spec.license = 'Apache-2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.required_ruby_version = '>= 3.0.0'
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '~> 7.2'
-  spec.add_dependency 'blacklight_range_limit', '~> 7.1'
-  spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'sprockets-bumble_d'
+  spec.add_dependency 'blacklight', '>= 8.0.0', '< 9'
+  spec.add_dependency 'gretel'
+  spec.add_dependency 'rails', '>= 7.1', '< 9'
   spec.add_dependency 'traject', '~> 3.0'
-  spec.add_dependency 'traject_plus', '~> 1.2'
+  spec.add_dependency 'traject_plus', '~> 2.0'
 
-  spec.add_development_dependency 'bundler', '> 1.14'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'engine_cart'
   spec.add_development_dependency 'i18n-tasks'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.35'
+  spec.add_development_dependency 'rake', '>= 12.0'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'rubocop', '~> 1.8'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.8'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
   spec.add_development_dependency 'selenium-webdriver'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'
-  spec.add_development_dependency 'webdrivers'
 end