config/initializers/shrine.rb in cas-cms-0.1.3 vs config/initializers/shrine.rb in cas-cms-1.0.0.alpha1

- old
+ new

@@ -1,5 +1,8 @@ +# On why we use Shrine over Active Storage: +# https://github.com/shrinerb/shrine/blob/d9aba64bd5515584645f8885c76d56fa1a842bac/doc/advantages.md + require 'shrine' Shrine.plugin :activerecord Shrine.plugin :presign_endpoint Shrine.plugin :backgrounding @@ -17,27 +20,28 @@ cache: Shrine::Storage::FileSystem.new("tmp/uploads", prefix: "cache"), store: Shrine::Storage::FileSystem.new("tmp/uploads", prefix: "store") } else if ENV["S3_ACCESS_KEY_ID"].blank? - msg = "You need to configure S3 credentials. See the README.md for more details." - puts msg + msg = "You need to configure S3 credentials. See the README.md for more details. File uploads will be broken until you fix it." Rails.logger.error msg - end + puts msg - s3_options = { - access_key_id: ENV.fetch("S3_ACCESS_KEY_ID"), - secret_access_key: ENV.fetch("S3_SECRET_ACCESS_KEY"), - region: ENV.fetch("S3_REGION"), - bucket: ENV.fetch("S3_BUCKET"), - } + else + s3_options = { + access_key_id: ENV.fetch("S3_ACCESS_KEY_ID"), + secret_access_key: ENV.fetch("S3_SECRET_ACCESS_KEY"), + region: ENV.fetch("S3_REGION"), + bucket: ENV.fetch("S3_BUCKET"), + } - require "shrine/storage/s3" - config = Cas::Config.new.uploads - Shrine.storages = { - cache: Shrine::Storage::S3.new(prefix: config[:cache_directory_prefix], **s3_options), - store: Shrine::Storage::S3.new(prefix: config[:store_directory_prefix], **s3_options), - } + require "shrine/storage/s3" + config = Cas::Config.new.uploads + Shrine.storages = { + cache: Shrine::Storage::S3.new(prefix: config[:cache_directory_prefix], **s3_options), + store: Shrine::Storage::S3.new(prefix: config[:store_directory_prefix], **s3_options), + } + end end Shrine::Attacher.promote do |data| Rails.logger.info "Shrine promoting file scheduled" ::Cas::Images::PromoteJob.perform_async(data)