trusty-cms 7.0.49 → 7.1.1

data/app/assets/stylesheets/admin/assets.scss

@@ -1,3 +1,8 @@
+img.preview {
+  max-width: 300px;
+  max-height: 300px;
+}
+
 .ck-content .asset-image-tag {
   background-color: #dcdcdc;
   display: inline-flex;

data/app/controllers/admin/assets_controller.rb

@@ -1,7 +1,6 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(per_page: 50)
   COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
-  APPROVED_CONTENT_TYPES = Asset::APPROVED_CONTENT_TYPES
 
   def index
     assets = Asset.order('created_at DESC')
@@ -40,7 +39,7 @@ class Admin::AssetsController < Admin::ResourceController
         @page_attachments << (@page_attachment = @asset.page_attachments.build(page: @page))
       end
 
-      render json: { url: @asset.asset.url }
+      render json: { url: @asset.public_url }
     else
       flash[result.fetch(:flash_type, :error)] = result[:error]
       render json: { error: result[:error] }, status: result.fetch(:status, :unprocessable_entity)
@@ -52,6 +51,7 @@ class Admin::AssetsController < Admin::ResourceController
     @page_attachments = []
     uploads = Array(asset_params.dig('asset', 'asset')).reject(&:blank?)
 
+
     uploads.each do |uploaded_asset|
       result = process_uploaded_asset(uploaded_asset)
 
@@ -64,27 +64,20 @@ class Admin::AssetsController < Admin::ResourceController
         @assets << @asset
       else
         flash[result.fetch(:flash_type, :error)] = result[:error]
+        @errors = result[:error]
       end
     end
 
     if asset_params[:for_attachment]
       render partial: 'admin/page_attachments/attachment', collection: @page_attachments
+    elsif @errors.present?
+      flash[:error] = @errors
+      redirect_to new_admin_asset_path
     else
       response_for :create
     end
   end
 
-  def refresh
-    if asset_params[:id]
-      @asset = Asset.find(params[:id])
-      @asset.asset.reprocess!
-      flash[:notice] = t('clipped_extension.thumbnails_refreshed')
-      redirect_to edit_admin_asset_path(@asset)
-    else
-      render
-    end
-  end
-
   private
 
   def process_uploaded_asset(uploaded_asset)
@@ -94,7 +87,7 @@ class Admin::AssetsController < Admin::ResourceController
       return failure_response('Please only upload assets that have a valid extension in the name.', :unprocessable_entity, :notice)
     end
 
-    unless APPROVED_CONTENT_TYPES.include?(uploaded_asset.content_type)
+    unless Asset.approved_content_types.include?(uploaded_asset.content_type)
       return failure_response('Unsupported file type.', :unsupported_media_type, :error)
     end
 

data/app/javascript/plugins/asset_tags/asset_tag_builder.js

@@ -20,13 +20,12 @@ export default class AssetTagBuilder extends Plugin {
             allowWhere: '$text',
             isInline: true,
             isObject: true,
-            allowAttributes: [ 'id', 'size', 'alt', 'height', 'width' ]
+            allowAttributes: [ 'id', 'class', 'size', 'alt', 'height', 'width', 'linkHref', 'linkTarget', 'linkRel' ]
         } );
     }
 
     _defineConverters() {
         const conversion = this.editor.conversion;
-        
         const upcast = conversion.for( 'upcast' );
         const dataDowncast = conversion.for( 'dataDowncast' );
         const editingDowncast = conversion.for( 'editingDowncast' );
@@ -38,12 +37,14 @@ export default class AssetTagBuilder extends Plugin {
             model: ( viewElement, { writer } ) => {
                 const attrs = {};
                 const id = viewElement.getAttribute( 'id' );
+                const klass = viewElement.getAttribute( 'class' );
                 const size = viewElement.getAttribute( 'size' );
                 const alt = viewElement.getAttribute( 'alt' );
                 const height = viewElement.getAttribute( 'height' );
                 const width = viewElement.getAttribute( 'width' );
 
                 if ( id ) attrs.id = id;
+                if ( klass ) attrs.class = klass;
                 if ( size ) attrs.size = size;
                 if ( alt ) attrs.alt = alt;
                 if ( height ) attrs.height = height;
@@ -60,12 +61,14 @@ export default class AssetTagBuilder extends Plugin {
             view: ( modelElement, { writer } ) => {
                 const attrs = {};
                 const id = modelElement.getAttribute( 'id' );
+                const klass = modelElement.getAttribute( 'class' );
                 const size = modelElement.getAttribute( 'size' );
                 const alt = modelElement.getAttribute( 'alt' );
                 const height = modelElement.getAttribute( 'height' );
                 const width = modelElement.getAttribute( 'width' );
 
                 if ( id ) attrs.id = id;
+                if ( klass ) attrs.class = klass;
                 if ( size ) attrs.size = size;
                 if ( alt ) attrs.alt = alt;
                 if ( height ) attrs.height = height;
@@ -81,12 +84,14 @@ export default class AssetTagBuilder extends Plugin {
             view: ( modelElement, { writer } ) => {
                 const attrs = {};
                 const id = modelElement.getAttribute( 'id' );
+                const klass = modelElement.getAttribute( 'class' );
                 const size = modelElement.getAttribute( 'size' );
                 const alt = modelElement.getAttribute( 'alt' );
                 const height = modelElement.getAttribute( 'height' );
                 const width = modelElement.getAttribute( 'width' );
 
                 if ( id ) attrs.id = id;
+                if ( klass ) attrs.class = klass;
                 if ( size ) attrs.size = size;
                 if ( alt ) attrs.alt = alt;
                 if ( height ) attrs.height = height;

data/app/models/asset.rb

@@ -1,6 +1,6 @@
-class Asset < ActiveRecord::Base
-  APPROVED_CONTENT_TYPES = %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css text/calendar].freeze
+require 'trusty_cms/geometry'
 
+class Asset < ActiveRecord::Base
   has_many :page_attachments, dependent: :destroy
   has_many :pages, through: :page_attachments
   has_site if respond_to? :has_site
@@ -16,11 +16,13 @@ class Asset < ActiveRecord::Base
 
   scope :of_types, lambda { |types|
     mimes = AssetType.slice(*types).map(&:mime_types).flatten
-    Asset.select { |x| mimes.include?(x.asset_content_type) }
+    return none if mimes.empty?
+    
+    joins(asset_attachment: :blob).where(active_storage_blobs: { content_type: mimes })
   }
 
   scope :matching, lambda { |term|
-    where(['LOWER(assets.asset_file_name) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)', { term: "%#{term.downcase}%" }])
+    joins(asset_attachment: :blob).where(['LOWER(active_storage_blobs.filename) LIKE (:term) OR LOWER(title) LIKE (:term) OR LOWER(caption) LIKE (:term)', { term: "%#{term.downcase}%" }])
   }
 
   scope :excepting, lambda { |assets|
@@ -33,72 +35,121 @@ class Asset < ActiveRecord::Base
     end
   }
 
+  def self.approved_content_types
+    AssetType.known_mimetypes
+  end
+
   has_one_attached :asset
-  validates :asset,
-            presence: true,
-            blob:
-              {
-                content_type: APPROVED_CONTENT_TYPES,
-                size_range: 1..10.megabytes,
-              }
+  validates :asset, presence: true
+  validate :asset_within_configured_size, if: -> { asset.attached? }
+  validate :approved_content_type, if: -> { asset.attached? }
+  before_validation :sync_attachment_metadata
   before_save :assign_title
   before_save :assign_uuid
 
+  def asset_within_configured_size
+    limit_mb =
+      if video_content_type?
+        TrustyCms.config['assets.max_video_size'].to_i
+      else
+        TrustyCms.config['assets.max_asset_size'].to_i
+      end
+
+    limit_bytes = limit_mb.megabytes
+    return if asset.blob.byte_size.between?(1, limit_bytes)
+
+    errors.add(:asset, :wrong_size_error, limit_mb: limit_mb)
+  end
+
   def asset_type
     AssetType.for(asset)
   end
 
-  delegate :paperclip_processors, :paperclip_styles, :active_storage_styles, :style_dimensions, :style_format,
+  def filename
+    return asset.filename.to_s if asset.attached?
+
+    self[:asset_file_name]
+  end
+
+  def content_type
+    return asset.content_type if asset.attached?
+
+    self[:asset_content_type]
+  end
+
+  def byte_size
+    return asset.blob.byte_size if asset.attached?
+
+    self[:asset_file_size]
+  end
+
+  delegate :active_storage_styles, :style_dimensions, :style_format,
            to: :asset_type
 
-  def thumbnail(style_name = 'original')
-    return asset.url if style_name.to_s == 'original' || render_original(style_name)
-    return asset_variant(style_name.to_s).processed.url if asset.variable?
+  def thumbnail(style_name = 'normal')
+    return rewrite_cloud_url(asset.url) if asset.attached? && content_type == 'application/pdf'
+
+    variant = asset_variant(style_name.to_s)
+    return rewrite_cloud_url(variant.processed.url) if variant
 
     asset_type.icon(style_name.to_s)
   end
 
+  def public_url(style_name = 'normal')
+    if style_name.to_s == 'original' || render_original(style_name)
+      return rewrite_cloud_url(asset.url)
+    end
+
+    variant = asset_variant(style_name.to_s)
+    return rewrite_cloud_url(variant.processed.url) if variant
+
+    rewrite_cloud_url(asset.url)
+  end
+
   def self.ransackable_attributes(auth_object = nil)
     %w[asset_content_type asset_file_name asset_file_size caption created_at created_by_id id original_extension original_height original_width title updated_at updated_by_id uuid]
   end
 
-  def render_original(style_name)
-    style_name.to_s == 'original' && asset.key.include?('culturaldistrict')
+  def render_original(_style_name)
+    return false unless asset.attached?
+
+    prefix = TrustyCms::Config['assets.storage.prefix'].presence
+    prefix ? asset.key.start_with?(prefix) : asset.key.include?('/')
   end
 
   def asset_variant(style_name)
-    case style_name
-    when 'thumbnail'
-      asset.variant(gravity: 'Center', resize: '100x100^', crop: '100x100+0+0')
-    when 'small'
-      asset.variant(gravity: 'Center', resize: '320x320^')
-    when 'normal'
-      asset.variant(gravity: 'Center', resize_to_limit: [asset.metadata[:width], asset.metadata[:height]])
-    when 'icon'
-      asset.variant(gravity: 'Center', resize: '50x50^')
+    style = active_storage_styles[style_name.to_sym]
+    return unless style
+
+    transformations = active_storage_transformations(style[:geometry])
+    transformations[:format] = style[:format] if style[:format]
+    if asset.variable?
+      asset.variant(transformations)
+    elsif asset.previewable?
+      asset.preview(transformations)
     end
   end
 
   def style?(style_name = 'original')
-    style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
+    style_name == 'original' || active_storage_styles.keys.include?(style_name.to_sym)
   end
 
   def basename
-    File.basename(asset_file_name, '.*') if asset_file_name
+    File.basename(filename, '.*') if filename
   end
 
   def extension(style_name = 'original')
     if style_name == 'original'
       original_extension
-    elsif style = paperclip_styles[style_name.to_sym]
-      style.format
+    elsif style = active_storage_styles[style_name.to_sym]
+      style[:format]
     else
       original_extension
     end
   end
 
   def original_extension
-    return asset_file_name.split('.').last.downcase if asset_file_name
+    return filename.split('.').last.downcase if filename
   end
 
   def attached_to?(page)
@@ -106,12 +157,12 @@ class Asset < ActiveRecord::Base
   end
 
   def original_geometry
-    @original_geometry ||= Paperclip::Geometry.new(original_width, original_height)
+    @original_geometry ||= TrustyCms::Geometry.new(*original_dimensions)
   end
 
   def geometry(style_name = 'original')
     unless style?(style_name)
-      raise Paperclip::StyleError,
+      raise TrustyCms::StyleError,
             "Requested style #{style_name} is not defined for this asset."
     end
 
@@ -120,11 +171,11 @@ class Asset < ActiveRecord::Base
       @geometry[style_name] ||= if style_name.to_s == 'original'
                                   original_geometry
                                 else
-                                  style = asset.styles[style_name.to_sym]
-                                  original_geometry.transformed_by(style.geometry)
+                                  style = active_storage_styles[style_name.to_sym]
+                                  original_geometry.transformed_by(style[:geometry])
                                   # this can return dimensions for fully specified style sizes but not for relative sizes when there are no original dimensions
                                 end
-    rescue Paperclip::TransformationError => e
+    rescue TrustyCms::TransformationError => e
       Rails.logger.warn "geometry transformation error: #{e}"
       original_geometry # returns a blank geometry if the real geometry cannot be calculated
     end
@@ -168,26 +219,65 @@ class Asset < ActiveRecord::Base
   end
 
   def dimensions_known?
-    original_width? && original_height?
+    original_dimensions.all?(&:positive?)
   end
 
   private
 
-  # at this point the file queue will not have been written
-  # but the upload should be in place. We read dimensions from the
-  # original file and calculate thumbnail dimensions later, on demand.
+  def original_dimensions
+    width = original_width.presence
+    height = original_height.presence
+    if asset.attached?
+      width ||= asset.metadata[:width] || asset.metadata['width']
+      height ||= asset.metadata[:height] || asset.metadata['height']
+    end
+    [width.to_i, height.to_i]
+  end
+
+  def active_storage_transformations(geometry)
+    return {} unless geometry.present?
+
+    parsed = TrustyCms::Geometry.parse(geometry)
+    width = parsed.width.positive? ? parsed.width : nil
+    height = parsed.height.positive? ? parsed.height : nil
+    return {} unless width && height
+
+    case parsed.modifier
+    when '#', '^', '!'
+      { resize_to_fill: [width, height].compact }
+    when '>', '<'
+      { resize_to_limit: [width, height].compact }
+    else
+      { resize_to_limit: [width, height].compact }
+    end
+  end
+
+  def video_content_type?
+    AssetType.known?(:video) && AssetType.find(:video).mime_types.include?(content_type)
+  end
+
+  def approved_content_type
+    return if Asset.approved_content_types.include?(asset.content_type)
+
+    errors.add(:asset, :content_type, filename: asset.filename.to_s)
+  end
+
+  def sync_attachment_metadata
+    return unless asset.attached?
 
-  def read_dimensions
-    if image? && file = asset.queued_for_write[:original]
-      geometry = Paperclip::Geometry.from_file(file)
-      self.original_width = geometry.width
-      self.original_height = geometry.height
-      self.original_extension = File.extname(file.path)
+    self.asset_file_name = asset.filename.to_s
+    self.asset_content_type = asset.content_type
+    self.asset_file_size = asset.blob.byte_size
+    self.original_extension = asset.filename.extension&.downcase
+    if asset.metadata[:width].present? && asset.metadata[:height].present?
+      self.original_width = asset.metadata[:width]
+      self.original_height = asset.metadata[:height]
     end
-    true
   end
 
   def assign_title
+    return unless asset.attached?
+    
     self.title = asset.filename.base
   end
 
@@ -195,6 +285,12 @@ class Asset < ActiveRecord::Base
     self.uuid = SecureRandom.uuid unless uuid?
   end
 
+  def rewrite_cloud_url(url)
+    return url unless defined?(TrustyCmsClippedExtension::Cloud)
+
+    TrustyCmsClippedExtension::Cloud.rewrite_url(url)
+  end
+
   class << self
     def known_types
       AssetType.known_types
@@ -230,7 +326,7 @@ class Asset < ActiveRecord::Base
 
   # for backwards compatibility
   def self.thumbnail_sizes
-    AssetType.find(:image).paperclip_styles
+    AssetType.find(:image).active_storage_styles
   end
 
   def self.thumbnail_names

data/app/models/asset_type.rb

@@ -3,8 +3,7 @@ class AssetType
   # Conventionally this would a sensible category like 'image' or 'video'
   # that should be processed and presented in a particular way.
   # An AssetType currently provides:
-  #   * processor definitions for paperclip
-  #   * styles definitions for paperclip
+  #   * processing and variant definitions for ActiveStorage
   #   * mime type list for file recognition
   #   * selectors and scopes for retrieving this (or not this) category of asset
   #   * radius tags for those subsets of assets (temporarily removed pending discussion of interface)
@@ -30,7 +29,7 @@ class AssetType
     @mimes.each { |mimetype| @@mime_lookup[mimetype] ||= self }
 
     this = self
-    Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(asset_content_type) end
+    Asset.send :define_method, "#{name}?".intern do this.mime_types.include?(content_type) end
     Asset.send :define_class_method, "#{name}_condition".intern do this.condition; end
     Asset.send :define_class_method, "not_#{name}_condition".intern do this.non_condition; end
     Asset.send :scope, plural.to_sym, -> { where(conditions: condition) }
@@ -85,27 +84,22 @@ class AssetType
     @mimes
   end
 
-  def paperclip_processors
-    TrustyCms.config["assets.create_#{name}_thumbnails?"] ? processors : []
+  def processing_enabled?
+    TrustyCms.config["assets.create_#{name}_thumbnails?"]
   end
 
-  # Parses and combines the various ways in which paperclip styles can be defined, and normalises them into
-  # the format that paperclip expects. Note that :styles => :standard has already been replaced with the
+  # Parses and combines the various ways in which ActiveStorage styles can be defined, and normalises them into
+  # the format that ActiveStorage expects. Note that :styles => :standard has already been replaced with the
   # results of a call to standard_styles.
-  # Styles are passed to paperclip as a hash and arbitrary keys can be passed through from configuration.
+  # Styles are passed as a hash and arbitrary keys can be passed through from configuration.
   #
-  def paperclip_styles
-    # Styles are not relevant if processors are not defined.
-    @paperclip_styles ||= if paperclip_processors.any?
-                            normalize_style_rules(configured_styles.merge(styles))
-                          else
-                            {}
-    end
-    @paperclip_styles
-  end
-
   def active_storage_styles
-    @active_storage_styles ||= normalize_style_rules(configured_styles.merge(styles))
+    @active_storage_styles ||= if processing_enabled?
+                                 normalize_style_rules(configured_styles.merge(styles))
+                               else
+                                 {}
+    end
+    @active_storage_styles
   end
 
   # Takes a motley collection of differently-defined styles and renders them into the standard hash-of-hashes format.
@@ -128,13 +122,15 @@ class AssetType
 
   def standard_styles
     {
+      icon: { geometry: '50x50#', format: :png },
       thumbnail: { geometry: '100x100#', format: :png },
+      original: {},
     }
   end
 
-  # Paperclip styles are defined in the config entry `assets.thumbnails.asset_type`, with the format:
+  # ActiveStorage styles are defined in the config entry `assets.thumbnails.asset_type`, with the format:
   # foo:key-x,key=y,key=z|bar:key-x,key=y,key=z
-  # where 'key' can be any parameter understood by your paperclip processors. Usually they include :geometry and :format.
+  # where 'key' can be any parameter understood by your variant processor. Usually they include :geometry and :format.
   # A typical entry would be:
   #
   #   standard:geometry=640x640>,format=jpg
@@ -153,8 +149,14 @@ class AssetType
   end
 
   def style_dimensions(style_name)
-    if style = paperclip_styles[style_name.to_sym]
-      style[:size]
+    if style = active_storage_styles[style_name.to_sym]
+      style[:geometry]
+    end
+  end
+
+  def style_format(style_name)
+    if style = active_storage_styles[style_name.to_sym]
+      style[:format]
     end
   end
 
@@ -173,8 +175,10 @@ class AssetType
   # class methods
 
   def self.for(attachment)
-    extension = attachment.record.original_extension
-    from_extension(extension) || from_mimetype(attachment.content_type) || catchall
+    return catchall unless attachment&.attached?
+
+    extension = attachment.blob&.filename&.extension&.downcase || attachment.record.original_extension
+    from_extension(extension) || from_mimetype(attachment.blob&.content_type) || catchall
   end
 
   def self.from_extension(extension)

data/app/views/admin/assets/_search_results.html.haml

@@ -1,8 +1,7 @@
 %ul#search_list
   - unless @assets.empty?
     - @assets.each do |asset|
-      =# render :partial => 'asset', :locals => { :asset => asset, :page => @page }
-      = render :partial => 'admin/assets/asset', :locals => { :asset_url => asset.asset.url, :asset_id => asset.id, :asset_type => 'image', :asset_title => asset.title, :asset_thumbnail => asset.thumbnail(:thumbnail), :page => @page }
+      = render :partial => 'admin/assets/asset', :locals => { :asset_url => asset.public_url, :asset_id => asset.id, :asset_type => 'image', :asset_title => asset.title, :asset_thumbnail => asset.thumbnail(:thumbnail), :page => @page }
 
   - else
     %li
@@ -12,4 +11,4 @@
 %script
   Asset.MakeDroppables();
   Asset.MakeDraggables();
-  Event.addBehavior({ '.asset a' : Asset.DisableLinks, 'a.add_asset' : Asset.AddToPage });
+  Event.addBehavior({ '.asset a' : Asset.DisableLinks, 'a.add_asset' : Asset.AddToPage });

data/app/views/admin/assets/edit.html.haml

@@ -14,10 +14,10 @@
         %div.content
           %fieldset
             %label.filename
-              = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
+              = "#{t("clipped_extension.filename")}: #{@asset.filename unless @asset.new_record?}"
             %br
             %label.url
-              = "#{t("clipped_extension.asset_url")}: #{image_path @asset.asset.url unless @asset.new_record?}"
+              = "#{t("clipped_extension.asset_url")}: #{@asset.public_url unless @asset.new_record?}"
             %br
             %label.id
               = "#{t("clipped_extension.asset_id")}: #{@asset.id unless @asset.new_record?}"

data/app/views/admin/assets/remove.html.haml

@@ -7,7 +7,7 @@
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody
     %tr[@asset]
-      %td.icon= image_tag @asset.thumbnail(:icon), :title => @asset.asset_file_name
+      %td.icon= image_tag @asset.thumbnail(:icon), :title => @asset.filename
       %td.name= @asset.title
 
 = form_for [:admin, @asset], :html => { :method => 'delete' } do

data/app/views/admin/configuration/_clipped_edit.html.haml

@@ -2,6 +2,7 @@
   %h3
     = t('clipped_extension.assets')
   %p= edit_config 'assets.max_asset_size'
+  %p= edit_config 'assets.max_video_size'
   %p= edit_config 'assets.display_size'
   %p= edit_config 'assets.insertion_size'
   - %w{image video pdf}.each do |type|

data/app/views/admin/configuration/_clipped_show.html.haml

@@ -2,6 +2,8 @@
   = t('clipped_extension.assets')
 %p.ruled
   = show_config 'assets.max_asset_size'
+%p.ruled
+  = show_config 'assets.max_video_size'
 %p.ruled
   = show_config 'assets.display_size'
 %p.ruled

data/config/database.yml

@@ -0,0 +1,30 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+defaults: &defaults
+  adapter:  mysql
+  db:     localhost
+
+development:
+  adapter: mysql2
+  database: trusty_cms_dev
+  username: root
+  password:
+
+test: &TEST
+  adapter:  mysql2
+  database: trusty_cms_test
+  username: root
+  password: ''
+  db: '127.0.0.1'
+  port: 0
+  encoding: utf8mb4
+  charset: utf8mb4
+  collation: utf8mb4_bin
+
+production:
+  adapter: mysql2
+  database: trusty_cms_live
+  username: root
+  password: