1 files changed, 26 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 7677ff3a7c..fa707021c7 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -1,3 +1,4 @@
+require 'active_job/railtie'
 require "action_mailer"
 require "rails"
 require "abstract_controller/railties/routes_helpers"
@@ -15,9 +16,19 @@ module ActionMailer
       paths   = app.config.paths
       options = app.config.action_mailer
 
+      if app.config.force_ssl
+        options.default_url_options ||= {}
+        options.default_url_options[:protocol] ||= 'https'
+      end
+
       options.assets_dir      ||= paths["public"].first
       options.javascripts_dir ||= paths["public/javascripts"].first
       options.stylesheets_dir ||= paths["public/stylesheets"].first
+      options.show_previews = Rails.env.development? if options.show_previews.nil?
+
+      if options.show_previews
+        options.preview_path  ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
+      end
 
       # make sure readers methods get compiled
       options.asset_host          ||= app.config.asset_host
@@ -25,13 +36,21 @@ module ActionMailer
 
       ActiveSupport.on_load(:action_mailer) do
         include AbstractController::UrlFor
-        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
+        extend ::AbstractController::Railties::RoutesHelpers.with(app.routes, false)
         include app.routes.mounted_helpers
 
         register_interceptors(options.delete(:interceptors))
+        register_preview_interceptors(options.delete(:preview_interceptors))
         register_observers(options.delete(:observers))
 
         options.each { |k,v| send("#{k}=", v) }
+
+        if options.show_previews
+          app.routes.prepend do
+            get '/rails/mailers'         => "rails/mailers#index"
+            get '/rails/mailers/*path'   => "rails/mailers#preview"
+          end
+        end
       end
     end
 
@@ -40,5 +59,11 @@ module ActionMailer
         config.compile_methods! if config.respond_to?(:compile_methods!)
       end
     end
+
+    config.after_initialize do
+      if ActionMailer::Base.preview_path
+        ActiveSupport::Dependencies.autoload_paths << ActionMailer::Base.preview_path
+      end
+    end
   end
 end