trusty-cms 7.0.48 → 7.1.0

data/app/controllers/admin/assets_controller.rb

@@ -40,7 +40,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)
@@ -74,17 +74,6 @@ class Admin::AssetsController < Admin::ResourceController
     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)

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,3 +1,5 @@
+require 'trusty_cms/geometry'
+
 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
 
@@ -16,11 +18,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|
@@ -41,6 +45,7 @@ class Asset < ActiveRecord::Base
                 content_type: APPROVED_CONTENT_TYPES,
                 size_range: 1..10.megabytes,
               }
+  before_validation :sync_attachment_metadata
   before_save :assign_title
   before_save :assign_uuid
 
@@ -48,57 +53,86 @@ class Asset < ActiveRecord::Base
     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')
+    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')
+    style_name.to_s == 'original' && asset.attached? && asset.key.include?('culturaldistrict')
   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 +140,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 +154,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 +202,55 @@ 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?
 
-  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)
+    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 sync_attachment_metadata
+    return unless asset.attached?
+
+    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 +258,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 +299,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/config/initializers/trusty_cms_config.rb

@@ -17,54 +17,6 @@ Rails.application.reloader.to_prepare do
   end
 
   TrustyCms.config do |config|
-    config.namespace 'paperclip' do |pc|
-      pc.define 'url', default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
-      pc.define 'path', default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
-      pc.define 'skip_filetype_validation', default: true, type: :boolean
-      pc.define 'storage', default: 'filesystem',
-                select_from: {
-                  'File System' => 'filesystem',
-                  'Amazon S3' => 'fog',
-                  'Google Storage' => 'fog',
-                  'Rackspace Cloud Files' => 'fog',
-                },
-                allow_blank: false,
-                allow_display: false
-
-      pc.namespace 'fog' do |fog|
-        fog.define 'provider', select_from: {
-          'Amazon S3' => 'AWS',
-          'Google Storage' => 'Google',
-          'Rackspace Cloud Files' => 'Rackspace',
-        }
-        fog.define 'directory'
-        fog.define 'public?', default: true
-        fog.define 'host'
-      end
-
-      pc.namespace 'google_storage' do |gs|
-        gs.define 'access_key_id'
-        gs.define 'secret_access_key'
-      end
-
-      pc.namespace 'rackspace' do |rs|
-        rs.define 'username'
-        rs.define 'api_key'
-      end
-
-      pc.namespace 's3' do |s3|
-        s3.define 'key'
-        s3.define 'secret'
-        s3.define 'region', select_from: {
-          'Asia North East' => 'ap-northeast-1',
-          'Asia South East' => 'ap-southeast-1',
-          'EU West' => 'eu-west-1',
-          'US East' => 'us-east-1',
-          'US West' => 'us-west-1',
-        }
-      end
-    end
-
     config.namespace 'assets', allow_display: false do |assets|
       assets.define 'create_image_thumbnails?', default: 'true'
       assets.define 'create_video_thumbnails?', default: 'true'
@@ -89,4 +41,4 @@ Rails.application.reloader.to_prepare do
 
   Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper
   Admin::SnippetsController.send :helper, MultiSite::SiteChooserHelper
-end
+end

data/config/locales/en.yml

@@ -109,7 +109,7 @@ en:
     remove_from_page: 'Remove from page'
     reorder: 'Reorder'
     remove: 'Remove'
-    refresh_assets_rake_task: 'For better results please log into your server and run <code>rake paperclip:refresh class=Asset</code>.'
+    refresh_assets_rake_task: 'For better results please log into your server and run <code>rake active_storage:refresh class=Asset</code>.'
     replace_file: 'Replace File'
     save_and_upload: 'Save and Upload'
     search_assets: 'Search for assets'

data/config/routes.rb

@@ -27,8 +27,6 @@ TrustyCms::Application.routes.draw do
 
     resources :assets do
       get :remove, on: :member
-      get :refresh, on: :collection
-      put :refresh, on: :member
       collection do
         post :uploader
       end

data/db/migrate/20110606111250_update_configuration.rb

@@ -2,22 +2,6 @@ class UpdateConfiguration < ActiveRecord::Migration[5.2]
   def self.up
     if TrustyCms.config.table_exists?
 
-      puts "Importing paperclip configuration"
-      %w{url path skip_filetype_validation storage}.select{|k| !!TrustyCms.config["assets.#{k}"] }.each do |k|
-        begin
-          TrustyCms.config["paperclip.#{k}"] = TrustyCms.config["assets.#{k}"]
-        rescue ActiveRecord::RecordInvalid => e
-          print "Oops! There was trouble setting #{k} to '#{TrustyCms.config["assets.#{k}"]}'"
-          print "\nSetting it to 'fog'. Please see the clipped extension README for more details."
-          TrustyCms.config["paperclip.#{k}"] = 'fog'
-        end
-      end
-
-      puts "Importing s3 storage configuration"
-      %w{bucket key secret host_alias}.select{|k| !!TrustyCms.config["assets.s3.#{k}"] }.each do |k|
-        TrustyCms.config["paperclip.s3.#{k}"] = TrustyCms.config["assets.s3.#{k}"]
-      end
-
       puts "Importing thumbnail configuration"
       if thumbnails = TrustyCms.config["assets.additional_thumbnails"]
         old_styles = thumbnails.to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}