blacklight-spotlight 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0cb09d7197f79846b9c0c0f387315bd2ddd31c
-  data.tar.gz: 4fee08aa4567e890f4564910abe3698ea0d49c63
+  metadata.gz: 4652ccafaff959547b28737b36d4b072a0b743e8
+  data.tar.gz: 40a4c98ab046b271b2d353b03aeebacbc3c3f651
 SHA512:
-  metadata.gz: 1e425de62fb43001490219e0491af698e7ed2b8859f428cab318cc3ea9d80d7d688aac7bdd1d63ec741972c7c6060508e908bb39623c342284fe89837db737cb
-  data.tar.gz: e22ae4e68081e94b126abd715990a15ae06735dd86ef627af971cdc7454efa2903d22776bbc4547d9609ddc2578b309d8b268f8013129aa36351f99ad630590e
+  metadata.gz: de8c2d7f707973d768ad438b0c8388c6c51816efbc321602973a305fb9db0dc02c2d743fcf115c847cfe7faba331edcd770ac7cc1a5e8c9e2dd4f192d0997e4a
+  data.tar.gz: '029ba01acc829eba450a6960869bae7da2ad0c56f098bd9db41bc50864652cb1756cec34a65a7288811d0f73e61995979978aa6c8eb9cbdb3e7cb16437510fdf'

data/app/controllers/concerns/spotlight/catalog.rb

@@ -14,6 +14,7 @@ module Spotlight
     # if the user is a curator
     def add_facet_visibility_field
       return unless current_exhibit && can?(:curate, current_exhibit)
+
       blacklight_config.add_facet_field 'exhibit_visibility',
                                         label: I18n.t(:'spotlight.catalog.facets.exhibit_visibility.label'),
                                         query: {

data/app/controllers/spotlight/browse_controller.rb

@@ -86,6 +86,7 @@ module Spotlight
 
     def document_index_view_type
       return super if params[:view].present?
+
       if @search && @search.default_index_view_type.present?
         blacklight_config.view[@search.default_index_view_type].key
       else

data/app/controllers/spotlight/contact_forms_controller.rb

@@ -30,6 +30,7 @@ module Spotlight
 
     def contact_form_params
       return {} if params[:action] == 'new'
+
       params.require(:contact_form).permit(:name, :email, Spotlight::Engine.config.spambot_honeypot_email_field, :message, :current_url)
     end
   end

data/app/controllers/spotlight/pages_controller.rb

@@ -111,6 +111,7 @@ module Spotlight
 
     def undo_link
       return unless can? :manage, @page
+
       view_context.link_to(t(:'spotlight.versions.undo'), revert_version_path(@page.versions.last), method: :post)
     end
 

data/app/helpers/spotlight/languages_helper.rb

@@ -27,6 +27,7 @@ module Spotlight
     # @return [Boolean]
     def default_language?
       return true unless params[:locale]
+
       params[:locale].to_s == I18n.default_locale.to_s
     end
   end

data/app/models/concerns/spotlight/exhibit_analytics.rb

@@ -4,6 +4,7 @@ module Spotlight
   module ExhibitAnalytics
     def analytics(start_date = 1.month, path = nil)
       return OpenStruct.new unless analytics_provider && analytics_provider.enabled?
+
       @analytics ||= {}
       @analytics[start_date] ||= begin
         analytics_provider.exhibit_data(path || self, start_date: start_date.ago)

data/app/models/concerns/spotlight/solr_document.rb

@@ -68,6 +68,7 @@ module Spotlight
 
     def update_exhibit_resource(resource_attributes)
       return unless resource_attributes && resource_attributes['url']
+
       uploaded_resource.upload.update image: resource_attributes['url']
     end
 

data/app/models/concerns/spotlight/solr_document/atomic_updates.rb

@@ -5,6 +5,7 @@ module Spotlight
     module AtomicUpdates
       def reindex
         return unless write?
+
         data = hash_for_solr_update(to_solr)
 
         blacklight_solr.update params: { commitWithin: 500 }, data: data.to_json, headers: { 'Content-Type' => 'application/json' } unless data.empty?

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

@@ -13,6 +13,7 @@ module SirTrevorRails
 
       def content_align
         return unless text?
+
         text_align == 'left' ? 'right' : 'left'
       end
 

data/app/models/spotlight/analytics/ga.rb

@@ -24,11 +24,11 @@ module Spotlight
 
       def self.user(scope = 'https://www.googleapis.com/auth/analytics.readonly')
         @user ||= begin
-          Legato::User.new(oauth_token(scope))
-        rescue => e
-          Rails.logger.info(e)
-          nil
-        end
+                    Legato::User.new(oauth_token(scope))
+                  rescue => e
+                    Rails.logger.info(e)
+                    nil
+                  end
       end
 
       def self.site

data/app/models/spotlight/blacklight_configuration.rb

@@ -331,12 +331,14 @@ module Spotlight
     # Check to see whether config.view.foobar.title_only_by_default is available
     def title_only_by_default?(view)
       return false if [:show, :enabled].include?(view)
+
       title_only = default_blacklight_config.view.send(:[], view).try(:title_only_by_default)
       title_only.nil? ? false : title_only
     end
 
     def set_show_field_defaults(field)
       return unless index_fields.blank?
+
       views = default_blacklight_config.view.keys
       field.merge! Hash[views.map { |v| [v, false] }]
       field.enabled = true

data/app/models/spotlight/featured_image.rb

@@ -15,6 +15,7 @@ module Spotlight
 
     def iiif_url
       return unless iiif_service_base.present?
+
       [iiif_service_base, iiif_region || 'full', image_size.join(','), '0', 'default.jpg'].join('/')
     end
 
@@ -49,6 +50,7 @@ module Spotlight
 
     def set_tilesource_from_uploaded_resource
       return if iiif_tilesource
+
       riiif = Riiif::Engine.routes.url_helpers
       self.iiif_tilesource = riiif.info_path(id)
       save
@@ -60,6 +62,7 @@ module Spotlight
 
     def iiif_service_base
       return unless iiif_tilesource
+
       iiif_tilesource.sub('/info.json', '')
     end
   end

data/app/models/spotlight/page.rb

@@ -70,6 +70,7 @@ module Spotlight
 
     def thumbnail_image_url
       return unless thumbnail && thumbnail.iiif_url
+
       thumbnail.iiif_url
     end
 
@@ -113,6 +114,7 @@ module Spotlight
 
     def updated_after?(other_page)
       return false unless other_page
+
       updated_at > other_page.updated_at
     end
 
@@ -139,6 +141,7 @@ module Spotlight
     def update_translated_pages_weights_and_parent_page
       return unless locale.to_sym == I18n.default_locale
       return unless saved_change_to_weight? || saved_change_to_parent_page_id?
+
       update_params = {}
       update_params[:weight] = weight if saved_change_to_weight?
       update_params[:parent_page_id] = parent_page_id if saved_change_to_parent_page_id?

data/app/models/spotlight/page_configurations.rb

@@ -73,6 +73,7 @@ module Spotlight
 
     def page_preview_url
       return unless page.persisted?
+
       spotlight.exhibit_preview_block_path(current_exhibit, page)
     end
 

data/app/models/spotlight/reindex_progress.rb

@@ -57,16 +57,19 @@ module Spotlight
 
     def localized_start_time
       return unless started_at
+
       I18n.l(started_at, format: :short)
     end
 
     def localized_finish_time
       return unless finished_at
+
       I18n.l(finished_at, format: :short)
     end
 
     def localized_updated_time
       return unless updated_at
+
       I18n.l(updated_at, format: :short)
     end
   end

data/app/models/spotlight/resource.rb

@@ -90,6 +90,7 @@ module Spotlight
 
       def commit
         return unless write?
+
         blacklight_solr.commit
       rescue => e
         Rails.logger.warn "Unable to commit to solr: #{e}"

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

@@ -25,6 +25,7 @@ module Spotlight
         req = Faraday.head(url)
         req = Faraday.get(url) if req.status == 405
         return unless req.success?
+
         valid_content_types.any? do |valid_type|
           req.headers['content-type'].include?(valid_type)
         end

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

@@ -54,11 +54,13 @@ module Spotlight
 
       def add_thumbnail_url
         return unless thumbnail_field && manifest['thumbnail'].present?
+
         solr_hash[thumbnail_field] = manifest['thumbnail']['@id']
       end
 
       def add_full_image_urls
         return unless full_image_field && full_image_url
+
         solr_hash[full_image_field] = full_image_url
       end
 
@@ -82,10 +84,12 @@ module Spotlight
       def manifest_metadata
         metadata = metadata_class.new(manifest).to_solr
         return {} unless metadata.present?
+
         create_sidecars_for(*metadata.keys)
 
         metadata.each_with_object({}) do |(key, value), hash|
           next unless (field = exhibit_custom_fields[key])
+
           hash[field.field] = value
         end
       end
@@ -93,6 +97,7 @@ module Spotlight
       def json_ld_value(value)
         return value['@value'] if value.is_a?(Hash)
         return value.find { |v| v['@language'] == default_json_ld_language }.try(:[], '@value') if value.is_a?(Array)
+
         value
       end
 
@@ -119,6 +124,7 @@ module Spotlight
       def image_urls
         @image_urls ||= resources.map do |resource|
           next unless resource && !resource.service.empty?
+
           image_url = resource.service['@id']
           image_url << '/info.json' unless image_url.downcase.ends_with?('/info.json')
           image_url
@@ -201,6 +207,7 @@ module Spotlight
 
           metadata.each_with_object({}) do |md, hash|
             next unless md['label'] && md['value']
+
             hash[md['label']] ||= []
             hash[md['label']] += Array(md['value'])
           end
@@ -210,6 +217,7 @@ module Spotlight
           manifest_fields.each_with_object({}) do |field, hash|
             next unless manifest.respond_to?(field) &&
                         manifest.send(field).present?
+
             hash[field.capitalize] ||= []
             hash[field.capitalize] += Array(manifest.send(field))
           end

data/app/models/spotlight/search.rb

@@ -24,6 +24,7 @@ module Spotlight
 
     def thumbnail_image_url
       return unless thumbnail && thumbnail.iiif_url
+
       thumbnail.iiif_url
     end
 

data/app/models/spotlight/solr_document_sidecar.rb

@@ -72,7 +72,7 @@ module Spotlight
         field_name = field.field_name.to_s
         next unless configured_fields && configured_fields[field_name].present?
 
-        solr_fields = Array(field.solr_field || field.field_name)
+        solr_fields = field.solr_fields || Array(field.solr_field || field.field_name)
 
         solr_fields.each do |solr_field|
           solr_hash[solr_field] = configured_fields[field_name]

data/app/serializers/spotlight/exhibit_export_serializer.rb

@@ -150,6 +150,7 @@ module Spotlight
 
       def upload=(json)
         return unless represented.is_a? Spotlight::Resources::Upload
+
         FeaturedImageRepresenter.new(represented.build_upload).from_json(json)
       end
     end

data/app/services/spotlight/carrierwave_file_resolver.rb

@@ -9,6 +9,7 @@ module Spotlight
     def pattern(id)
       uploaded_file = Spotlight::FeaturedImage.find(id).image.file
       raise Riiif::ImageNotFoundError, "unable to find file for #{id}" if uploaded_file.nil?
+
       uploaded_file.file
     end
   end

data/app/services/spotlight/iiif_resource_resolver.rb

@@ -12,6 +12,7 @@ module Spotlight
     def resolve!
       resource.iiif_tilesource = updated_tilesource
       return resource.save if resource.changed?
+
       Rails.logger.info("#{self.class.name} resolved #{iiif_manifest_url}, but nothing changed.")
     end
 
@@ -29,6 +30,7 @@ module Spotlight
       end
 
       raise(ManifestError, "No image with @id #{iiif_image_id} found in #{iiif_manifest_url}") unless new_image
+
       new_image
     end
 
@@ -38,6 +40,7 @@ module Spotlight
       end
 
       raise(ManifestError, "No canvas with @id #{iiif_canvas_id} found in #{iiif_manifest_url}") unless new_canvas
+
       new_canvas
     end
 
@@ -52,20 +55,20 @@ module Spotlight
 
     def response
       @response ||= begin
-        Faraday.get(iiif_manifest_url).body
-      rescue Faraday::Error => e
-        Rails.logger.warn("#{self.class.name} failed to fetch #{iiif_manifest_url} with: #{e}")
-        '{}'
-      end
+                      Faraday.get(iiif_manifest_url).body
+                    rescue Faraday::Error => e
+                      Rails.logger.warn("#{self.class.name} failed to fetch #{iiif_manifest_url} with: #{e}")
+                      '{}'
+                    end
     end
 
     def manifest
       @manifest ||= begin
-        JSON.parse(response)
-      rescue JSON::ParserError => e
-        Rails.logger.warn("#{self.class.name} failed to parse #{iiif_manifest_url} with: #{e}")
-        {}
-      end
+                      JSON.parse(response)
+                    rescue JSON::ParserError => e
+                      Rails.logger.warn("#{self.class.name} failed to parse #{iiif_manifest_url} with: #{e}")
+                      {}
+                    end
     end
 
     class ManifestError < RuntimeError; end

data/app/services/spotlight/solr_document_builder.rb

@@ -13,6 +13,7 @@ module Spotlight
     def documents_to_index
       data = to_solr
       return [] if data.blank?
+
       data &&= [data] if data.is_a? Hash
 
       return to_enum(:documents_to_index) { data.size } unless block_given?
@@ -51,6 +52,7 @@ module Spotlight
     # @returns [#to_solr] something that responds to `to_solr'
     def exhibit_solr_doc(id)
       return NilSolrDocument unless document_model || id.present?
+
       document_model.build_for_exhibit(id, exhibit, resource: resource)
     end
 

data/db/migrate/20180822233601_change_type_of_taggings_taggable.rb

@@ -0,0 +1,8 @@
+class ChangeTypeOfTaggingsTaggable < ActiveRecord::Migration[5.1]
+  def change
+    change_column :taggings,
+                  :taggable_id,
+                  :integer,
+                  using: 'taggable_id::integer'
+  end
+end

data/lib/generators/spotlight/install_generator.rb

@@ -141,9 +141,5 @@ module Spotlight
     def add_translations
       copy_file 'config/initializers/translation.rb'
     end
-
-    def generate_paper_trail_column_size_migration
-      generate 'spotlight:increase_paper_trail_column_size'
-    end
   end
 end

data/lib/migration/iiif.rb

@@ -49,11 +49,13 @@ module Migration
     # as copy the file over to the correct directory given the new class name
     def copy_exhibit_thumbnail_from_featured_image(image)
       return unless Spotlight::Exhibit.where(thumbnail_id: image.id).any?
+
       filename = image.read_attribute_before_type_cast('image')
       filepath = "public/#{image.image.store_dir}/#{filename}"
       image.becomes!(Spotlight::ExhibitThumbnail)
       image.save
       return unless filename.present? && File.exist?(filepath)
+
       old_file = File.new(filepath)
       # AR + STI seems to require that we re-query for this
       # otherwise we get an association miss-match
@@ -66,6 +68,7 @@ module Migration
       filename = contact.read_attribute_before_type_cast('avatar')
       filepath = "public/uploads/spotlight/contact/avatar/#{contact.id}/#{filename}"
       return unless filename.present? && File.exist?(filepath)
+
       old_file = File.new(filepath)
       image = contact.create_avatar { |i| i.image.store!(old_file) }
       iiif_tilesource = riiif.info_path(image.id)
@@ -75,9 +78,11 @@ module Migration
 
     def copy_upload_to_featured_image(upload)
       return unless upload.exhibit # We need exhibit context to re-index, and you can't find an item not in an exhibit
+
       filename = upload.read_attribute_before_type_cast('url')
       filepath = "public/uploads/spotlight/resources/upload/url/#{upload.id}/#{filename}"
       return unless filename.present? && File.exist?(filepath)
+
       old_file = File.new(filepath)
       image = upload.create_upload { |i| i.image.store!(old_file) }
       iiif_tilesource = riiif.info_path(image.id)
@@ -95,6 +100,7 @@ module Migration
 
     def coordinates(image)
       return unless image.image_crop_x.present?
+
       [image.image_crop_x, image.image_crop_y, image.image_crop_w, image.image_crop_h].join(',')
     end