blacklight-spotlight 3.6.0.beta5 → 3.6.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab068b29098e5b106e7b1727c62405eb25134e37c8822cb6507f1d19225ea18
-  data.tar.gz: 4233be77f493a45b868422c3f96acc03242b975670496121630170352000c073
+  metadata.gz: a2ad914a77051069115c87db6d24e42773a464a38bbe59855105e1ba7c323615
+  data.tar.gz: 01a29be86b0b4877e5d7847c3fd11b3cf900bdec4a932a049e97cc2d035cb8eb
 SHA512:
-  metadata.gz: 81f74cb5d502e8b0a190b7dd89853a2a545b49d7a2611985bb679868325f2a2a9e7bfb70021d62506cb9d4cb761a2fc11f1a6d971b7e714501121bf9e665f274
-  data.tar.gz: 1aaacfd669052479884ccedf9ca0758d527bfda03c8587c106172c0b68def1d04bd456c7059041f1cf36426ebe2bd49c02eb3fe2b5247b091784c52aa30070ac
+  metadata.gz: 9ebf452f6eaaba05fe6bfdaafb5b9bd22de0e0900ba4f28b06ce07d9da386f219db5d4d2e2ead6a657ddf0cf5a028ee2bee467e2555fcfcad07e12fd73e2f4a9
+  data.tar.gz: 9a76eeed30ca40bcba0cc0bd1ae8c9aebf9f54830a3613e60fdf4783eb571aea92b69dace93003dd3ee07f2c74a0ee75feb9f5401dd1aa682e6839b13d342ab7

data/app/components/spotlight/document_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Spotlight
+  # Displays the document
+  # 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)])
+    end
+
+    attr_reader :document
+
+    delegate :current_exhibit, :can?, :add_document_meta_content, to: :helpers
+
+    def exhibit_edit_link
+      helpers.exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right btn btn-primary' if can?(:curate, current_exhibit)
+    end
+  end
+end

data/app/controllers/spotlight/catalog_controller.rb

@@ -23,8 +23,7 @@ module Spotlight
     before_action :load_document, only: %i[edit update make_private make_public manifest]
 
     before_action only: :show do
-      blacklight_config.show.partials.unshift 'tophat'
-      blacklight_config.show.partials.unshift 'curation_mode_toggle'
+      blacklight_config.show.document_component = Spotlight::DocumentComponent
     end
 
     before_action only: :admin do
@@ -246,4 +245,5 @@ module Spotlight
       Rails.logger.info "Failed to commit document updates: #{e}"
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/app/controllers/spotlight/exhibits_controller.rb

@@ -115,7 +115,7 @@ module Spotlight
     end
 
     def build_initial_exhibit_contact_emails
-      @exhibit.contact_emails.build unless @exhibit.contact_emails.present?
+      @exhibit.contact_emails.build if @exhibit.contact_emails.blank?
     end
   end
 end

data/app/helpers/spotlight/application_helper.rb

@@ -97,7 +97,7 @@ module Spotlight
     # Return a copy of the blacklight configuration
     # that only includes views conifgured by our block
     def blacklight_view_config_for_search_block(block)
-      return {} unless block.view.present?
+      return {} if block.view.blank?
 
       # Reject any views that aren't configured to display for this block
       blacklight_config.view.select do |view, _|

data/app/helpers/spotlight/main_app_helpers.rb

@@ -7,10 +7,6 @@ module Spotlight
     include Spotlight::NavbarHelper
     include Spotlight::MastheadHelper
 
-    def cache_key_for_spotlight_exhibits
-      "#{Spotlight::Exhibit.count}/#{Spotlight::Exhibit.maximum(:updated_at).try(:utc)}"
-    end
-
     def on_browse_page?
       params[:controller] == 'spotlight/browse'
     end

data/app/jobs/spotlight/add_uploads_from_csv.rb

@@ -40,7 +40,7 @@ module Spotlight
 
       encoded_csv(csv_data).each do |row|
         url = row.delete('url')
-        next unless url.present?
+        next if url.blank?
 
         resource = Spotlight::Resources::Upload.new(
           data: row,

data/app/models/spotlight/blacklight_configuration.rb

@@ -227,7 +227,7 @@ module Spotlight
         config
       end
     end
-    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/AbcSize
 
     def custom_index_fields(blacklight_config)
       Hash[exhibit.custom_fields.reject(&:new_record?).map do |custom_field|
@@ -406,4 +406,5 @@ module Spotlight
       ActiveModel::Type::Boolean.new.cast v
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/app/models/spotlight/featured_image.rb

@@ -36,7 +36,7 @@ module Spotlight
     attr_accessor :upload_id
 
     def iiif_url
-      return unless iiif_service_base.present?
+      return if iiif_service_base.blank?
 
       [iiif_service_base, iiif_region || 'full', image_size.join(','), '0', 'default.jpg'].join('/')
     end

data/app/models/spotlight/page.rb

@@ -129,7 +129,7 @@ module Spotlight
     end
 
     def lock!(user)
-      create_lock(by: user).tap(&:current_session!) unless lock.present?
+      create_lock(by: user).tap(&:current_session!) if lock.blank?
     end
 
     def updated_after?(other_page)

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

@@ -89,7 +89,7 @@ module Spotlight
 
       def manifest_metadata
         metadata = metadata_class.new(manifest).to_solr
-        return {} unless metadata.present?
+        return {} if metadata.blank?
 
         create_sidecars_for(*metadata.keys)
 
@@ -203,7 +203,7 @@ module Spotlight
         end
 
         def metadata_hash
-          return {} unless metadata.present?
+          return {} if metadata.blank?
           return {} unless metadata.is_a?(Array)
 
           metadata.each_with_object({}) do |md, hash|

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

@@ -61,7 +61,7 @@ module Spotlight
 
           thing.manifests.each(&block)
 
-          return unless thing.collections.present?
+          return if thing.collections.blank?
 
           thing.collections.each do |collection|
             recursive_manifests(collection, &block)

data/lib/generators/spotlight/templates/spotlight.scss

@@ -1,6 +1,4 @@
-/*
-*= require bootstrap-tagsinput
-*/
+@import 'bootstrap-tagsinput';
 @import 'spotlight/variables_bootstrap';
 @import 'bootstrap';
 @import 'sir-trevor/main';

data/lib/migration/iiif.rb

@@ -97,7 +97,7 @@ module Migration
     end
 
     def coordinates(image)
-      return unless image.image_crop_x.present?
+      return if image.image_crop_x.blank?
 
       [image.image_crop_x, image.image_crop_y, image.image_crop_w, image.image_crop_h].join(',')
     end

data/lib/spotlight/engine.rb

@@ -340,4 +340,5 @@ module Spotlight
       config.active_record.yaml_column_permitted_classes += [Symbol, ActiveSupport::HashWithIndifferentAccess]
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/spotlight/version.rb

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

data/spec/support/features/test_features_helpers.rb

@@ -46,7 +46,7 @@ module Spotlight
     end
 
     def click_add_widget
-      unless all('.st-block-replacer').present?
+      if all('.st-block-replacer').blank?
         expect(page).to have_css('.st-block-addition')
         first('.st-block-addition').click
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta5
+  version: 3.6.0.beta6
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -911,6 +911,7 @@ files:
 - app/assets/stylesheets/spotlight/browse_group_categories_block.scss
 - app/assets/stylesheets/spotlight/typeahead.scss
 - app/builders/spotlight/bootstrap_breadcrumbs_builder.rb
+- app/components/spotlight/document_component.rb
 - app/controllers/concerns/spotlight/base.rb
 - app/controllers/concerns/spotlight/catalog.rb
 - app/controllers/concerns/spotlight/config.rb
@@ -1204,7 +1205,6 @@ 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
@@ -1213,7 +1213,6 @@ 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
@@ -1529,7 +1528,6 @@ files:
 - vendor/assets/javascripts/tiny-slider.js
 - vendor/assets/javascripts/typeahead.bundle.min.js
 - vendor/assets/stylesheets/bootstrap-tagsinput.css
-- vendor/assets/stylesheets/leaflet-areaselect.css
 - vendor/assets/stylesheets/sir-trevor/_icons.scss
 - vendor/assets/stylesheets/sir-trevor/_variables.scss
 - vendor/assets/stylesheets/sir-trevor/base.scss
@@ -1566,7 +1564,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections

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

@@ -1 +0,0 @@
-<%= 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/_tophat_default.html.erb

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

data/vendor/assets/stylesheets/leaflet-areaselect.css

@@ -1,15 +0,0 @@
-.leaflet-areaselect-shade {
-    position: absolute;
-    background: rgba(0,0,0, 0.4);
-}
-.leaflet-areaselect-handle {
-    position: absolute;
-    background: #fff;
-    border: 1px solid #666;
-    -moz-box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    -webkit-box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    box-shadow: 1px 1px rgba(0,0,0, 0.2);
-    width: 14px;
-    height: 14px;
-    cursor: move;
-}