1 files changed, 31 insertions, 7 deletions
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb
index a5562b32d3..8ba32490b1 100644
--- a/activestorage/lib/active_storage/engine.rb
+++ b/activestorage/lib/active_storage/engine.rb
@@ -3,19 +3,45 @@
 require "rails"
 require "active_storage"
 
+require "active_storage/previewer/pdf_previewer"
+require "active_storage/previewer/video_previewer"
+
+require "active_storage/analyzer/image_analyzer"
+require "active_storage/analyzer/video_analyzer"
+
 module ActiveStorage
   class Engine < Rails::Engine # :nodoc:
     isolate_namespace ActiveStorage
 
     config.active_storage = ActiveSupport::OrderedOptions.new
+    config.active_storage.previewers = [ ActiveStorage::Previewer::PDFPreviewer, ActiveStorage::Previewer::VideoPreviewer ]
+    config.active_storage.analyzers = [ ActiveStorage::Analyzer::ImageAnalyzer, ActiveStorage::Analyzer::VideoAnalyzer ]
+    config.active_storage.paths = ActiveSupport::OrderedOptions.new
 
-    config.eager_load_namespaces << ActiveStorage
+    config.active_storage.variable_content_types = %w( image/png image/gif image/jpg image/jpeg image/vnd.adobe.photoshop )
+    config.active_storage.content_types_to_serve_as_binary = %w(
+      text/html
+      text/javascript
+      image/svg+xml
+      application/postscript
+      application/x-shockwave-flash
+      text/xml
+      application/xml
+      application/xhtml+xml
+    )
 
-    initializer "active_storage.logger" do
-      require "active_storage/service"
+    config.eager_load_namespaces << ActiveStorage
 
+    initializer "active_storage.configs" do
       config.after_initialize do |app|
-        ActiveStorage::Service.logger = app.config.active_storage.logger || Rails.logger
+        ActiveStorage.logger     = app.config.active_storage.logger || Rails.logger
+        ActiveStorage.queue      = app.config.active_storage.queue
+        ActiveStorage.previewers = app.config.active_storage.previewers || []
+        ActiveStorage.analyzers  = app.config.active_storage.analyzers || []
+        ActiveStorage.paths      = app.config.active_storage.paths || {}
+
+        ActiveStorage.variable_content_types = app.config.active_storage.variable_content_types || []
+        ActiveStorage.content_types_to_serve_as_binary = app.config.active_storage.content_types_to_serve_as_binary || []
       end
     end
 
@@ -29,9 +55,7 @@ module ActiveStorage
 
     initializer "active_storage.verifier" do
       config.after_initialize do |app|
-        if app.secrets.secret_key_base.present?
-          ActiveStorage.verifier = app.message_verifier("ActiveStorage")
-        end
+        ActiveStorage.verifier = app.message_verifier("ActiveStorage")
       end
     end