trusty-cms 4.3.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae1333499a79a83bd6a8a0a46673e1b5ef54e589b3e7cf0ec3447d473396b769
-  data.tar.gz: 3ca5980f13834a3cdfce5ca580a39259394345ca1c034580b09aa0c0df9662ee
+  metadata.gz: f0fc7adbc55517598d8eb365fe2518df17faab505fece52ec5dcb3374459b45c
+  data.tar.gz: 9de9c0c248cbe41a2c4b55592c9a3412f5cc50279e680de125c7ced575c0a0ac
 SHA512:
-  metadata.gz: 0e0d9815b5f9d3a5cdf4bfe06e23e6f8a018639c3871aae42e38e3f97623f0f469d5740bad25edf621b7277b8acdeb095de3fef5e475ea69e7643952cd91048b
-  data.tar.gz: 96869827969eedee8b76da2dee964ed2308bbbf5e58c0010a274970559bb890d5be2a6c2d431d5212aac1a6bd140c86c2beacb8978303eaebb09798e9970f5c7
+  metadata.gz: 737f21b157db73ad8763d0bcb2576e8f6ff9ddff69d3be98713aae5903c71432e48db36df8f16b4def7e226f18d2f8fe4d4905ef80623f5638a4b245f2ebbe26
+  data.tar.gz: f472cff774a907272ac9a4a60a9a73ac9ef081fe4cd29411abf55238e1ef62640384f00a5be9c7f7fe68e968b05c9fa680438614378501e0cc7e7eebb50e4581

data/Gemfile

@@ -12,10 +12,11 @@ gem 'trustygems', '~> 0.2.0'
 gemspec
 
 group :development, :test do
+  gem 'activestorage-validator'
   gem 'acts_as_list'
   gem 'database_cleaner'
   gem 'factory_bot_rails', '6.2.0'
-  gem 'kt-paperclip', '~> 7.0.0'
+  gem 'file_validators'
   gem 'launchy', '~> 2.5.0'
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'

data/Gemfile.lock

@@ -1,17 +1,19 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.3.1)
+    trusty-cms (5.0.0)
       RedCloth (= 4.3.2)
+      activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (~> 2.9.1)
-      ckeditor (>= 4.2.2, < 4.3.0)
+      ckeditor (>= 4.2.2, < 4.4.0)
       delocalize (>= 0.2, < 2.0)
       devise
       execjs (~> 2.7)
       haml
       haml-rails (~> 2.0)
       highline (>= 1.7.8, < 2.1.0)
+      image_processing
       kraken-io
       mini_racer
       mysql2
@@ -33,60 +35,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actioncable (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailbox (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionmailer (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.2)
-      actionview (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionpack (6.1.4.1)
+      actionview (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actiontext (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    actionview (6.1.4.1)
+      activesupport (= 6.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activejob (6.1.4.1)
+      activesupport (= 6.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activerecord (6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
-    activestorage (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activestorage (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.2)
+      mini_mime (>= 1.1.0)
+    activestorage-validator (0.1.4)
+      rails (>= 5.2.0)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -96,7 +100,7 @@ GEM
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     bcrypt (3.1.16)
     builder (3.2.4)
@@ -109,17 +113,15 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    ckeditor (4.2.4)
-      cocaine
+    ckeditor (4.3.0)
       orm_adapter (~> 0.5.0)
+      terrapin
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.6.0)
-      terrapin (= 0.6.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    css_parser (1.9.0)
+    css_parser (1.10.0)
       addressable
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -145,10 +147,13 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    haml (5.2.1)
+    ffi (1.15.4)
+    file_validators (3.0.0)
+      activemodel (>= 3.2)
+      mime-types (>= 1.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (2.0.1)
@@ -163,45 +168,47 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    image_processing (1.12.1)
+      mini_magick (>= 4.9.5, < 5)
+      ruby-vips (>= 2.0.17, < 3)
     json (2.5.1)
     kraken-io (0.1.3)
       activesupport
       httparty
       json
       multipart-post
-    kt-paperclip (7.0.0)
-      activemodel (>= 4.2.0)
-      activesupport (>= 4.2.0)
-      marcel (~> 1.0.1)
-      mime-types
-      terrapin (~> 0.6.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8-node (15.14.0.1-x86_64-darwin-18)
-    loofah (2.10.0)
+    libv8-node (15.14.0.1-x86_64-darwin-20)
+    libv8-node (15.14.0.1-x86_64-linux)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
-    mini_mime (1.0.3)
+    mini_magick (4.11.0)
+    mini_mime (1.1.1)
     mini_racer (0.4.0)
       libv8-node (~> 15.14.0.0)
     minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
-    nio4r (2.5.7)
-    nokogiri (1.11.7-x86_64-darwin)
+    nio4r (2.5.8)
+    nokogiri (1.12.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.4-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -217,40 +224,40 @@ GEM
     public_suffix (4.0.6)
     racc (1.5.2)
     rack (2.2.3)
-    rack-cache (1.12.1)
+    rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.3.2)
-      actioncable (= 6.1.3.2)
-      actionmailbox (= 6.1.3.2)
-      actionmailer (= 6.1.3.2)
-      actionpack (= 6.1.3.2)
-      actiontext (= 6.1.3.2)
-      actionview (= 6.1.3.2)
-      activejob (= 6.1.3.2)
-      activemodel (= 6.1.3.2)
-      activerecord (= 6.1.3.2)
-      activestorage (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    rails (6.1.4.1)
+      actioncable (= 6.1.4.1)
+      actionmailbox (= 6.1.4.1)
+      actionmailer (= 6.1.4.1)
+      actionpack (= 6.1.4.1)
+      actiontext (= 6.1.4.1)
+      actionview (= 6.1.4.1)
+      activejob (= 6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activerecord (= 6.1.4.1)
+      activestorage (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.2)
+      railties (= 6.1.4.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.3.2)
-      actionpack (= 6.1.3.2)
-      activesupport (= 6.1.3.2)
+    railties (6.1.4.1)
+      actionpack (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 0.13)
       thor (~> 1.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rdoc (6.3.2)
     regexp_parser (2.1.1)
     responders (3.0.1)
@@ -270,7 +277,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.1)
+    rspec-rails (5.0.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -279,7 +286,9 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    ruby_parser (3.16.0)
+    ruby-vips (2.1.3)
+      ffi (~> 1.12)
+    ruby_parser (3.17.0)
       sexp_processor (~> 4.15, >= 4.15.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -323,19 +332,22 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.0)
+    will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-18
+  x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
+  activestorage-validator
   acts_as_list
   database_cleaner
   factory_bot_rails (= 6.2.0)
-  kt-paperclip (~> 7.0.0)
+  file_validators
   launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)
@@ -347,4 +359,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.2.19
+   2.2.27

data/app/assets/config/trusty-cms-manifest.js

@@ -0,0 +1,6 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link admin/assets.css
+//= link admin/assets_admin.js
+//= link admin/custom_file_upload.js

data/app/assets/javascripts/ckeditor/config.js

@@ -3,8 +3,8 @@ CKEDITOR.editorConfig = function( config ) {
   config.removeFormatTags = "";
   config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
   config.protectedSource.push(/<r:[^>/]*\/>/g);
-
-  config.forcePasteAsPlainText = true;
+  //let paste from word be available
+  // config.forcePasteAsPlainText = false;
   // if you want to remove clipboard, you have to remove all of these:
   // clipboard, pastetext, pastefromword
   config.removePlugins = "save, newpage, preview, print, templates, forms, flash, smiley, language, pagebreak, iframe, bidi";

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

@@ -6,6 +6,7 @@ main {
 
 .reversed main {
   .content {
+    line-height: 1.5;
     padding: 1em;
   }
 }

data/app/controllers/admin/assets_controller.rb

@@ -1,6 +1,9 @@
 class Admin::AssetsController < Admin::ResourceController
   paginate_models(per_page: 50)
   COMPRESS_FILE_TYPE = ['image/jpeg', 'image/png', 'image/gif', 'image/svg+xml'].freeze
+  before_action do
+    ActiveStorage::Current.host = request.base_url
+  end
 
   def index
     assets = Asset.order('created_at DESC')
@@ -67,8 +70,9 @@ class Admin::AssetsController < Admin::ResourceController
   private
 
   def compress(uploaded_asset)
+    require 'open-uri'
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)
-    File.write(uploaded_asset.tempfile, open(data.kraked_url).read, { mode: 'wb' })
+    File.write(uploaded_asset.tempfile, URI.open(data.kraked_url).read, mode: 'wb')
     uploaded_asset
   end
 
@@ -81,4 +85,4 @@ class Admin::AssetsController < Admin::ResourceController
   def asset_params
     params.permit(:id, :for_attachment, asset: [:caption, :for_attachment, asset: []])
   end
-end
+end

data/app/models/asset.rb

@@ -1,6 +1,4 @@
 class Asset < ActiveRecord::Base
-  include Paperclip::Glue
-
   has_many :page_attachments, dependent: :destroy
   has_many :pages, through: :page_attachments
   has_site if respond_to? :has_site
@@ -33,52 +31,43 @@ class Asset < ActiveRecord::Base
     end
   }
 
-  has_attached_file :asset,
-                    styles: lambda { |attachment|
-                      AssetType.for(attachment).paperclip_styles
-                    },
-                    processors: lambda { |asset|
-                      asset.paperclip_processors
-                    },
-                    whiny: false,
-                    storage: TrustyCms.config['paperclip.storage'],
-                    path: TrustyCms.config['paperclip.path'],
-                    url: TrustyCms.config['paperclip.url'],
-                    fog_credentials: TrustyCmsClippedExtension::Cloud.credentials,
-                    fog_directory: TrustyCms.config['paperclip.fog.directory'],
-                    fog_public: TrustyCms.config['paperclip.fog.public?'] || true,
-                    fog_host: TrustyCmsClippedExtension::Cloud.host,
-                    fog_file: {
-                      'Cache-Control' => 'max-age=31536000',
-                    }
-
-  validates_attachment_content_type :asset, content_type: ['application/zip', 'image/jpg', 'image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/javascript', 'text/javascript', 'text/css']
-
+  has_one_attached :asset
+  validates :asset,
+            presence: true,
+            blob:
+              {
+                content_type: %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css],
+                size_range: 1..5.megabytes,
+              }
   before_save :assign_title
   before_save :assign_uuid
 
-  after_post_process :read_dimensions
-
-  validates_attachment_presence :asset, message: 'You must choose a file to upload!'
-  if TrustyCms.config['paperclip.skip_filetype_validation'] != 'true' && TrustyCms.config['paperclip.content_types']
-    validates_attachment_content_type :asset, content_type: TrustyCms.config['paperclip.content_types'].gsub(' ', '').split(',')
-  else
-    validates_attachment_presence :asset, message: 'Your uploaded file must have an extension in its name!'
-  end
-  validates_attachment_size :asset, less_than: (TrustyCms.config['assets.max_asset_size'] || 5).to_i.megabytes
-
   def asset_type
     AssetType.for(asset)
   end
-  delegate :paperclip_processors, :paperclip_styles, :style_dimensions, :style_format, to: :asset_type
+  delegate :paperclip_processors, :paperclip_styles, :active_storage_styles, :style_dimensions, :style_format,
+           to: :asset_type
 
   def thumbnail(style_name = 'original')
-    return asset.url if style_name.to_sym == :original
-    return asset.url(style_name.to_sym) if style?(style_name)
+    return asset.url if style_name == 'original'
+    return asset_variant(style_name).processed.url if asset.variable?
 
     asset_type.icon(style_name)
   end
 
+  def asset_variant(style_name)
+    case style_name
+    when 'thumbnail'
+      asset.variant(gravity: 'Center', resize: '100x100^', crop: '100x100+0+0')
+    when 'normal'
+      asset.variant(gravity: 'Center', resize: '640x640^')
+    when 'small'
+      asset.variant(gravity: 'Center', resize: '320x320^')
+    when 'icon'
+      asset.variant(gravity: 'Center', resize: '50x50^')
+    end
+  end
+
   def style?(style_name = 'original')
     style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
   end
@@ -110,7 +99,10 @@ class Asset < ActiveRecord::Base
   end
 
   def geometry(style_name = 'original')
-    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless style?(style_name)
+    unless style?(style_name)
+      raise Paperclip::StyleError,
+            "Requested style #{style_name} is not defined for this asset."
+    end
 
     @geometry ||= {}
     begin
@@ -118,8 +110,9 @@ class Asset < ActiveRecord::Base
                                   original_geometry
                                 else
                                   style = asset.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
+                                  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
       Rails.logger.warn "geometry transformation error: #{e}"
       original_geometry # returns a blank geometry if the real geometry cannot be calculated
@@ -174,19 +167,17 @@ class Asset < ActiveRecord::Base
   # original file and calculate thumbnail dimensions later, on demand.
 
   def read_dimensions
-    if image?
-      if 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)
-      end
+    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)
     end
     true
   end
 
   def assign_title
-    self.title = asset_file_name.downcase.sub(original_extension, '').sub('.', '')
+    self.title = asset.filename.base
   end
 
   def assign_uuid
@@ -235,7 +226,7 @@ class Asset < ActiveRecord::Base
 
   # this is a convenience for image-pickers
   def self.thumbnail_options
-    asset_sizes = thumbnail_sizes.collect do |k, v|
+    asset_sizes = thumbnail_sizes.map do |k, v|
       size_id = k
       size_description = "#{k}: "
       size_description << (v.is_a?(Array) ? v.join(' as ') : v)

data/app/models/asset_type.rb

@@ -104,6 +104,10 @@ class AssetType
     @paperclip_styles
   end
 
+  def active_storage_styles
+    @active_storage_styles ||= normalize_style_rules(configured_styles.merge(styles))
+  end
+
   # Takes a motley collection of differently-defined styles and renders them into the standard hash-of-hashes format.
   # Solitary strings are assumed to be  #
   def normalize_style_rules(styles = {})
@@ -173,8 +177,8 @@ class AssetType
   # class methods
 
   def self.for(attachment)
-    extension = File.extname(attachment.original_filename).sub(/^\.+/, '')
-    from_extension(extension) || from_mimetype(attachment.instance_read(:content_type)) || catchall
+    extension = attachment.record.original_extension
+    from_extension(extension) || from_mimetype(attachment.content_type) || catchall
   end
 
   def self.from_extension(extension)

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

@@ -16,10 +16,12 @@
               = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
             %br
             %label.url
-              = "#{t("clipped_extension.asset_url")}: #{image_path @asset.thumbnail unless @asset.new_record?}"
+              = "#{t("clipped_extension.asset_url")}: #{image_path @asset.asset.url unless @asset.new_record?}"
+            %br
+            %label.id
+              = "#{t("clipped_extension.asset_id")}: #{@asset.asset.id unless @asset.new_record?}"
           %p.asset
-            - display_size = TrustyCms::config['assets.display_size'] || 'normal'
-            = image_tag @asset.thumbnail(display_size.to_sym), :class => 'preview'
+            = image_tag @asset.thumbnail("normal"), :class => 'preview'
 
           = updated_stamp @asset
         

data/config/database.yml

@@ -1,4 +1,4 @@
-test: &TEST
+test:
   adapter: mysql2
   database: trusty_cms_test
-  username:
+  username:

data/config/locales/en.yml

@@ -66,6 +66,7 @@ en:
     asset_page_attachment_note: 'Attached assets. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
     asset_note: 'Attached assets. '
     asset_url: 'Asset URL'
+    asset_id: 'Asset ID'
     assets: 'Assets'
     assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on an asset name above to edit it or click <code>Remove</code> to delete it.'
     assets_title: 'Assets'

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.12.3/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" class="hide">
-      <div class="timestamp">Generated <abbr class="timeago" title="2021-03-03T13:17:38-05:00">2021-03-03T13:17:38-05:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2021-10-05T10:51:28-04:00">2021-10-05T10:51:28-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/lib/trusty_cms/deprecation.rb

@@ -0,0 +1,13 @@
+require 'active_support'
+
+class AssetType
+  def paperclip_processors
+    ActiveSupport::Deprecation.warn('Paperclip processors will be deprecated soon in favor of ActiveStorage.')
+
+    active_storage_styles
+  end
+
+  def paperclip_styles
+    ActiveSupport::Deprecation.warn('Paperclip styles will be deprecated soon in favor of ActiveStorage.')
+  end
+end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.3.1'.freeze
+    VERSION = '5.0.0'.freeze
   end
 end