blacklight-spotlight 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa6373c3275db7c952f719176557baa81d7f21818746c68abe7b8d1bfbbdb0c7
-  data.tar.gz: 789394e88efa3b2db41013c109902e552436ae9303aaaab70e3a81c846b7ea25
+  metadata.gz: 56b89965ba03cecc57a91706bab8ab9d93033988608116063650459bebd4182c
+  data.tar.gz: 9600146cf5c35a2d763c144d936ffd7e5bfc27a0f519e356dfba500696cbb8f1
 SHA512:
-  metadata.gz: dcd66ee6d299ec878775b8377adbc6a724de13f39ecafe8f3250f96b8accacbd77d64883e70a1503827838098450cb1036d33aee17ed2563227fd85486306e55
-  data.tar.gz: '04726186bf0f0c89c2a4d22b0bb7bca1b82ad04c662522565b3eceacacd0d44d71b2313280922b9ea7d23ef51f75f5d18ab830052e8d8d40abb6dd96d925d71f'
+  metadata.gz: 40df9ad1c5506195ee5601834532b10e0551e362ad546e6594e88e1f4f00bd59b23b58b788b2c0541de8f907d1cfee87ef5d37131a75a208fa0e903817061a2b
+  data.tar.gz: 8cb8bc71aa03bd906b2bdea4c51b0783d5c7be866ce0dd6ac25ac34f54c65ae106f271bd84762061c10adb795082c5cc0f358d51fcff24b947e1060b7704707d

data/app/assets/javascripts/spotlight/admin/blocks/block.js

@@ -1,5 +1,9 @@
 (function ($){
   Spotlight.Block = SirTrevor.Block.extend({
+    scribeOptions: {
+      allowBlockElements: true,
+      tags: { p: true }
+    },
     formable: true,
     editorHTML: function() {
       return _.template(this.template)(this);

data/app/controllers/spotlight/pages_controller.rb

@@ -3,9 +3,6 @@
 module Spotlight
   ##
   # Base CRUD controller for pages
-  # rubocop:disable Metrics/ClassLength
-  # Disableing class length because this is a base
-  # controller that gives other controllers their behavior
   class PagesController < Spotlight::ApplicationController
     before_action :authenticate_user!, except: [:show]
     before_action :load_locale_specific_page, only: %i[destroy edit show update]
@@ -32,7 +29,7 @@ module Spotlight
 
       respond_to do |format|
         format.html
-        format.json { render json: @pages.for_locale.published.to_json(methods: [:thumbnail_image_url]) }
+        format.json { render json: @pages.for_default_locale.published.to_json(methods: [:thumbnail_image_url]) }
       end
     end
 
@@ -208,5 +205,4 @@ module Spotlight
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/app/helpers/spotlight/job_trackers_helper.rb

@@ -4,7 +4,7 @@ module Spotlight
   # HTML <meta> tag helpers
   module JobTrackersHelper
     def job_status_icon(job_tracker)
-      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do # rubocop:disable Rails/ContentTag
+      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do
         if job_tracker.enqueued? || job_tracker.in_progress?
           '⏱'
         elsif job_tracker.completed?

data/app/jobs/spotlight/process_bulk_updates_csv_job.rb

@@ -43,7 +43,7 @@ module Spotlight
       needs_reindex = false
 
       begin
-        if sidecar.public != to_bool(row[config.csv_visibility])
+        if row.headers.include?(config.csv_visibility) && sidecar.public != to_bool(row[config.csv_visibility])
           sidecar.update(public: to_bool(row[config.csv_visibility]))
           needs_reindex = true
         end

data/app/jobs/spotlight/reindex_exhibit_job.rb

@@ -14,7 +14,7 @@ module Spotlight
 
       # Use the provided batch size, or calculate a reasonable default
       batch_count = (count.to_f / batch_size).ceil if batch_size
-      batch_count ||= 1 + Math.log(count).round # e.g. 10 => 3, 100 => 6, 1000 => 8
+      batch_count ||= batch_count_based_on_number_of_resources(count)
 
       return Spotlight::ReindexJob.perform_now(exhibit, reports_on: job_tracker) if batch_count == 1
 
@@ -26,6 +26,8 @@ module Spotlight
       job_tracker.update(status: 'pending')
     end
 
+    private
+
     def perform_later_in_batches(exhibit, of:)
       last = 0
       exhibit.resources.select(:id).in_batches(of: of) do |batch|
@@ -35,5 +37,11 @@ module Spotlight
 
       Spotlight::ReindexJob.perform_later(exhibit, reports_on: job_tracker, start: last)
     end
+
+    def batch_count_based_on_number_of_resources(count)
+      return 1 if count.zero?
+
+      1 + Math.log(count).round # e.g. 10 => 3, 100 => 6, 1000 => 8
+    end
   end
 end

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

@@ -31,7 +31,7 @@ module SirTrevorRails
         send(:'display-item-counts') == 'true'
       end
 
-      def as_json
+      def as_json(*)
         result = super
 
         result[:data][:item] ||= {}

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

@@ -12,7 +12,7 @@ module SirTrevorRails
       end
 
       def pages
-        @pages ||= parent.exhibit.pages.published.where(slug: item_ids).sort do |a, b|
+        @pages ||= parent.exhibit.pages.for_default_locale.published.where(slug: item_ids).sort do |a, b|
           ordered_items.index(a.slug) <=> ordered_items.index(b.slug)
         end
       end
@@ -22,13 +22,13 @@ module SirTrevorRails
       end
 
       # rubocop:disable Metrics/MethodLength
-      def as_json
+      def as_json(*)
         result = super
         result[:data][:item] ||= {}
 
         result[:data][:item].transform_values! do |v|
           begin
-            v['thumbnail_image_url'] = parent.exhibit.pages.find(v['id']).thumbnail_image_url
+            v['thumbnail_image_url'] = parent.exhibit.pages.for_default_locale.find(v['id']).thumbnail_image_url
           rescue ActiveRecord::RecordNotFound
             v = nil
           end

data/app/models/spotlight/page.rb

@@ -46,6 +46,12 @@ module Spotlight
 
     after_update :update_translated_pages_weights_and_parent_page
 
+    def title
+      return super if I18n.locale == I18n.default_locale
+
+      translated_page_for(I18n.locale)&.title || super
+    end
+
     def content_changed!
       @content = nil
     end
@@ -133,6 +139,8 @@ module Spotlight
     end
 
     def translated_page_for(locale)
+      return self if locale == self.locale
+
       translated_pages.for_locale(locale).first
     end
 

data/app/models/spotlight/search.rb

@@ -55,7 +55,9 @@ module Spotlight
     end
 
     def count
-      documents.size
+      @count ||= Rails.cache.fetch([exhibit, self, 'count']) do
+        documents.size
+      end
     end
 
     delegate :blacklight_config, to: :exhibit

data/app/views/layouts/spotlight/base.html.erb

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
+    <%= render partial: 'shared/analytics' %>
     <title><%= h(@page_title || application_name.to_s) %></title>
     <link href="<%= current_exhibit ? spotlight.opensearch_exhibit_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= h(@page_title || application_name.to_str) %>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag 'favicon.ico' %>
@@ -22,8 +22,11 @@
     <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
   </head>
   <body class="<%= render_body_class %>">
+    <%= render partial: 'shared/body_preamble' %>
     <div id="skip-link">
-      <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% if should_render_spotlight_search_bar? %>
+        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% end %>
       <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
       <%= content_for(:skip_links) %>
     </div>

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

@@ -1 +0,0 @@
-<%= render 'shared/analytics' %>

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

@@ -1,4 +1,4 @@
-<% if show_contact_form? %>
+<% if show_contact_form? && (current_exhibit.nil? || !current_page?(spotlight.new_exhibit_contact_form_path(current_exhibit))) %>
   <div id="report-problem-form">
     <%= render 'spotlight/shared/report_a_problem' %>
   </div>

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

@@ -1,8 +1,14 @@
-<ul class="navbar-nav mr-auto">
+<% nav_actions = capture do %>
   <%= render_nav_actions do |config, action|%>
     <li class="nav-item"><%= action %></li>
   <% end %>
-</ul>
+<% end %>
+
+<% if nav_actions.present? %>
+  <ul class="navbar-nav mr-auto">
+    <%= nav_actions %>
+  </ul>
+<% end %>
 
 <ul class="navbar-nav">
   <%= render '/spotlight/shared/locale_picker' %>

data/app/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb

@@ -1 +1 @@
-<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>
+<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id aria-label title width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>

data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb

@@ -17,6 +17,7 @@
       </div>
       <% end %>
 
+      <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
       <%= render_document_index_with_view(block_document_index_view_type(search_results_block), document_list) %>
       <%= render 'results_pagination' %>
   <%- end %>

data/config/locales/spotlight.en.yml

@@ -50,7 +50,7 @@ en:
         destroy: Delete group
       spotlight/role:
         create: Add a new user
-        destroy: Remove from site
+        destroy: Remove from exhibit
       spotlight/search:
         destroy: Delete
         edit_long: Edit this saved search

data/lib/generators/spotlight/install_generator.rb

@@ -39,8 +39,7 @@ module Spotlight
 
     def friendly_id
       gem 'friendly_id'
-      # we need to immediately run `bundle install` while pointing at github.
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
       generate 'friendly_id'
     end
 
@@ -56,7 +55,7 @@ module Spotlight
     def sitemaps
       gem 'sitemap_generator'
 
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
 
       copy_file 'config/sitemap.rb', 'config/sitemap.rb'
 
@@ -91,7 +90,7 @@ module Spotlight
     end
 
     def add_model_mixin
-      if File.exist? 'app/models/solr_document.rb'
+      if File.exist? File.expand_path('app/models/solr_document.rb', destination_root)
         inject_into_file 'app/models/solr_document.rb', after: 'include Blacklight::Solr::Document' do
           "\n  include Spotlight::SolrDocument\n"
         end
@@ -101,7 +100,7 @@ module Spotlight
     end
 
     def add_solr_indexing_mixin
-      if File.exist? 'app/models/solr_document.rb'
+      if File.exist? File.expand_path('app/models/solr_document.rb', destination_root)
         inject_into_file 'app/models/solr_document.rb', after: "include Spotlight::SolrDocument\n" do
           "\n  include #{options[:solr_update_class]}\n"
         end
@@ -111,7 +110,7 @@ module Spotlight
     end
 
     def add_search_builder_mixin
-      if File.exist? 'app/models/search_builder.rb'
+      if File.exist? File.expand_path('app/models/search_builder.rb', destination_root)
         inject_into_file 'app/models/search_builder.rb', after: "include Blacklight::Solr::SearchBuilderBehavior\n" do
           "\n  include Spotlight::SearchBuilder\n"
         end
@@ -126,12 +125,13 @@ module Spotlight
 
     def add_osd_viewer
       gem 'blacklight-gallery', '~> 3.0'
+      bundle_install
       generate 'blacklight_gallery:install'
     end
 
     def add_oembed
       gem 'blacklight-oembed', '~> 1.0'
-      Bundler.with_clean_env { run 'bundle install' }
+      bundle_install
       generate 'blacklight_oembed:install'
       copy_file 'config/initializers/oembed.rb'
     end
@@ -160,6 +160,7 @@ module Spotlight
 
     def generate_devise_invitable
       gem 'devise_invitable'
+      bundle_install
       generate 'devise_invitable:install'
       generate 'devise_invitable', 'User'
     end
@@ -167,5 +168,13 @@ module Spotlight
     def add_translations
       copy_file 'config/initializers/translation.rb'
     end
+
+    private
+
+    def bundle_install
+      inside destination_root do
+        Bundler.with_clean_env { run 'bundle install' }
+      end
+    end
   end
 end

data/lib/spotlight/version.rb

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

data/lib/tasks/spotlight_tasks.rake

@@ -21,7 +21,10 @@ namespace :spotlight do
     print 'Exhibit title: '
     title = $stdin.gets.chomp
 
-    exhibit = Spotlight::Exhibit.create!(title: title)
+    print 'Exhibit URL slug: '
+    slug = @stdin.gets.chomp
+
+    exhibit = Spotlight::Exhibit.create!({ title: title, slug: slug })
 
     puts 'Who can admin this exhibit?'