blacklight-spotlight 2.4.1 → 2.5.0

data/app/models/spotlight/page_configurations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # PageConfigurations is a simple class to gather and return all

data/app/models/spotlight/reindex_progress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # ReindexProgress is a class that models the progress of reindexing a list of resources

data/app/models/spotlight/reindexing_log_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # a log entry representing an attempt to reindex some number of records in an exhibit

data/app/models/spotlight/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Exhibit resources

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   module Resources
     ##

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'iiif/presentation'
 
 module Spotlight

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   module Resources
     ##

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'iiif/presentation'
 module Spotlight
   module Resources

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   module Resources
     # Raw solr document uploads

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

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 module Spotlight
   module Resources
     ##

data/app/models/spotlight/role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Exhibit authorization roles

data/app/models/spotlight/search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Exhibit saved searches

data/app/models/spotlight/site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Global spotlight configuration

data/app/models/spotlight/solr_document_sidecar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Exhibit-specific metadata for indexed documents

data/app/presenters/spotlight/iiif_manifest_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # A presenter class that provides the methods that IIIFManifest expects, as well as convenience methods

data/app/serializers/spotlight/exhibit_export_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'roar/decorator'
 require 'roar/json'
 require 'base64'

data/app/serializers/spotlight/featured_image_representer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'roar/decorator'
 require 'roar/json'
 module Spotlight

data/app/serializers/spotlight/main_navigation_representer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Serialize the Spotlight::BlacklightConfiguration

data/app/serializers/spotlight/page_representer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'roar/decorator'
 require 'roar/json'
 module Spotlight

data/app/services/spotlight/carrierwave_file_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   # Used by RIIIF to find files uploaded by carrierwave
   class CarrierwaveFileResolver < Riiif::AbstractFileSystemResolver

data/app/services/spotlight/iiif_resource_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ###
   # Update an ActiveRecord resource that containes identifiers for all the

data/app/services/spotlight/invite_users_service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # A simple service to invite any users who where created by an invitation but it was never sent.

data/app/services/spotlight/resources/iiif_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   module Resources
     # transforms a IiifHarvester into solr documents

data/app/services/spotlight/solr_document_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   # Creates solr documents for the documents in a resource
   class SolrDocumentBuilder

data/app/services/spotlight/upload_solr_document_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   # Creates solr documents for the uploaded documents in a resource
   class UploadSolrDocumentBuilder < SolrDocumentBuilder

data/app/uploaders/spotlight/attachment_uploader.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Sir-trevor image widget uploads

data/app/uploaders/spotlight/featured_image_uploader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
   ##
   # Page, browse category, and exhibit featured image thumbnails

data/app/values/custom_field_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # Value object for calculating a custom field name.
 class CustomFieldName

data/app/views/devise/confirmations/new.html.erb

@@ -2,10 +2,9 @@
 
 <%= bootstrap_form_for(resource, as: resource_name, url: contact_email_confirmation_path,
                        html: { method: :post , class: 'col-md-7' }) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <%= f.email_field :email, :autofocus => true %>
 
   <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>
-

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

@@ -6,6 +6,7 @@
 })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
 ga('create', '<%= j(Spotlight::Engine.config.ga_web_property_id) %>', 'auto');
+ga('set', 'anonymizeIp', <%= Spotlight::Engine.config.ga_anonymize_ip %>)
 ga('send', 'pageview');
 
 </script>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Spotlight::Engine.routes.draw do
   devise_for :contact_email, class_name: 'Spotlight::ContactEmail', only: [:confirmations]
 

data/lib/blacklight/spotlight.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'spotlight'

data/lib/generators/spotlight/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Spotlight
@@ -24,7 +26,6 @@ module Spotlight
     end
 
     def riiif
-      gem 'riiif', '~> 1.0'
       route "mount Riiif::Engine => '/images', as: 'riiif'"
       copy_file 'config/initializers/riiif.rb'
     end

data/lib/generators/spotlight/scaffold_resource_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 # :nodoc:

data/lib/generators/spotlight/templates/catalog_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # Simplified catalog controller
 class CatalogController < ApplicationController

data/lib/generators/spotlight/templates/config/initializers/riiif.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Riiif::Image.file_resolver = Spotlight::CarrierwaveFileResolver.new
 
 # Riiif::Image.authorization_service = IIIFAuthorizationService
 
 # Riiif.not_found_image = 'app/assets/images/us_404.svg'
 #
-Riiif::Engine.config.cache_duration_in_days = 365
+Riiif::Engine.config.cache_duration = 365.days

data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ==> User model
 # Note that your chosen model must include Spotlight::User mixin
 # Spotlight::Engine.config.user_class = '::User'
@@ -59,12 +61,13 @@
 # Spotlight::Engine.config.featured_image_square_size = [400, 400]
 
 # ==> Google Analytics integration
-# Spotlight::Engine.config.analytics_provider = nil
+# Spotlight::Engine.config.analytics_provider = Spotlight::Analytics::Ga
 # Spotlight::Engine.config.ga_pkcs12_key_path = nil
 # Spotlight::Engine.config.ga_web_property_id = nil
 # Spotlight::Engine.config.ga_email = nil
 # Spotlight::Engine.config.ga_analytics_options = {}
 # Spotlight::Engine.config.ga_page_analytics_options = config.ga_analytics_options.merge(limit: 5)
+# Spotlight::Engine.config.ga_anonymize_ip = false # false for backwards compatibility
 
 # ==> Sir Trevor Widget Configuration
 # Spotlight::Engine.config.sir_trevor_widgets = %w(

data/lib/generators/spotlight/templates/config/initializers/translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n/backend/active_record'
 require 'i18n/backend/fallbacks'
 

data/lib/generators/spotlight/templates/config/sitemap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sitemap_generator'
 
 # TODO: Update the default host to match your deployment environment

data/lib/generators/spotlight/templates/spotlight_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # Global Spotlight helpers
 module SpotlightHelper

data/lib/migration/iiif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Migration
   # This migrates FeaturedImages with crop coordinates into IIIF urls which
   # are stored in the `iiif_url' field.

data/lib/migration/page_language.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Migration
   ##
   # This migration sets the Spotlight::Page locale to the I18n.default_locale.

data/lib/spotlight.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spotlight/version'
 require 'spotlight/engine'
 

data/lib/spotlight/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load blacklight which will give spotlight views a higher preference than those in blacklight
 
 # devise must be required to first to ensure we can override devise and invitable views in spotlight correctly
@@ -14,6 +16,7 @@ require 'clipboard/rails'
 require 'leaflet-rails'
 require 'i18n/active_record'
 require 'spotlight/upload_field_config'
+require 'riiif'
 
 module Spotlight
   ##
@@ -115,10 +118,10 @@ module Spotlight
 
     # Suffixes for exhibit-specific solr fields
     config.solr_fields = OpenStruct.new
-    config.solr_fields.prefix = ''.freeze
-    config.solr_fields.boolean_suffix = '_bsi'.freeze
-    config.solr_fields.string_suffix = '_ssim'.freeze
-    config.solr_fields.text_suffix = '_tesim'.freeze
+    config.solr_fields.prefix = ''
+    config.solr_fields.boolean_suffix = '_bsi'
+    config.solr_fields.string_suffix = '_ssim'
+    config.solr_fields.text_suffix = '_tesim'
 
     config.resource_global_id_field = :"#{config.solr_fields.prefix}spotlight_resource_id#{config.solr_fields.string_suffix}"
 
@@ -188,6 +191,7 @@ module Spotlight
     config.ga_email = nil
     config.ga_analytics_options = {}
     config.ga_page_analytics_options = config.ga_analytics_options.merge(limit: 5)
+    config.ga_anonymize_ip = false # false for backwards compatibility
 
     Blacklight::Engine.config.inject_blacklight_helpers = false
 

data/lib/spotlight/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spotlight
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.5.0'
 end

data/lib/tasks/spotlight_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :spotlight do
   desc 'Create an initial admin user'
   task initialize: :environment do

data/spec/controllers/application_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe ApplicationController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }

data/spec/controllers/spotlight/about_pages_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Spotlight::AboutPagesController, type: :controller, versioning: true do
   routes { Spotlight::Engine.routes }
   let(:valid_attributes) { { 'title' => 'MyString', thumbnail: { iiif_url: '' } } }

data/spec/controllers/spotlight/admin_users_controller_spec.rb

@@ -1,4 +1,6 @@
-describe Spotlight::AdminUsersController, type: :controller do
+# frozen_string_literal: true
+
+RSpec.describe Spotlight::AdminUsersController, type: :controller do
   routes { Spotlight::Engine.routes }
 
   before { sign_in(user) }
@@ -19,7 +21,7 @@ describe Spotlight::AdminUsersController, type: :controller do
     describe 'GET index' do
       it 'is successful' do
         get :index
-        expect(response).to be_success
+        expect(response).to be_successful
       end
     end
 

data/spec/controllers/spotlight/appearances_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Spotlight::AppearancesController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }

data/spec/controllers/spotlight/application_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Spotlight::ApplicationController, type: :controller do
   routes { Spotlight::Engine.routes }
   let(:exhibit) { FactoryBot.create(:exhibit) }