actionmailer 4.0.13 → 4.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814ae49361a765b14f20ab4ee63f488db350f5e8
-  data.tar.gz: 83b912bb6a7400aab9269490f052f1f85d776184
+  metadata.gz: 66fdea8138adbbf1916cfd7ae7c84778ea9d4cbf
+  data.tar.gz: aa44f5061ef399d6d464abaf6afc8278fa90a4b0
 SHA512:
-  metadata.gz: 23359cdb11af5cf267f72864407b58acc85192a8f1b2528f57d572df8000fd32fdc063c5ab52ec1a380e724bc1cc70021a4fb66c47d19768ad1dc8a02b853391
-  data.tar.gz: 8bf92eacb7884044e67ad0ad389724e34f78a233782f13a8160958c4844068ba352688393f31b139bdd489cc4496fcf7add2c426faba5c20ea8d732c13958589
+  metadata.gz: 113c0cf26324e04ccb9b8c96b9ae0c1c552155145b0670b6d90eda78ac23b768f9939b3e157c95effcc9bc3369f9027db9bafd87d66371eb68e6ea3e5e69a726
+  data.tar.gz: 33358816dccafbe1f37f35716db4936f319efba0d0c4dfbe1b87838f90b4e00a94f507ee6c67e6133d8404ff380b9b96e00d91dbe890097ac279af5613b349cd

data/CHANGELOG.md

@@ -1,54 +1,6 @@
-## Rails 4.0.13 (January 6, 2015) ##
+*   Add mailer previews feature based on 37 Signals mail_view gem
 
-*No changes*
-
-
-## Rails 4.0.12 (November 16, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.11.1 (November 19, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.11 (September 11, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.10 (September 11, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.9 (August 18, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.8 (July 2, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.7 (July 2, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.6 (June 26, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.5 (May 6, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.4 (March 14, 2014) ##
+    *Andrew White*
 
 *   Calling `mail()` without arguments serves as getter for the current mail
     message and keeps previously set headers.
@@ -69,87 +21,17 @@
 
     *Yves Senn*
 
-
-## Rails 4.0.3 (February 18, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.2 (December 02, 2013) ##
-
-*No changes*
-
-
-## Rails 4.0.1 (November 01, 2013) ##
-
 *   Instrument the generation of Action Mailer messages. The time it takes to
     generate a message is written to the log.
 
-*   Invoke mailer defaults as procs only if they are procs, do not convert
-    with `to_proc`. That an object is convertible to a proc does not mean it's
-    meant to be always used as a proc.
+    *Daniel Schierbeck*
+
+*   Invoke mailer defaults as procs only if they are procs, do not convert with
+    `to_proc`. That an object is convertible to a proc does not mean it's meant
+    to be always used as a proc.
 
     Fixes #11533.
 
     *Alex Tsukernik*
 
-
-## Rails 4.0.0 (June 25, 2013) ##
-
-*   Allow passing interpolations to `#default_i18n_subject`, e.g.:
-
-        # config/locales/en.yml
-        en:
-          user_mailer:
-            welcome:
-              subject: 'Hello, %{username}'
-
-        # app/mailers/user_mailer.rb
-        class UserMailer < ActionMailer::Base
-          def welcome(user)
-            mail(subject: default_i18n_subject(username: user.name))
-          end
-        end
-
-    *Olek Janiszewski*
-
-*   Eager loading made to use relation's `in_clause_length` instead of host's one.
-    Fixes #8474.
-
-    *Boris Staal*
-
-*   Explicit multipart messages no longer set the order of the MIME parts.
-
-    *Nate Berkopec*
-
-*   Do not render views when `mail` isn't called. Fixes #7761.
-
-    *Yves Senn*
-
-*   Allow delivery method options to be set per mail instance.
-
-    If your SMTP delivery settings are dynamic, you can now override settings
-    per mail instance for e.g.
-
-        def my_mailer(user, company)
-          mail to: user.email, subject: "Welcome!",
-               delivery_method_options: { user_name: company.smtp_user,
-                                          password: company.smtp_password }
-        end
-
-    This will ensure that your default SMTP settings will be overridden
-    by the company specific ones. You only have to override the settings
-    that are dynamic and leave the static setting in your environment
-    configuration file (e.g. `config/environments/production.rb`).
-
-    *Aditya Sanghi*
-
-*   Allow to set default Action Mailer options via `config.action_mailer.default_options=`. *Robert Pankowecki*
-
-*   Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
-
-*   Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
-    settings, headers, attachments, delivery settings or change delivery using
-    `before_filter`, `after_filter`, etc. *Justin S. Leitgeb*
-
-Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -61,9 +61,7 @@ generated would look like this:
 
   Thank you for signing up!
 
-In previous version of Rails you would call <tt>create_method_name</tt> and
-<tt>deliver_method_name</tt>.  Rails 3.0 has a much simpler interface - you
-simply call the method and optionally call +deliver+ on the return value.
+In order to send mails, you simply call the method and then call +deliver+ on the return value.
 
 Calling the method returns a Mail Message object:
 
@@ -76,7 +74,7 @@ Or you can just chain the methods together like:
 
 == Setting defaults
 
-It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from ActionMailer::Base. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
+It is possible to set default values that will be used in every method in your Action Mailer class. To implement this functionality, you just call the public class method <tt>default</tt> which you get for free from <tt>ActionMailer::Base</tt>. This method accepts a Hash as the parameter. You can use any of the headers e-mail messages has, like <tt>:from</tt> as the key. You can also pass in a string as the key, like "Content-Type", but Action Mailer does this out of the box for you, so you won't need to worry about that. Finally, it is also possible to pass in a Proc that will get evaluated when it is needed.
 
 Note that every value you set with this method will get overwritten if you use the same key in your mailer method.
 
@@ -142,7 +140,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/4-0-stable/actionmailer
+* https://github.com/rails/rails/tree/master/actionmailer
 
 
 == License

data/lib/action_mailer.rb

@@ -22,7 +22,6 @@
 #++
 
 require 'abstract_controller'
-require 'action_view'
 require 'action_mailer/version'
 
 # Common Active Support usage in Action Mailer
@@ -42,6 +41,8 @@ module ActionMailer
   autoload :Base
   autoload :DeliveryMethods
   autoload :MailHelper
+  autoload :Preview
+  autoload :Previews, 'action_mailer/preview'
   autoload :TestCase
   autoload :TestHelper
 end

data/lib/action_mailer/base.rb

@@ -3,6 +3,7 @@ require 'action_mailer/collector'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/module/anonymous'
+
 require 'action_mailer/log_subscriber'
 
 module ActionMailer
@@ -151,9 +152,9 @@ module ActionMailer
   #
   # For example, if the following templates exist:
   # * signup_notification.text.erb
-  # * signup_notification.text.html.erb
-  # * signup_notification.text.xml.builder
-  # * signup_notification.text.yaml.erb
+  # * signup_notification.html.erb
+  # * signup_notification.xml.builder
+  # * signup_notification.yaml.erb
   #
   # Each would be rendered and added as a separate part to the message, with the corresponding content
   # type. The content type for the entire message is automatically set to <tt>multipart/alternative</tt>,
@@ -175,7 +176,7 @@ module ActionMailer
   #     end
   #   end
   #
-  # Which will (if it had both a <tt>welcome.text.erb</tt> and <tt>welcome.text.html.erb</tt>
+  # Which will (if it had both a <tt>welcome.text.erb</tt> and <tt>welcome.html.erb</tt>
   # template in the view directory), send a complete <tt>multipart/mixed</tt> email with two parts,
   # the first part being a <tt>multipart/alternative</tt> with the text and HTML email parts inside,
   # and the second being a <tt>application/pdf</tt> with a Base64 encoded copy of the file.pdf book
@@ -307,6 +308,25 @@ module ActionMailer
   # Note that unless you have a specific reason to do so, you should prefer using before_action
   # rather than after_action in your ActionMailer classes so that headers are parsed properly.
   #
+  # = Previewing emails
+  #
+  # You can preview your email templates visually by adding a mailer preview file to the
+  # <tt>ActionMailer::Base.preview_path</tt>. Since most emails do something interesting
+  # with database data, you'll need to write some scenarios to load messages with fake data:
+  #
+  #   class NotifierPreview < ActionMailer::Preview
+  #     def welcome
+  #       Notifier.welcome(User.first)
+  #     end
+  #   end
+  #
+  # Methods must return a Mail::Message object which can be generated by calling the mailer
+  # method without the additional <tt>deliver</tt>. The location of the mailer previews
+  # directory can be configured using the <tt>preview_path</tt> option which has a default
+  # of <tt>test/mailers/previews</tt>:
+  #
+  #     config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
+  #
   # = Configuration options
   #
   # These options are specified on the class level, like
@@ -361,17 +381,25 @@ module ActionMailer
   #   <tt>delivery_method :test</tt>. Most useful for unit and functional testing.
   class Base < AbstractController::Base
     include DeliveryMethods
+    include Previews
+
     abstract!
 
-    include AbstractController::Logger
     include AbstractController::Rendering
-    include AbstractController::Layouts
+
+    include AbstractController::Logger
     include AbstractController::Helpers
     include AbstractController::Translation
     include AbstractController::AssetPaths
     include AbstractController::Callbacks
 
-    self.protected_instance_variables = [:@_action_has_layout]
+    include ActionView::Layouts
+
+    PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [:@_action_has_layout]
+
+    def _protected_ivars # :nodoc:
+      PROTECTED_IVARS
+    end
 
     helper ActionMailer::MailHelper
 
@@ -398,7 +426,7 @@ module ActionMailer
 
       # Register an Observer which will be notified when mail is delivered.
       # Either a class or a string can be passed in as the Observer. If a string is passed in
-      # it will be <tt>constantize</tt>d.
+      # it will be +constantize+d.
       def register_observer(observer)
         delivery_observer = (observer.is_a?(String) ? observer.constantize : observer)
         Mail.register_observer(delivery_observer)
@@ -412,12 +440,20 @@ module ActionMailer
         Mail.register_interceptor(delivery_interceptor)
       end
 
+      # Returns the name of current mailer. This method is also being used as a path for a view lookup.
+      # If this is an anonymous mailer, this method will return +anonymous+ instead.
       def mailer_name
         @mailer_name ||= anonymous? ? "anonymous" : name.underscore
       end
+      # Allows to set the name of current mailer.
       attr_writer :mailer_name
       alias :controller_path :mailer_name
 
+      # Sets the defaults through app configuration:
+      #
+      #     config.action_mailer.default { from: "no-reply@example.org" }
+      #
+      # Aliased by ::default_options=
       def default(value = nil)
         self.default_params = default_params.merge(value).freeze if value
         default_params
@@ -429,13 +465,15 @@ module ActionMailer
 
       # Receives a raw email, parses it into an email object, decodes it,
       # instantiates a new mailer, and passes the email object to the mailer
-      # object's +receive+ method. If you want your mailer to be able to
-      # process incoming messages, you'll need to implement a +receive+
-      # method that accepts the raw email string as a parameter:
+      # object's +receive+ method.
+      #
+      # If you want your mailer to be able to process incoming messages, you'll
+      # need to implement a +receive+ method that accepts the raw email string
+      # as a parameter:
       #
       #   class MyMailer < ActionMailer::Base
       #     def receive(mail)
-      #       ...
+      #       # ...
       #     end
       #   end
       def receive(raw_mail)
@@ -446,10 +484,12 @@ module ActionMailer
         end
       end
 
-      # Wraps an email delivery inside of Active Support Notifications instrumentation. This
-      # method is actually called by the <tt>Mail::Message</tt> object itself through a callback
-      # when you call <tt>:deliver</tt> on the Mail::Message, calling +deliver_mail+ directly
-      # and passing a Mail::Message will do nothing except tell the logger you sent the email.
+      # Wraps an email delivery inside of ActiveSupport::Notifications instrumentation.
+      #
+      # This method is actually called by the Mail::Message object itself
+      # through a callback when you call +:deliver+ on the Mail::Message,
+      # calling +deliver_mail+ directly and passing a Mail::Message will do
+      # nothing except tell the logger you sent the email.
       def deliver_mail(mail) #:nodoc:
         ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
           set_payload_for_mail(payload, mail)
@@ -475,7 +515,7 @@ module ActionMailer
         payload[:mail]       = mail.encoded
       end
 
-      def method_missing(method_name, *args)
+      def method_missing(method_name, *args) # :nodoc:
         if respond_to?(method_name)
           new(method_name, *args).message
         else
@@ -497,11 +537,18 @@ module ActionMailer
       process(method_name, *args) if method_name
     end
 
-    def process(*args) #:nodoc:
-      lookup_context.skip_default_locale!
+    def process(method_name, *args) #:nodoc:
+      payload = {
+        mailer: self.class.name,
+        action: method_name
+      }
+
+      ActiveSupport::Notifications.instrument("process.action_mailer", payload) do
+        lookup_context.skip_default_locale!
 
-      super
-      @_message = NullMail.new unless @_mail_was_called
+        super
+        @_message = NullMail.new unless @_mail_was_called
+      end
     end
 
     class NullMail #:nodoc:
@@ -512,17 +559,18 @@ module ActionMailer
       end
     end
 
+    # Returns the name of the mailer object.
     def mailer_name
       self.class.mailer_name
     end
 
-    # Allows you to pass random and unusual headers to the new <tt>Mail::Message</tt> object
-    # which will add them to itself.
+    # Allows you to pass random and unusual headers to the new Mail::Message
+    # object which will add them to itself.
     #
     #   headers['X-Special-Domain-Specific-Header'] = "SecretValue"
     #
-    # You can also pass a hash into headers of header field names and values, which
-    # will then be set on the Mail::Message object:
+    # You can also pass a hash into headers of header field names and values,
+    # which will then be set on the Mail::Message object:
     #
     #   headers 'X-Special-Domain-Specific-Header' => "SecretValue",
     #           'In-Reply-To' => incoming.message_id
@@ -578,22 +626,22 @@ module ActionMailer
     # Both methods accept a headers hash. This hash allows you to specify the most used headers
     # in an email message, these are:
     #
-    # * <tt>:subject</tt> - The subject of the message, if this is omitted, Action Mailer will
-    #   ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of
+    # * +:subject+ - The subject of the message, if this is omitted, Action Mailer will
+    #   ask the Rails I18n class for a translated +:subject+ in the scope of
     #   <tt>[mailer_scope, action_name]</tt> or if this is missing, will translate the
-    #   humanized version of the <tt>action_name</tt>
-    # * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array
+    #   humanized version of the +action_name+
+    # * +:to+ - Who the message is destined for, can be a string of addresses, or an array
     #   of addresses.
-    # * <tt>:from</tt> - Who the message is from
-    # * <tt>:cc</tt> - Who you would like to Carbon-Copy on this email, can be a string of addresses,
+    # * +:from+ - Who the message is from
+    # * +:cc+ - Who you would like to Carbon-Copy on this email, can be a string of addresses,
     #   or an array of addresses.
-    # * <tt>:bcc</tt> - Who you would like to Blind-Carbon-Copy on this email, can be a string of
+    # * +:bcc+ - Who you would like to Blind-Carbon-Copy on this email, can be a string of
     #   addresses, or an array of addresses.
-    # * <tt>:reply_to</tt> - Who to set the Reply-To header of the email to.
-    # * <tt>:date</tt> - The date to say the email was sent on.
+    # * +:reply_to+ - Who to set the Reply-To header of the email to.
+    # * +:date+ - The date to say the email was sent on.
     #
-    # You can set default values for any of the above headers (except :date) by using the <tt>default</tt>
-    # class method:
+    # You can set default values for any of the above headers (except +:date+)
+    # by using the ::default class method:
     #
     #  class Notifier < ActionMailer::Base
     #    default from: 'no-reply@test.lindsaar.net',
@@ -605,17 +653,19 @@ module ActionMailer
     # as part of the headers hash or use the <tt>headers['name'] = value</tt>
     # method.
     #
-    # When a <tt>:return_path</tt> is specified as header, that value will be used as the 'envelope from'
-    # address for the Mail message. Setting this is useful when you want delivery notifications
-    # sent to a different address than the one in <tt>:from</tt>. Mail will actually use the
-    # <tt>:return_path</tt> in preference to the <tt>:sender</tt> in preference to the <tt>:from</tt>
-    # field for the 'envelope from' value.
+    # When a +:return_path+ is specified as header, that value will be used as
+    # the 'envelope from' address for the Mail message. Setting this is useful
+    # when you want delivery notifications sent to a different address than the
+    # one in +:from+. Mail will actually use the +:return_path+ in preference
+    # to the +:sender+ in preference to the +:from+ field for the 'envelope
+    # from' value.
     #
-    # If you do not pass a block to the +mail+ method, it will find all templates in the
-    # view paths using by default the mailer name and the method name that it is being
-    # called from, it will then create parts for each of these templates intelligently,
-    # making educated guesses on correct content type and sequence, and return a fully
-    # prepared Mail::Message ready to call <tt>:deliver</tt> on to send.
+    # If you do not pass a block to the +mail+ method, it will find all
+    # templates in the view paths using by default the mailer name and the
+    # method name that it is being called from, it will then create parts for
+    # each of these templates intelligently, making educated guesses on correct
+    # content type and sequence, and return a fully prepared Mail::Message
+    # ready to call +:deliver+ on to send.
     #
     # For example:
     #
@@ -650,8 +700,8 @@ module ActionMailer
     #     format.html { render text: "<h1>Hello Mikel!</h1>" }
     #   end
     #
-    # Which will render a <tt>multipart/alternative</tt> email with <tt>text/plain</tt> and
-    # <tt>text/html</tt> parts.
+    # Which will render a +multipart/alternative+ email with +text/plain+ and
+    # +text/html+ parts.
     #
     # The block syntax also allows you to customize the part headers if desired:
     #
@@ -670,9 +720,9 @@ module ActionMailer
       content_type = headers[:content_type]
 
       # Call all the procs (if any)
-      class_default = self.class.default
-      default_values = class_default.merge(class_default) do |k,v|
-        v.is_a?(Proc) ? instance_eval(&v) : v
+      default_values = {}
+      self.class.default.each do |k,v|
+        default_values[k] = v.is_a?(Proc) ? instance_eval(&v) : v
       end
 
       # Handle defaults
@@ -707,6 +757,15 @@ module ActionMailer
 
   protected
 
+    # Used by #mail to set the content type of the message.
+    #
+    # It will use the given +user_content_type+, or multipart if the mail
+    # message has any attachments. If the attachments are inline, the content
+    # type will be "multipart/related", otherwise "multipart/mixed".
+    #
+    # If there is no content type passed in via headers, and there are no
+    # attachments, or the message is multipart, then the default content type is
+    # used.
     def set_content_type(m, user_content_type, class_default)
       params = m.content_type_parameters || {}
       case

data/lib/action_mailer/delivery_methods.rb

@@ -38,6 +38,7 @@ module ActionMailer
       add_delivery_method :test, Mail::TestMailer
     end
 
+    # Helpers for creating and wrapping delivery behavior, used by DeliveryMethods.
     module ClassMethods
       # Provides a list of emails that have been delivered by Mail::TestMailer
       delegate :deliveries, :deliveries=, to: Mail::TestMailer

data/lib/action_mailer/log_subscriber.rb

@@ -1,5 +1,10 @@
+require 'active_support/log_subscriber'
+
 module ActionMailer
+  # Implements the ActiveSupport::LogSubscriber for logging notifications when
+  # email is delivered and received.
   class LogSubscriber < ActiveSupport::LogSubscriber
+    # An email was delivered.
     def deliver(event)
       return unless logger.info?
       recipients = Array(event.payload[:to]).join(', ')
@@ -7,12 +12,21 @@ module ActionMailer
       debug(event.payload[:mail])
     end
 
+    # An email was received.
     def receive(event)
       return unless logger.info?
       info("\nReceived mail (#{event.duration.round(1)}ms)")
       debug(event.payload[:mail])
     end
 
+    # An email was generated.
+    def process(event)
+      mailer = event.payload[:mailer]
+      action = event.payload[:action]
+      debug("\n#{mailer}##{action}: processed outbound mail in #{event.duration.round(1)}ms")
+    end
+
+    # Use the logger configured for ActionMailer::Base
     def logger
       ActionMailer::Base.logger
     end

data/lib/action_mailer/mail_helper.rb

@@ -1,4 +1,7 @@
 module ActionMailer
+  # Provides helper methods for ActionMailer::Base that can be used for easily
+  # formatting messages, accessing mailer or message instances, and the
+  # attachments list.
   module MailHelper
     # Take the text and format it, indented two spaces for each line, and
     # wrapped at 72 columns.
@@ -46,8 +49,9 @@ module ActionMailer
         end
       end
 
-      sentences.map { |sentence|
-        "#{" " * indent}#{sentence.join(' ')}"
+      indentation = " " * indent
+      sentences.map! { |sentence|
+        "#{indentation}#{sentence.join(' ')}"
       }.join "\n"
     end
   end

data/lib/action_mailer/preview.rb

@@ -0,0 +1,67 @@
+require 'active_support/descendants_tracker'
+
+module ActionMailer
+  module Previews #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      # Set the location of mailer previews through app configuration:
+      #
+      #     config.action_mailer.preview_path = "#{Rails.root}/lib/mailer_previews"
+      #
+      class_attribute :preview_path, instance_writer: false
+    end
+  end
+
+  class Preview
+    extend ActiveSupport::DescendantsTracker
+
+    class << self
+      # Returns all mailer preview classes
+      def all
+        load_previews if descendants.empty?
+        descendants
+      end
+
+      # Returns the mail object for the given email name
+      def call(email)
+        preview = self.new
+        preview.public_send(email)
+      end
+
+      # Returns all of the available email previews
+      def emails
+        public_instance_methods(false).map(&:to_s).sort
+      end
+
+      # Returns true if the email exists
+      def email_exists?(email)
+        emails.include?(email)
+      end
+
+      # Returns true if the preview exists
+      def exists?(preview)
+        all.any?{ |p| p.preview_name == preview }
+      end
+
+      # Find a mailer preview by its underscored class name
+      def find(preview)
+        all.find{ |p| p.preview_name == preview }
+      end
+
+      # Returns the underscored name of the mailer preview without the suffix
+      def preview_name
+        name.sub(/Preview$/, '').underscore
+      end
+
+      protected
+        def load_previews #:nodoc:
+          Dir["#{preview_path}/**/*_preview.rb"].each{ |file| require_dependency file }
+        end
+
+        def preview_path #:nodoc:
+          Base.preview_path
+        end
+    end
+  end
+end

data/lib/action_mailer/railtie.rb

@@ -40,5 +40,13 @@ module ActionMailer
         config.compile_methods! if config.respond_to?(:compile_methods!)
       end
     end
+
+    initializer "action_mailer.configure_mailer_previews", before: :set_autoload_paths do |app|
+      if Rails.env.development?
+        options = app.config.action_mailer
+        options.preview_path ||= defined?(Rails.root) ? "#{Rails.root}/test/mailers/previews" : nil
+        app.config.autoload_paths << options.preview_path
+      end
+    end
   end
 end

data/lib/action_mailer/version.rb

@@ -1,7 +1,7 @@
 module ActionMailer
   # Returns the version of the currently loaded ActionMailer as a Gem::Version
   def self.version
-    Gem::Version.new "4.0.13"
+    Gem::Version.new "4.1.0.beta1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.1.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,32 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.1.0.beta1
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
+        version: 4.1.0.beta1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.1.0.beta1
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.4
 description: Email on Rails. Compose, deliver, receive, and test emails using the
@@ -52,21 +60,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- MIT-LICENSE
 - README.rdoc
-- lib/action_mailer.rb
+- MIT-LICENSE
 - lib/action_mailer/base.rb
 - lib/action_mailer/collector.rb
 - lib/action_mailer/delivery_methods.rb
 - lib/action_mailer/log_subscriber.rb
 - lib/action_mailer/mail_helper.rb
+- lib/action_mailer/preview.rb
 - lib/action_mailer/railtie.rb
 - lib/action_mailer/test_case.rb
 - lib/action_mailer/test_helper.rb
 - lib/action_mailer/version.rb
-- lib/rails/generators/mailer/USAGE
+- lib/action_mailer.rb
 - lib/rails/generators/mailer/mailer_generator.rb
 - lib/rails/generators/mailer/templates/mailer.rb
+- lib/rails/generators/mailer/USAGE
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
@@ -77,18 +86,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).