actionmailer 3.0.0.beta3 → 3.0.0.beta4

data/CHANGELOG

@@ -1,3 +1,10 @@
+*Rails 3.0.0 [beta 4] (June 8th, 2010)*
+
+* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
+
+* Added ability to pass Proc objects to the defaults hash [ML]
+
+
 *Rails 3.0.0 [beta 3] (April 13th, 2010)*
 
 * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]

data/lib/action_mailer.rb

@@ -27,7 +27,7 @@ $:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(
 require 'abstract_controller'
 require 'action_view'
 
-# Common ActiveSupport usage in ActionMailer
+# Common Active Support usage in Action Mailer
 require 'active_support/core_ext/class'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array/uniq_by'
@@ -49,9 +49,3 @@ module ActionMailer
   autoload :TestCase
   autoload :TestHelper
 end
-
-module Text
-  extend ActiveSupport::Autoload
-
-  autoload :Format, 'text/format'
-end

data/lib/action_mailer/base.rb

@@ -3,6 +3,7 @@ require 'action_mailer/tmail_compat'
 require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/proc'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
@@ -13,7 +14,7 @@ module ActionMailer #:nodoc:
   #
   #   $ rails generate mailer Notifier
   #
-  # The generated model inherits from ActionMailer::Base. Emails are defined by creating methods
+  # The generated model inherits from <tt>ActionMailer::Base</tt>. Emails are defined by creating methods
   # within the model which are then used to set variables to be used in the mail template, to
   # change options on the mail, or to add attachments.
   #
@@ -22,19 +23,22 @@ module ActionMailer #:nodoc:
   #  class Notifier < ActionMailer::Base
   #    default :from => 'no-reply@example.com',
   #            :return_path => 'system@example.com'
-  # 
+  #
   #    def welcome(recipient)
   #      @account = recipient
   #      mail(:to => recipient.email_address_with_name,
   #           :bcc => ["bcc@example.com", "Order Watcher <watcher@example.com>"])
   #      end
   #    end
-  # 
+  #
   # Within the mailer method, you have access to the following methods:
-  # 
+  #
   # * <tt>attachments[]=</tt> - Allows you to add attachments to your email in an intuitive
   #   manner; <tt>attachments['filename.png'] = File.read('path/to/filename.png')</tt>
   #
+  # * <tt>attachments.inline[]=</tt> - Allows you to add an inline attachment to your email
+  #   in the same manner as <tt>attachments[]=</tt>
+  #
   # * <tt>headers[]=</tt> - Allows you to specify any header field in your email such
   #   as <tt>headers['X-No-Spam'] = 'True'</tt>. Note, while most fields (like <tt>To:</tt>
   #   <tt>From:</tt> can only appear once in an email header, other fields like <tt>X-Anything</tt>
@@ -46,16 +50,16 @@ module ActionMailer #:nodoc:
   #   as <tt>headers({'X-No-Spam' => 'True', 'In-Reply-To' => '1234@message.id'})</tt>
   #
   # * <tt>mail</tt> - Allows you to specify your email to send.
-  # 
+  #
   # The hash passed to the mail method allows you to specify any header that a Mail::Message
   # will accept (any valid Email header including optional fields).
   #
   # The mail method, if not passed a block, will inspect your views and send all the views with
   # the same name as the method, so the above action would send the +welcome.text.plain.erb+ view
   # file as well as the +welcome.text.html.erb+ view file in a +multipart/alternative+ email.
-  # 
+  #
   # If you want to explicitly render only certain templates, pass a block:
-  # 
+  #
   #   mail(:to => user.emai) do |format|
   #     format.text
   #     format.html
@@ -79,7 +83,7 @@ module ActionMailer #:nodoc:
   #
   # Like Action Controller, each mailer class has a corresponding view directory in which each
   # method of the class looks for a template with its name.
-  # 
+  #
   # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same
   # name as the method in your mailer model. For example, in the mailer defined above, the template at
   # <tt>app/views/notifier/signup_notification.text.plain.erb</tt> would be used to generate the email.
@@ -104,7 +108,7 @@ module ActionMailer #:nodoc:
   #
   # = Generating URLs
   #
-  # URLs can be generated in mailer views using <tt>url_for</tt> or named routes. Unlike controllers from 
+  # URLs can be generated in mailer views using <tt>url_for</tt> or named routes. Unlike controllers from
   # Action Pack, the mailer instance doesn't have any context about the incoming request, so you'll need
   # to provide all of the details needed to generate a URL.
   #
@@ -172,44 +176,110 @@ module ActionMailer #:nodoc:
   #
   #   class ApplicationMailer < ActionMailer::Base
   #     def welcome(recipient)
-  #       attachments['free_book.pdf'] = { :data => File.read('path/to/file.pdf') }
+  #       attachments['free_book.pdf'] = File.read('path/to/file.pdf')
   #       mail(:to => recipient, :subject => "New account information")
   #     end
   #   end
-  # 
+  #
   # Which will (if it had both a <tt>welcome.text.plain.erb</tt> and <tt>welcome.text.html.erb</tt>
   # tempalte 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
   # with the filename +free_book.pdf+.
   #
-  # = Observing and Intercepting Mails
+  # = Inline Attachments
   # 
-  # ActionMailer provides hooks into the Mail observer and interceptor methods.  These allow you to
-  # register objects that are called during the mail delivery life cycle.
+  # You can also specify that a file should be displayed inline with other HTML.  For example a 
+  # corporate logo or a photo or the like.
+  # 
+  # To do this is simple, in the Mailer:
   # 
+  #   class ApplicationMailer < ActionMailer::Base
+  #     def welcome(recipient)
+  #       attachments.inline['photo.png'] = File.read('path/to/photo.png')
+  #       mail(:to => recipient, :subject => "Here is what we look like")
+  #     end
+  #   end
+  # 
+  # And then to reference the image in the view, you create a <tt>welcome.html.erb</tt> file and
+  # make a call to +image_tag+ passing in the attachment you want to display and then call 
+  # +url+ on the attachment to get the relative content id path for the image source:
+  # 
+  #   <h1>Please Don't Cringe</h1>
+  # 
+  #   <%= image_tag attachments['photo.png'].url -%>
+  # 
+  # As we are using ActionView's +image_tag+ method, you can pass in any other options you want:
+  # 
+  #   <h1>Please Don't Cringe</h1>
+  # 
+  #   <%= image_tag attachments['photo.png'].url, :alt => 'Our Photo', :class => 'photo' -%>
+  # 
+  # = Observing and Intercepting Mails
+  #
+  # Action Mailer provides hooks into the Mail observer and interceptor methods.  These allow you to
+  # register objects that are called during the mail delivery life cycle.
+  #
   # An observer object must implement the <tt>:delivered_email(message)</tt> method which will be
   # called once for every email sent after the email has been sent.
-  # 
+  #
   # An interceptor object must implement the <tt>:delivering_email(message)</tt> method which will be
   # called before the email is sent, allowing you to make modifications to the email before it hits
   # the delivery agents.  Your object should make and needed modifications directly to the passed
   # in Mail::Message instance.
   #
+  # = Default Hash
+  #
+  # Action Mailer provides some intelligent defaults for your emails, these are usually specified in a
+  # default method inside the class definition:
+  #
+  #   class Notifier < ActionMailer::Base
+  #     default :sender => 'system@example.com'
+  #   end
+  #
+  # You can pass in any header value that a <tt>Mail::Message</tt>, out of the box, <tt>ActionMailer::Base</tt>
+  # sets the following:
+  #
+  # * <tt>:mime_version => "1.0"</tt>
+  # * <tt>:charset      => "UTF-8",</tt>
+  # * <tt>:content_type => "text/plain",</tt>
+  # * <tt>:parts_order  => [ "text/plain", "text/enriched", "text/html" ]</tt>
+  #
+  # <tt>parts_order</tt> and <tt>charset</tt> are not actually valid <tt>Mail::Message</tt> header fields,
+  # but Action Mailer translates them appropriately and sets the correct values.
+  #
+  # As you can pass in any header, you need to either quote the header as a string, or pass it in as
+  # an underscorised symbol, so the following will work:
+  #
+  #   class Notifier < ActionMailer::Base
+  #     default 'Content-Transfer-Encoding' => '7bit',
+  #             :content_description => 'This is a description'
+  #   end
+  #
+  # Finally, Action Mailer also supports passing <tt>Proc</tt> objects into the default hash, so you
+  # can define methods that evaluate as the message is being generated:
+  #
+  #   class Notifier < ActionMailer::Base
+  #     default 'X-Special-Header' => Proc.new { my_method }
+  #
+  #     private
+  #
+  #       def my_method
+  #         'some complex call'
+  #       end
+  #   end
+  #
+  # Note that the proc is evaluated right at the start of the mail message generation, so if you
+  # set something in the defaults using a proc, and then set the same thing inside of your
+  # mailer method, it will get over written by the mailer method.
+  #
   # = Configuration options
   #
-  # These options are specified on the class level, like <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
+  # These options are specified on the class level, like
+  # <tt>ActionMailer::Base.template_root = "/my/templates"</tt>
   #
-  # * <tt>default</tt> - This is a class wide hash of <tt>:key => value</tt> pairs containing
-  #   default values for the specified header fields of the <tt>Mail::Message</tt>.  You can 
-  #   specify a default for any valid header for <tt>Mail::Message</tt> and it will be used if
-  #   you do not override it.  You pass in the header value as a symbol, all lower case with under
-  #   scores instead of hyphens, so <tt>Content-Transfer-Encoding:</tt>
-  #   becomes <tt>:content_transfer_encoding</tt>. The defaults set by Action Mailer are:
-  #   * <tt>:mime_version => "1.0"</tt>
-  #   * <tt>:charset      => "UTF-8",</tt>
-  #   * <tt>:content_type => "text/plain",</tt>
-  #   * <tt>:parts_order  => [ "text/plain", "text/enriched", "text/html" ]</tt>
+  # * <tt>default</tt> - You can pass this in at a class level as well as within the class itself as
+  #   per the above section.
   #
   # * <tt>logger</tt> - the logger is used for generating information on the mailing run if available.
   #   Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
@@ -250,16 +320,16 @@ module ActionMailer #:nodoc:
   # * <tt>deliveries</tt> - Keeps an array of all the emails sent out through the Action Mailer with
   #   <tt>delivery_method :test</tt>. Most useful for unit and functional testing.
   #
-  # * <tt>default_charset</tt> - This is now deprecated, use the +default+ method above to 
+  # * <tt>default_charset</tt> - This is now deprecated, use the +default+ method above to
   #   set the default +:charset+.
   #
-  # * <tt>default_content_type</tt> - This is now deprecated, use the +default+ method above 
+  # * <tt>default_content_type</tt> - This is now deprecated, use the +default+ method above
   #   to set the default +:content_type+.
   #
-  # * <tt>default_mime_version</tt> - This is now deprecated, use the +default+ method above 
+  # * <tt>default_mime_version</tt> - This is now deprecated, use the +default+ method above
   #   to set the default +:mime_version+.
   #
-  # * <tt>default_implicit_parts_order</tt> - This is now deprecated, use the +default+ method above 
+  # * <tt>default_implicit_parts_order</tt> - This is now deprecated, use the +default+ method above
   #   to set the default +:parts_order+.  Parts Order is used when a message is built implicitly
   #   (i.e. multiple parts are assembled from templates which specify the content type in their
   #   filenames) this variable controls how the parts are ordered.
@@ -272,12 +342,13 @@ module ActionMailer #:nodoc:
     include AbstractController::Layouts
     include AbstractController::Helpers
     include AbstractController::Translation
+    include AbstractController::AssetPaths
 
     helper  ActionMailer::MailHelper
 
     include ActionMailer::OldApi
     include ActionMailer::DeprecatedApi
-    
+
     delegate :register_observer, :to => Mail
     delegate :register_interceptor, :to => Mail
 
@@ -291,8 +362,6 @@ module ActionMailer #:nodoc:
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
-    ActiveSupport.run_load_hooks(:action_mailer, self)
-
     class << self
 
       def mailer_name
@@ -318,7 +387,7 @@ module ActionMailer #:nodoc:
       #     end
       #   end
       def receive(raw_mail)
-        ActiveSupport::Notifications.instrument("action_mailer.receive") do |payload|
+        ActiveSupport::Notifications.instrument("receive.action_mailer") do |payload|
           mail = Mail.new(raw_mail)
           set_payload_for_mail(payload, mail)
           new.receive(mail)
@@ -330,7 +399,7 @@ module ActionMailer #:nodoc:
       # 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.
       def deliver_mail(mail) #:nodoc:
-        ActiveSupport::Notifications.instrument("action_mailer.deliver") do |payload|
+        ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
           self.set_payload_for_mail(payload, mail)
           yield # Let Mail do the delivery actions
         end
@@ -382,17 +451,17 @@ module ActionMailer #:nodoc:
 
     # 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:
-    # 
+    #
     #   headers 'X-Special-Domain-Specific-Header' => "SecretValue",
     #           'In-Reply-To' => incoming.message_id
-    # 
+    #
     # The resulting Mail::Message will have the following in it's header:
-    # 
+    #
     #   X-Special-Domain-Specific-Header: SecretValue
     def headers(args=nil)
       if args
@@ -403,46 +472,46 @@ module ActionMailer #:nodoc:
     end
 
     # Allows you to add attachments to an email, like so:
-    # 
+    #
     #  mail.attachments['filename.jpg'] = File.read('/path/to/filename.jpg')
-    # 
+    #
     # If you do this, then Mail will take the file name and work out the mime type
-    # set the Content-Type, Content-Disposition, Content-Transfer-Encoding and 
+    # set the Content-Type, Content-Disposition, Content-Transfer-Encoding and
     # base64 encode the contents of the attachment all for you.
-    # 
+    #
     # You can also specify overrides if you want by passing a hash instead of a string:
-    # 
+    #
     #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
     #                                      :content => File.read('/path/to/filename.jpg')}
-    # 
+    #
     # If you want to use a different encoding than Base64, you can pass an encoding in,
     # but then it is up to you to pass in the content pre-encoded, and don't expect
     # Mail to know how to decode this data:
-    # 
+    #
     #  file_content = SpecialEncode(File.read('/path/to/filename.jpg'))
     #  mail.attachments['filename.jpg'] = {:mime_type => 'application/x-gzip',
     #                                      :encoding => 'SpecialEncoding',
     #                                      :content => file_content }
-    # 
+    #
     # You can also search for specific attachments:
-    # 
+    #
     #  # By Filename
     #  mail.attachments['filename.jpg']   #=> Mail::Part object or nil
-    #  
+    #
     #  # or by index
     #  mail.attachments[0]                #=> Mail::Part (first attachment)
-    #  
+    #
     def attachments
       @_message.attachments
     end
 
     # The main method that creates the message and renders the email templates. There are
     # two ways to call this method, with a block, or without a block.
-    # 
+    #
     # 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, ActionMailer will
+    #
+    # * <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
     #   <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the
     #   humanized version of the <tt>action_name</tt>
@@ -455,25 +524,25 @@ module ActionMailer #:nodoc:
     #   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.
-    # 
-    # You can set default values for any of the above headers (except :date) by using the <tt>default</tt> 
+    #
+    # You can set default values for any of the above headers (except :date) by using the <tt>default</tt>
     # class method:
-    # 
+    #
     #  class Notifier < ActionMailer::Base
     #    self.default :from => 'no-reply@test.lindsaar.net',
     #                 :bcc => 'email_logger@test.lindsaar.net',
     #                 :reply_to => 'bounces@test.lindsaar.net'
     #  end
-    # 
+    #
     # If you need other headers not listed above, 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 
+    # 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.
     #
-    # If you do not pass a block to the +mail+ method, it will find all templates in the 
+    # 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
@@ -497,19 +566,19 @@ module ActionMailer #:nodoc:
     # And now it will look for all templates at "app/views/notifications" with name "another".
     #
     # If you do pass a block, you can render specific templates of your choice:
-    # 
+    #
     #   mail(:to => 'mikel@test.lindsaar.net') do |format|
     #     format.text
     #     format.html
     #   end
-    # 
+    #
     # You can even render text directly without using a template:
-    # 
+    #
     #   mail(:to => 'mikel@test.lindsaar.net') do |format|
     #     format.text { render :text => "Hello Mikel!" }
     #     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.
     #
@@ -530,8 +599,13 @@ module ActionMailer #:nodoc:
       content_type = headers[:content_type]
       parts_order  = headers[:parts_order]
 
+      # Call all the procs (if any)
+      default_values = self.class.default.merge(self.class.default) do |k,v|
+        v.respond_to?(:call) ? v.bind(self).call : v
+      end
+
       # Handle defaults
-      headers = headers.reverse_merge(self.class.default)
+      headers = headers.reverse_merge(default_values)
       headers[:subject] ||= default_i18n_subject
 
       # Apply charset at the beginning so all fields are properly quoted
@@ -541,7 +615,7 @@ module ActionMailer #:nodoc:
       wrap_delivery_behavior!(headers.delete(:delivery_method))
 
       # Assign all headers except parts_order, content_type and body
-      assignable = headers.except(:parts_order, :content_type, :body)
+      assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
       assignable.each { |k, v| m[k] = v }
 
       # Render the templates and blocks
@@ -569,7 +643,11 @@ module ActionMailer #:nodoc:
       when user_content_type.present?
         user_content_type
       when m.has_attachments?
-        ["multipart", "mixed", params]
+        if m.attachments.detect { |a| a.inline? }
+          ["multipart", "related", params]
+        else
+          ["multipart", "mixed", params]
+        end
       when m.multipart?
         ["multipart", "alternative", params]
       else
@@ -643,5 +721,28 @@ module ActionMailer #:nodoc:
       container.add_part(part)
     end
 
+    module DeprecatedUrlOptions
+      def default_url_options
+        deprecated_url_options
+      end
+
+      def default_url_options=(val)
+        deprecated_url_options
+      end
+
+      def deprecated_url_options
+        raise "You can no longer call ActionMailer::Base.default_url_options " \
+              "directly. You need to set config.action_mailer.default_url_options. " \
+              "If you are using ActionMailer standalone, you need to include the " \
+              "url_helpers of a router directly."
+      end
+    end
+
+    # This module will complain if the user tries to set default_url_options
+    # directly instead of through the config object. In ActionMailer's Railtie,
+    # we include the url_helpers of the router, which will override this module
+    extend DeprecatedUrlOptions
+
+    ActiveSupport.run_load_hooks(:action_mailer, self)
   end
 end

data/lib/action_mailer/mail_helper.rb

@@ -3,6 +3,13 @@ module ActionMailer
     # Uses Text::Format to take the text and format it, indented two spaces for
     # each line, and wrapped at 72 columns.
     def block_format(text)
+      begin
+        require 'text/format'
+      rescue LoadError => e
+        $stderr.puts "You don't have text-format installed in your application. Please add it to your Gemfile and run bundle install"
+        raise e
+      end unless defined?(Text::Format)
+
       formatted = text.split(/\n\r\n/).collect { |paragraph|
         Text::Format.new(
           :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
@@ -25,5 +32,10 @@ module ActionMailer
     def message
       @_message
     end
+
+    # Access the message attachments list.
+    def attachments
+      @_message.attachments
+    end
   end
 end

data/lib/action_mailer/old_api.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/blank'
 

data/lib/action_mailer/railtie.rb

@@ -5,10 +5,6 @@ module ActionMailer
   class Railtie < Rails::Railtie
     config.action_mailer = ActiveSupport::OrderedOptions.new
 
-    initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActiveSupport.on_load(:action_mailer) { include app.routes.url_helpers }
-    end
-
     require "action_mailer/railties/log_subscriber"
     log_subscriber :action_mailer, ActionMailer::Railties::LogSubscriber.new
 
@@ -17,7 +13,18 @@ module ActionMailer
     end
 
     initializer "action_mailer.set_configs" do |app|
+      paths = app.config.paths
+      am = app.config.action_mailer
+
+      am.assets_dir      ||= paths.public.to_a.first
+      am.javascripts_dir ||= paths.public.javascripts.to_a.first
+      am.stylesheets_dir ||= paths.public.stylesheets.to_a.first
+
       ActiveSupport.on_load(:action_mailer) do
+        self.config.merge!(am)
+
+        include app.routes.url_helpers
+
         app.config.action_mailer.each do |k,v|
           send "#{k}=", v
         end

data/lib/action_mailer/version.rb

@@ -3,7 +3,7 @@ module ActionMailer
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

data/lib/rails/generators/mailer/USAGE

@@ -0,0 +1,15 @@
+Description:
+    Stubs out a new mailer and its views. Pass the mailer name, either
+    CamelCased or under_scored, and an optional list of emails as arguments.
+
+    This generates a mailer class in app/mailers and invokes your template
+    engine and test framework generators.
+
+Example:
+    `rails generate mailer Notifications signup forgot_password invoice`
+
+    creates a Notifications mailer class, views, test, and fixtures:
+        Mailer:     app/mailers/notifications.rb
+        Views:      app/views/notifications/signup.erb [...]
+        Test:       test/functional/notifications_test.rb
+        Fixtures:   test/fixtures/notifications/signup [...]

data/lib/rails/generators/mailer/mailer_generator.rb

@@ -0,0 +1,16 @@
+module Rails
+  module Generators
+    class MailerGenerator < NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :actions, :type => :array, :default => [], :banner => "method method"
+      check_class_collision
+
+      def create_mailer_file
+        template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}.rb")
+      end
+
+      hook_for :template_engine, :test_framework
+    end
+  end
+end

data/lib/rails/generators/mailer/templates/mailer.rb

@@ -0,0 +1,16 @@
+class <%= class_name %> < ActionMailer::Base
+  default :from => "from@example.com"
+<% for action in actions -%>
+
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.actionmailer.<%= file_name %>.<%= action %>.subject
+  #
+  def <%= action %>
+    @greeting = "Hi"
+
+    mail :to => "to@example.org"
+  end
+<% end -%>
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,24 +43,10 @@ dependencies:
         segments: 
         - 2
         - 2
-        - 0
-        version: 2.2.0
+        - 3
+        version: 2.2.3
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: text-format
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id003
 description: Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.
 email: david@loudthinking.com
 executables: []
@@ -87,6 +73,9 @@ files:
 - lib/action_mailer/tmail_compat.rb
 - lib/action_mailer/version.rb
 - lib/action_mailer.rb
+- lib/rails/generators/mailer/mailer_generator.rb
+- lib/rails/generators/mailer/templates/mailer.rb
+- lib/rails/generators/mailer/USAGE
 has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []