[WIP] #17 Migrate from paperclip to active storage

.gitignore

@@ -48,3 +48,5 @@ node_modules
 *.local
 
 .vite
+# Ignore local Active Storage
+storage

Gemfile

@@ -46,6 +46,8 @@ gem "country_select"
 gem "turbo-rails", "~> 2.0"
 gem "stimulus-rails", "~> 1.3"
 
+gem "active_storage_validations", "~> 3.0"
+
 group :development, :test do
   gem "better_errors"
   gem "brakeman", require: false

Gemfile.lock

@@ -47,6 +47,12 @@ GEM
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
+    active_storage_validations (3.0.2)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
     activejob (8.1.0.beta1)
       activesupport (= 8.1.0.beta1)
       globalid (>= 0.3.6)
@@ -446,6 +452,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_storage_validations (~> 3.0)
   apipie-rails (~> 1.5.0)
   aws-sdk-s3
   bcrypt (= 3.1.16)

app/decorators/workshop_decorator.rb

@@ -148,18 +148,17 @@ def main_image
   end
 
   def thumbnail_image
-    if legacy && !thumbnail.exists?
-      main_image
-    else
+    # TODO Figure out if we need main_image
+    if thumbnail.attached?
       thumbnail
     end
   end
 
   def header_image
-    if !header.exists?
-      thumbnail_image
-    else
+    if header.attached?
       header
+    elsif thumbnail.attached?
+      thumbnail
     end
   end
 

app/models/attachment.rb

@@ -1,10 +1,11 @@
 class Attachment < ApplicationRecord
   belongs_to :owner, polymorphic: true
 
-  has_attached_file :file
-  validates_attachment :file, content_type: { content_type: %w(application/pdf application/msword image/gif image/jpg image/jpeg image/png) }
+  ACCEPTED_CONTENT_TYPES = %w[application/pdf application/msword image/gif image/jpeg image/png].freeze
+  has_one_attached :file
+  validates :file, content_type: ACCEPTED_CONTENT_TYPES
 
   def name
-    'Pdf Attachment'
+    "Pdf Attachment"
   end
 end

app/models/ckeditor/attachment_file.rb

@@ -1,11 +1,6 @@
 class Ckeditor::AttachmentFile < ApplicationRecord # Ckeditor::Asset
-  # has_attached_file :data,
-  #                   :url => "/ckeditor_assets/attachments/:id/:filename",
-  #                   :path => "/ckeditor_assets/attachments/:id/:filename"
-  #
-  # validates_attachment_presence :data
-  # validates_attachment_size :data, :less_than => 100.megabytes
-  # do_not_validate_attachment_file_type :data
+  has_one_attached :data
+  validates :data, size: {less_than: 100.megabytes}, attached: true
 
   def url_thumb
     @url_thumb ||= nil # Ckeditor::Utils.filethumb(filename)

app/models/ckeditor/picture.rb

@@ -1,12 +1,7 @@
 class Ckeditor::Picture < ApplicationRecord # Ckeditor::Asset
-  # has_attached_file :data,
-  #                   :url  => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
-  #                   :path => "/ckeditor_assets/pictures/:id/:style_:basename.:extension",
-  #                   :styles => { :content => '800>', :thumb => '118x100#' }
-  #
-  # validates_attachment_presence :data
-  # validates_attachment_size :data, :less_than => 2.megabytes
-  # validates_attachment_content_type :data, :content_type => /\Aimage/
+  ACCEPTED_CONTENT_TYPES = ["image/jpeg", "image/png"].freeze
+  has_one_attached :data
+  validates :data, size: {less_than: 2.megabytes}, content_type: ACCEPTED_CONTENT_TYPES, attached: true
 
   def url_content
     url(:content)
@@ -20,6 +15,5 @@ def url(param)
     else
       actual_url.gsub("/original", "/thumb")
     end
-
   end
 end

app/models/image.rb

@@ -2,11 +2,7 @@ class Image < ApplicationRecord
   belongs_to :owner, polymorphic: true
   belongs_to :report, optional: true
 
-  has_attached_file :file,
-                    styles: { medium: '300x300>', thumb: '100x100>' },
-                    default_url:
-                      ActionController::Base.helpers.asset_path(
-                        'workshop_default.png'
-                      )
-  validates_attachment :file, content_type: { content_type:  ["image/jpg", "image/jpeg", "image/png", "image/gif"] }
+  ACCEPTED_CONTENT_TYPES = ["image/jpeg", "image/png", "image/gif"].freeze
+  has_one_attached :file
+  validates :file, content_type: ACCEPTED_CONTENT_TYPES
 end

app/models/media_file.rb

@@ -3,13 +3,11 @@ class MediaFile < ApplicationRecord
   belongs_to :workshop, optional: true
   belongs_to :workshop_log, optional: true
 
-  has_attached_file :file
-
-  FORM_FILE_CONTENT_TYPES = ["image/jpeg", "image/jpg", "image/png",
-                             "application/pdf", "application/msword",
-                             "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-                             "application/vnd.ms-excel",
-                             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"]
-
-   validates_attachment :file, content_type: { content_type:  FORM_FILE_CONTENT_TYPES }
+  FORM_FILE_CONTENT_TYPES = ["image/jpeg", "image/png",
+    "application/pdf", "application/msword",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "application/vnd.ms-excel",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"]
+  has_one_attached :file
+  validates :file, content_type: FORM_FILE_CONTENT_TYPES
 end

app/models/project_user.rb

@@ -3,7 +3,7 @@ class ProjectUser < ApplicationRecord
   belongs_to :project
   belongs_to :user
 
-  scope :liaisons, -> { where(position: 1) }
+  scope :liaisons, -> { where(position: "liaison") }
   # Validations
   validates_presence_of :project_id
 

app/models/report.rb

@@ -4,16 +4,17 @@ class Report < ApplicationRecord
   belongs_to :windows_type
 
   belongs_to :owner, polymorphic: true, optional: true
-  has_one  :form, as: :owner
-  has_one  :image
+  has_one :form, as: :owner
+  has_one :image
   validate :image_valid?
-  has_attached_file :form_file
 
-  before_save :set_has_attachament
+  FORM_FILE_CONTENT_TYPES = %w[application/pdf application/msword
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document application/vnd.ms-excel
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet]
+  has_one_attached :form_file
+  validates :form_file, content_type: FORM_FILE_CONTENT_TYPES
 
-  FORM_FILE_CONTENT_TYPES = %w[application/pdf application/msword application/vnd.openxmlformats-officedocument.wordprocessingml.document application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet]
-
-  validates_attachment :form_file, content_type: { content_type:  FORM_FILE_CONTENT_TYPES }
+  before_save :set_has_attachament # TODO verify set_has_attachament works as expected once this feature is enabled in the UI
 
   has_many :images
   has_many :form_fields, through: :form
@@ -23,15 +24,15 @@ class Report < ApplicationRecord
   has_many :notifications, as: :noticeable, dependent: :destroy
   has_many :sectorable_items, as: :sectorable, dependent: :destroy
   has_many :sectors, through: :sectorable_items, dependent: :destroy
-  scope :in_month, -> (date) { where(created_at: date.beginning_of_month..date.end_of_month) }
+  scope :in_month, ->(date) { where(created_at: date.beginning_of_month..date.end_of_month) }
 
   has_many :media_files, dependent: :destroy
   accepts_nested_attributes_for :media_files
 
   accepts_nested_attributes_for :report_form_field_answers,
-                                reject_if: proc { |object|
-                                  (object['_create'].to_i == 0 && object['answer'].nil?)
-                                }
+    reject_if: proc { |object|
+      object["_create"].to_i == 0 && object["answer"].nil?
+    }
   accepts_nested_attributes_for :quotable_item_quotes
 
   after_create :set_windows_type
@@ -45,13 +46,13 @@ def users_admin_type
       when "MonthlyReport"
         "#{type} - Monthly Report Date: #{date_label} - User: #{user.full_name if user}"
       when "Report"
-        if owner_type and owner_type == 'Resource'
-          "#{type} - #{owner ? owner_type : '[ EMPTY ]'} - User: #{user.full_name if user}"
+        if owner_type and owner_type == "Resource"
+          "#{type} - #{owner ? owner_type : "[ EMPTY ]"} - User: #{user.full_name if user}"
         else
-           "#{type} - #{owner ? owner.type : '[ EMPTY ]'} - User: #{user.full_name if user}"
+          "#{type} - #{owner ? owner.type : "[ EMPTY ]"} - User: #{user.full_name if user}"
         end
       else
-        "#{type} - #{owner ? owner.communal_label(self) : '[ EMPTY ]'} - User: #{user.full_name if user}"
+        "#{type} - #{owner ? owner.communal_label(self) : "[ EMPTY ]"} - User: #{user.full_name if user}"
       end
     end
   end
@@ -61,7 +62,7 @@ def story?
   end
 
   def date_label
-    "#{date ? date.strftime('%m/%d/%y') : '[ EMPTY ]'}"
+    "#{date ? date.strftime("%m/%d/%y") : "[ EMPTY ]"}"
   end
 
   def delete_and_update_all(quotes_params, log_fields, image = nil)
@@ -73,7 +74,7 @@ def delete_and_update_all(quotes_params, log_fields, image = nil)
 
     unless image.blank?
       self.image.destroy if self.image
-      self.image = Image.new( file: image )
+      self.image = Image.new(file: image)
     end
 
     save
@@ -90,8 +91,8 @@ def image_valid?
 
   def log_fields
     if form_builder
-      form_builder.forms[0].form_fields.where('ordering is not null and status = 1').
-        order(ordering: :desc).all
+      form_builder.forms[0].form_fields.where("ordering is not null and status = 1")
+        .order(ordering: :desc).all
     else
       []
     end
@@ -105,7 +106,7 @@ def form_builder
         FormBuilder.find(2)
       end
     elsif owner and owner_type.include? "FormBuilder"
-       FormBuilder.find(7)
+      FormBuilder.find(7)
     else
       nil
     end
@@ -120,21 +121,18 @@ def title
   end
 
   def name
-    type ? type.titleize : 'Report'
+    type ? type.titleize : "Report"
   end
 
   def display_date
-    created_at.strftime('%B %e, %Y')
+    created_at.strftime("%B %e, %Y")
   end
 
   private
 
   def set_has_attachament
-    self.has_attachment = false
-
-    unless self.image.blank? and self.media_files.empty? and self.form_file.blank?
-      self.has_attachment = true
-    end
+    self.has_attachment = image.attached? || form_file.attached? ||
+      media_files.any? { |media_file| media_file.file.attached? }
   end
 
   def set_windows_type

app/models/resource.rb

@@ -1,4 +1,6 @@
 class Resource < ApplicationRecord
+  include Rails.application.routes.url_helpers
+
   # Associations
   belongs_to :user
   belongs_to :workshop, optional: true
@@ -81,12 +83,10 @@ def main_image
   end
 
   def main_image_url
-    return main_image.file.url if main_image
-
-    if self.kind == "Theme"
-      ActionController::Base.helpers.asset_path("workshop_default.png")
+    if main_image&.file&.attached?
+      url_for(main_image.file)
     else
-      "/images/workshop_default.jpg"
+      ActionController::Base.helpers.asset_path("workshop_default.png")
     end
   end
 

app/models/user.rb

@@ -7,16 +7,21 @@ class User < ApplicationRecord
   after_create :set_default_values
   before_destroy :reassign_reports_and_logs_to_orphaned_user
 
+  # Avatar
+  ACCEPTED_CONTENT_TYPES = ["image/jpeg", "image/png" ].freeze
+  has_one_attached :avatar
+  validates :avatar, content_type: ACCEPTED_CONTENT_TYPES
+
   # Associations
   belongs_to :facilitator, optional: true
   has_many :workshops
   has_many :workshop_logs
   has_many :reports
   has_many :communal_reports, through: :projects, source: :reports
   has_many :bookmarks, dependent: :destroy
-  has_many :bookmarked_workshops, through: :bookmarks, source: :bookmarkable, source_type: 'Workshop'
-  has_many :bookmarked_resources, through: :bookmarks, source: :bookmarkable, source_type: 'Resource'
-  has_many :bookmarked_events, through: :bookmarks, source: :bookmarkable, source_type: 'Event'
+  has_many :bookmarked_workshops, through: :bookmarks, source: :bookmarkable, source_type: "Workshop"
+  has_many :bookmarked_resources, through: :bookmarks, source: :bookmarkable, source_type: "Resource"
+  has_many :bookmarked_events, through: :bookmarks, source: :bookmarkable, source_type: "Event"
   has_many :project_users, dependent: :destroy
   has_many :projects, through: :project_users
   has_many :windows_types, through: :projects
@@ -28,10 +33,6 @@ class User < ApplicationRecord
   has_many :colleagues, -> { select(:user_id, :position, :project_id).distinct }, through: :projects, source: :project_users
   has_many :notifications, as: :noticeable
 
-  # Avatar
-  has_attached_file :avatar, styles: { medium: "300x300>", thumb: "100x100>" }, default_url: "/images/missing.png"
-  validates_attachment_content_type :avatar, content_type: /\Aimage\/.*\z/
-
   # Nested
   accepts_nested_attributes_for :user_forms
   accepts_nested_attributes_for :project_users, reject_if: :all_blank, allow_destroy: true
@@ -142,7 +143,7 @@ def name
   end
 
   def agency_name
-   agency ? agency.name : 'No agency.'
+    agency ? agency.name : "No agency."
   end
 
   def has_bookmarkable?(bookmarkable, type: nil)
@@ -168,6 +169,7 @@ def set_default_values
     adult_perm = Permission.find_by(security_cat: "Adult Windows")
     children_perm = Permission.find_by(security_cat: "Children's Windows")
 
+
     self.permissions << combined_perm
     self.permissions << adult_perm
     self.permissions << children_perm