blacklight-spotlight 5.2.4 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8118c7db4342112b0002fff061c080e3ff8ec95f4025e09f0d068e8be11ccc46
-  data.tar.gz: b8967991643c751413c61d1f58b1332cdeea8b95c49109605fbd6035939545e1
+  metadata.gz: 77faacb08fec808eb92fe2839ac84da6901925e5e417e8b621513e914d058de8
+  data.tar.gz: e3e7c58e629eb49be082bbb6a2b8479a052bf6de073111061a16a1888117555c
 SHA512:
-  metadata.gz: b38d413653acfc7576fec6c2448561bc614623c2158898f1bca25bf82d5d932f2df9261e9a4d3601b00879004637f2c6f999f5d6953ff284869e44410eb44d27
-  data.tar.gz: e25ebfb68db749f40047aa045ce51b358ae43a27e1523e5fc6f545e46279d8147a1a6ba7c3b9e7ef9146edbd182dd8d99ffb15cba6d7f7e9b311721d97a51864
+  metadata.gz: 8abf1cf95606f9c0ee1fbbca58baa3f57ce5b77711c43eb3398cca4e790772536fe9771ce8112532782f990c0c92dc937df962a694b6ec71abc6cd7844f1ee8d
+  data.tar.gz: 1c884044f7cd43d5446dbfe72b2a06758bbfbfe2310e0a4741b2348c68ccaa2f6409cf764ff0b0d59c50d35f4e7b4c79d45898bca5b7ecf76f97f1d8403ba246

data/README.md

@@ -11,10 +11,13 @@ If you have questions or are interested in contributing, please reach out to the
 
 ## Requirements
 
-1. [Ruby](https://www.ruby-lang.org/) 3.2+
-2. [Ruby on Rails](https://rubyonrails.org/) 7.1+
-3. Java (11 or greater) *for Solr*
-4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
+- [Ruby](https://www.ruby-lang.org/) 3.2+
+- [Ruby on Rails](https://rubyonrails.org/) 7.1+
+- Java (11 or greater) *for Solr*
+- [ImageMagick](http://www.imagemagick.org/script/index.php) if using riiif (current default for `config.iiif_service`)
+  - See [riiif](https://github.com/sul-dlss/riiif) configuration instructions for alternatives to ImageMagick (ex. libvips)
+  - May also be needed if adding custom [carrierwave](https://github.com/carrierwaveuploader/carrierwave) uploaders to Spotlight
+
 
 ## Installation
 

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

@@ -24,7 +24,6 @@
 @import "upload";
 @import "nestable";
 @import "blacklight_configuration";
-@import "typeahead";
 @import "bootstrap_overrides";
 @import "blacklight_overrides";
 @import "report_a_problem";
@@ -38,7 +37,6 @@
 @import "admin_users";
 @import "autocomplete";
 
-
 // Styles below keep footer at bottom of viewport
 html {
   position: relative;

data/app/controllers/spotlight/bulk_actions_controller.rb

@@ -29,8 +29,8 @@ module Spotlight
         **params
       )
 
-      redirect_back fallback_location: spotlight.search_exhibit_catalog_path(current_search_session.query_params),
-                    notice: t(:"spotlight.bulk_actions.#{i18n_key}.changed", count: solr_response.total)
+      redirect_back_or_to(spotlight.search_exhibit_catalog_path(current_search_session.query_params),
+                          notice: t(:"spotlight.bulk_actions.#{i18n_key}.changed", count: solr_response.total))
     end
 
     def solr_params

data/app/controllers/spotlight/bulk_updates_controller.rb

@@ -31,9 +31,9 @@ module Spotlight
       bulk_update = Spotlight::BulkUpdate.new(exhibit: current_exhibit, file: file_params)
       if bulk_update.save
         ProcessBulkUpdatesCsvJob.perform_later(current_exhibit, bulk_update)
-        redirect_back fallback_location: spotlight.edit_exhibit_bulk_updates_path(current_exhibit), notice: t(:'spotlight.bulk_updates.update.submitted')
+        redirect_back_or_to(spotlight.edit_exhibit_bulk_updates_path(current_exhibit), notice: t(:'spotlight.bulk_updates.update.submitted'))
       else
-        redirect_back fallback_location: spotlight.edit_exhibit_bulk_updates_path(current_exhibit), alert: t(:'spotlight.bulk_updates.update.error')
+        redirect_back_or_to(spotlight.edit_exhibit_bulk_updates_path(current_exhibit), alert: t(:'spotlight.bulk_updates.update.error'))
       end
     end
 

data/app/controllers/spotlight/catalog_controller.rb

@@ -103,7 +103,7 @@ module Spotlight
       @document.save
 
       respond_to do |format|
-        format.html { redirect_back(fallback_location: [spotlight, current_exhibit, @document]) }
+        format.html { redirect_back_or_to([spotlight, current_exhibit, @document]) }
         format.json { render json: true }
       end
     end
@@ -113,7 +113,7 @@ module Spotlight
       @document.save
 
       respond_to do |format|
-        format.html { redirect_back(fallback_location: [spotlight, current_exhibit, @document]) }
+        format.html { redirect_back_or_to([spotlight, current_exhibit, @document]) }
         format.json { render json: true }
       end
     end

data/app/controllers/spotlight/contact_forms_controller.rb

@@ -15,7 +15,7 @@ module Spotlight
       if @contact_form.valid?
         ContactMailer.report_problem(@contact_form).deliver_now
 
-        redirect_back fallback_location: spotlight.new_exhibit_contact_form_path(current_exhibit), notice: t(:'helpers.submit.contact_form.created')
+        redirect_back_or_to(spotlight.new_exhibit_contact_form_path(current_exhibit), notice: t(:'helpers.submit.contact_form.created'))
       else
         render 'new'
       end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -64,7 +64,7 @@ module Spotlight
       else
         flash.now[:alert] = t('spotlight.exhibits.new_exhibit_form.errors.slug_taken') if @exhibit.errors[:slug].present?
 
-        render :new, status: :unprocessable_entity
+        render :new, status: :unprocessable_content
       end
     end
     # rubocop:enable Metrics/AbcSize

data/app/controllers/spotlight/featured_images_controller.rb

@@ -18,7 +18,7 @@ module Spotlight
     private
 
     def handle_upload_error(exception)
-      render json: { error: [exception.message] }, status: :unprocessable_entity
+      render json: { error: [exception.message] }, status: :unprocessable_content
     end
 
     def tilesource

data/app/controllers/spotlight/pages_controller.rb

@@ -93,7 +93,7 @@ module Spotlight
                else
                  t(:'helpers.submit.page.batch_error', model: human_name)
                end
-      redirect_back fallback_location: spotlight.exhibit_dashboard_path(@exhibit), notice:
+      redirect_back_or_to(spotlight.exhibit_dashboard_path(@exhibit), notice:)
     end
 
     def clone

data/app/controllers/spotlight/searches_controller.rb

@@ -40,10 +40,9 @@ module Spotlight
       @search.query_params = query_params
 
       if @search.save
-        redirect_back fallback_location: fallback_url,
-                      notice: t(:'helpers.submit.search.created', model: @search.class.model_name.human.downcase)
+        redirect_back_or_to(fallback_url, notice: t(:'helpers.submit.search.created', model: @search.class.model_name.human.downcase))
       else
-        redirect_back fallback_location: fallback_url, alert: @search.errors.full_messages.join('<br>'.html_safe)
+        redirect_back_or_to(fallback_url, alert: @search.errors.full_messages.join('<br>'.html_safe))
       end
     end
 
@@ -79,7 +78,7 @@ module Spotlight
                else
                  t(:'helpers.submit.search.batch_error', model: Spotlight::Search.model_name.human.pluralize.downcase)
                end
-      redirect_back fallback_location: fallback_url, notice:
+      redirect_back_or_to(fallback_url, notice:)
     end
 
     protected

data/app/controllers/spotlight/solr_controller.rb

@@ -27,7 +27,7 @@ module Spotlight
       end
 
       if params[:resources_json_upload]
-        redirect_back fallback_location: exhibit_resources_path(@exhibit)
+        redirect_back_or_to(exhibit_resources_path(@exhibit))
       else
         head :ok
       end

data/app/controllers/spotlight/tags_controller.rb

@@ -43,7 +43,7 @@ module Spotlight
 
       rename_tags_later!(tags_to_rename)
 
-      redirect_back fallback_location: fallback_url, notice: t(:'helpers.submit.tags.batch_updated', count: tags_to_rename.count)
+      redirect_back_or_to(fallback_url, notice: t(:'helpers.submit.tags.batch_updated', count: tags_to_rename.count))
     end
 
     private

data/app/controllers/spotlight/versions_controller.rb

@@ -17,7 +17,7 @@ module Spotlight
           redirect_to [obj.exhibit, obj], flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error')
         end
       else
-        redirect_back fallback_location: main_app.root_url, flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error')
+        redirect_back_or_to(main_app.root_url, flash: { html_safe: true }, notice: view_context.t(:'spotlight.versions.undo_error'))
       end
     end
 

data/app/models/spotlight/custom_field.rb

@@ -127,7 +127,7 @@ module Spotlight
     end
 
     def update_sidecar_data_after_field_name_change
-      Spotlight::RenameSidecarFieldJob.perform_later(exhibit, field_before_last_save, self.field, slug_before_last_save, slug)
+      Spotlight::RenameSidecarFieldJob.perform_later(exhibit, field_before_last_save, field, slug_before_last_save, slug)
     end
 
     def document_model

data/lib/spotlight/version.rb

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

data/spec/support/features/test_features_helpers.rb

@@ -39,13 +39,13 @@ module Spotlight
     end
 
     def wait_for_sir_trevor
-      expect(page).to have_selector('.st-blocks.st-ready')
+      expect(page).to have_css('.st-blocks.st-ready')
     end
 
     def save_page_changes
       click_button('Save changes')
       # verify that the page was created.
-      expect(page).to have_selector('.alert-info', text: 'was successfully updated')
+      expect(page).to have_css('.alert-info', text: 'was successfully updated')
       expect(page).to have_no_selector('.alert-danger')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.3.0
 platform: ruby
 authors:
 - Chris Beer
@@ -158,16 +158,22 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: devise_invitable
   requirement: !ruby/object:Gem::Requirement
@@ -848,7 +854,6 @@ files:
 - app/assets/stylesheets/spotlight/_variables.scss
 - app/assets/stylesheets/spotlight/_view_larger.scss
 - app/assets/stylesheets/spotlight/browse_group_categories_block.scss
-- app/assets/stylesheets/spotlight/typeahead.scss
 - app/components/blacklight/icons/arrow_alt_circle_left_component.rb
 - app/components/blacklight/icons/arrow_alt_circle_right_component.rb
 - app/components/blacklight/icons/arrow_back_ios_component.rb
@@ -1561,7 +1566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.7
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections
   to create attractive, feature-rich websites that feature these collections.

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

@@ -1,77 +0,0 @@
-.twitter-typeahead {
-  width: 100%;
-}
-
-.typeahead,
-.tt-query,
-.tt-hint {
-}
-
-.typeahead {
-  background-color: #fff;
-}
-
-.typeahead:focus {
-  border: 2px solid #0097cf;
-}
-
-.tt-hint {
-  color: #999
-}
-
-.tt-dropdown-menu {
-  z-index: $zindex-dropdown !important;
-  margin-top: 2px;
-  max-height: 360px;
-  overflow-y: auto;
-  padding: 8px 0;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 8px;
-     -moz-border-radius: 8px;
-          border-radius: 8px;
-  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-     -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-          box-shadow: 0 5px 10px rgba(0,0,0,.2);
-}
-
-.twitter-typeahead {
-  z-index: $zindex-dropdown !important; /* get typeahead to float on top of e.g. leaflet */
-  .tt-suggestion {
-    font-size: 18px;
-    line-height: 24px;
-    padding: 3px 1rem 3px 1rem;
-    margin-bottom: 1em;
-
-    &.tt-cursor {
-      color: #fff;
-      background-color: #0097cf;
-    }
-  }
-}
-
-.tt-dataset-tags {
-  p {
-    white-space: nowrap !important;
-  }
-}
-
-.autocomplete-item {
-  display: flex;
-
-  p {
-    margin: 0;
-  }
-  .document-thumbnail {
-    margin-right: 1rem;
-    min-width: 60px;
-    padding: 0;
-    width: 60px;
-
-    img {
-      max-width: 60px;
-      max-height: 60px;
-    }
-  }
-}