blacklight-spotlight 4.0.1 → 4.0.2

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

@@ -30,8 +30,8 @@ SirTrevor.Blocks.Oembed =  (function(){
       </div>
       <div class="row">
         <div class="form-group mb-3 col-md-8">
-          <label for="${this.formId(id_key)}">${i18n.t("blocks:oembed:url")}</label>
-          <input name="${id_key}" class="form-control col-md-6" type="text" id="${this.formId(id_key)}" />
+          <label for="${this.formId(this.id_key)}">${i18n.t("blocks:oembed:url")}</label>
+          <input name="${this.id_key}" class="form-control col-md-6" type="text" id="${this.formId(this.id_key)}" />
         </div>
       </div>
       ${this.text_area()}

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

@@ -12,8 +12,6 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
     auto_play_images_interval_key: "auto-play-images-interval",
     max_height_key: "max-height",
 
-    item_options: function() { return "" },
-
     carouselCycleTimesInSeconds: {
       values: [ 3, 5, 8, 12, 20 ],
       selected: 5

data/app/javascript/spotlight/admin/exhibits.js

@@ -1,3 +1,5 @@
+import { URLify } from 'parameterize';
+
 export default class {
   connect() {
     // auto-fill the exhibit slug on the new exhibit form

data/app/javascript/spotlight/admin/form_observer.js

@@ -1,5 +1,5 @@
 
-(function($, undefined) {
+(function($, _) {
   'use strict';
 
   /*

data/app/javascript/spotlight/admin/index.js

@@ -1,6 +1,5 @@
 // These scripts are in the vendor directory
 import 'nestable'
-import 'parameterize'
 import 'bootstrap-tagsinput'
 import 'jquery.serializejson'
 import 'leaflet-iiif'

data/app/javascript/spotlight/admin/multi_image_selector.js

@@ -66,7 +66,7 @@
       $('li', thumbList).each(function(){
         var thisThumb  = $(this),
             image      = $('img', thisThumb),
-            totalWidth = width += thisThumb.width();
+            totalWidth = width += thisThumb.width(),
             position   = (thumbList.position().left + totalWidth) - thisThumb.width();
 
         if(position >= 0 && position < viewportWidth) {

data/app/javascript/spotlight/admin/search_typeahead.js

@@ -6,7 +6,7 @@ import { addImageSelector } from 'spotlight/admin/add_image_selector'
       addAutocompleteBehavior($(this));
     });
 
-    function addAutocompleteBehavior( typeAheadInput, settings ) {
+    function addAutocompleteBehavior( typeAheadInput, _ ) {
       var settings = $.extend({
         displayKey: 'title',
         minLength: 0,
@@ -63,4 +63,4 @@ export function addAutocompletetoFeaturedImage(){
       $(this).attr('type', 'text');
     });
   }
-}
+}

data/app/javascript/spotlight/admin/spotlight_nestable.js

@@ -27,7 +27,7 @@ const Module = (function() {
             var children = data[i]['children'];
             for(var child in children){
               var id = children[child]['id']
-              child_node = findNode(id, container);
+              var child_node = findNode(id, container);
               setWeight(child_node, weight++);
               setParent(child_node, parent_id);
             }
@@ -65,4 +65,4 @@ const Module = (function() {
     }
 })();
 
-export default Module
+export default Module

data/app/models/spotlight/featured_image.rb

@@ -100,24 +100,11 @@ module Spotlight
     # Ideally, we might create a join table to connect this model to where it is used, but 🤷‍♂️
     # Instead, we check each place this might be used and touch it
     def bust_containing_resource_caches
-      if Rails.version > '6'
-        Spotlight::Search.where(thumbnail: self).or(Spotlight::Search.where(masthead: self)).touch_all
-        Spotlight::Page.where(thumbnail: self).touch_all
-        Spotlight::Exhibit.where(thumbnail: self).or(Spotlight::Exhibit.where(masthead: self)).touch_all
-        Spotlight::Contact.where(avatar: self).touch_all
-        Spotlight::Resources::Upload.where(upload: self).touch_all
-      else
-        bust_containing_resource_caches_rails5
-      end
-    end
-
-    # Rails 5 doesn't support touch_all.
-    def bust_containing_resource_caches_rails5
-      Spotlight::Search.where(thumbnail: self).or(Spotlight::Search.where(masthead: self)).find_each(&:touch)
-      Spotlight::Page.where(thumbnail: self).find_each(&:touch)
-      Spotlight::Exhibit.where(thumbnail: self).or(Spotlight::Exhibit.where(masthead: self)).find_each(&:touch)
-      Spotlight::Contact.where(avatar: self).find_each(&:touch)
-      Spotlight::Resources::Upload.where(upload: self).find_each(&:touch)
+      Spotlight::Search.where(thumbnail: self).or(Spotlight::Search.where(masthead: self)).touch_all
+      Spotlight::Page.where(thumbnail: self).touch_all
+      Spotlight::Exhibit.where(thumbnail: self).or(Spotlight::Exhibit.where(masthead: self)).touch_all
+      Spotlight::Contact.where(avatar: self).touch_all
+      Spotlight::Resources::Upload.where(upload: self).touch_all
     end
   end
 end

data/lib/generators/spotlight/install_generator.rb

@@ -10,14 +10,6 @@ module Spotlight
     class_option :solr_update_class, type: :string, default: 'Spotlight::SolrDocument::AtomicUpdates'
     class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000
 
-    # we're not using webpacker, so we need to re-add sprockets functionality
-    def add_js_rails6
-      return unless Rails.version.to_i == 6
-
-      # By default rails generates javascript_pack_tag, we'll change this to javascript_include_tag
-      gsub_file 'app/views/layouts/application.html.erb', /pack/, 'include'
-    end
-
     def add_manifest
       append_to_file 'app/assets/javascripts/application.js', "\n//= require_tree .\n"
       append_to_file 'app/assets/config/manifest.js', "\n//= link spotlight/manifest.js"
@@ -42,7 +34,7 @@ module Spotlight
 
     def riiif
       gem 'riiif'
-      Bundler.with_clean_env { run 'bundle install' }
+      Bundler.with_unbundled_env { run 'bundle install' }
       route "mount Riiif::Engine => '/images', as: 'riiif'"
       copy_file 'config/initializers/riiif.rb'
     end
@@ -194,7 +186,7 @@ module Spotlight
 
     def bundle_install
       inside destination_root do
-        Bundler.with_clean_env { run 'bundle install' }
+        Bundler.with_unbundled_env { run 'bundle install' }
       end
     end
   end

data/lib/spotlight/version.rb

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

data/vendor/assets/javascripts/parameterize.js

@@ -135,3 +135,5 @@ function URLify(s, num_chars) {
   s = s.toLowerCase();             // convert to lowercase
   return s.substring(0, num_chars);// trim to first num_chars chars
 }
+
+export { URLify };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -459,7 +459,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -469,7 +469,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'