actionmailer 1.3.6 → 2.0.0

data/CHANGELOG

@@ -1,15 +1,47 @@
-*1.3.6* (October 12th, 2007)
+*2.0.0* (December 6th, 2007)
 
-* Depend on Action Pack 1.13.6
+* Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [rick]
 
-*1.3.5* (October 12th, 2007)
+  * Pass the template_root as an array as ActionView's view_path
+  * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
 
-* Depend on Action Pack 1.13.5
+* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]
 
+* Update README to use new smtp settings configuration API. Closes #10060 [psq]
 
-*1.3.4* (October 4th, 2007)
+* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [zdennis]
 
-* Depend on Action Pack 1.13.4
+* Update TMail to v1.1.0.  Use an updated version of TMail if available.  [mikel]
+
+* Introduce a new base test class for testing Mailers.  ActionMailer::TestCase [Koz]
+
+* Fix silent failure of rxml templates.  #9879 [jstewart]
+
+
+*2.0.0 [Preview Release]* (September 29th, 2007)
+
+* Fix attachment decoding when using the TMail C extension.  #7861 [orangechicken]
+
+* Increase mail delivery test coverage.  #8692 [kamal]
+
+* Register alternative template engines using ActionMailer::Base.register_template_extension('haml').  #7534 [cwd, Josh Peek]
+
+* Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
+
+* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck]
+
+* Allow mailer actions named send by using __send__ internally.  #6467 [iGEL]
+
+* Add assert_emails and assert_no_emails to test the number of emails delivered.  #6479 [Jonathan Viney]
+    # Assert total number of emails delivered:
+    assert_emails 0
+    ContactMailer.deliver_contact
+    assert_emails 1
+
+    # Assert number of emails delivered within a block:
+    assert_emails 1 do
+      post :signup, :name => 'Jonathan'
+    end
 
 
 *1.3.3* (March 12th, 2007)
@@ -43,6 +75,8 @@
 
 * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
 
+* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]
+
 * Resolve action naming collision. #5520 [ssinghi@kreeti.com]
 
 * ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.]
@@ -51,30 +85,8 @@
 
 * Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
 
-
-*1.2.5* (August 10th, 2006)
-
-* Depend on Action Pack 1.12.5
-
-
-*1.2.4* (August 8th, 2006)
-
-* Backport of documentation enhancements. [Kevin Clark, Marcel Molina Jr]
-
 * Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.]
 
-* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]
-
-
-*1.2.3* (June 29th, 2006)
-
-* Depend on Action Pack 1.12.3
-
-
-*1.2.2* (June 27th, 2006)
-
-* Depend on Action Pack 1.12.2
-
 
 *1.2.1* (April 6th, 2006)
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2006 David Heinemeier Hansson
+Copyright (c) 2004-2007 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -86,7 +86,7 @@ This Mailman can be the target for Postfix. In Rails, you would use the runner l
 
 The Base class has the full list of configuration options. Here's an example:
 
-ActionMailer::Base.server_settings = {
+ActionMailer::Base.smtp_settings = {
   :address=>'smtp.yourserver.com',    # default: localhost
   :port=>'25',                        # default: 25
   :user_name=>'user',
@@ -142,4 +142,4 @@ And as Jim from Rake says:
 
    Feel free to submit commits or feature requests.  If you send a patch,
    remember to update the corresponding unit tests.  If fact, I prefer
-   new feature to be submitted in the form of new unit tests.
+   new feature to be submitted in the form of new unit tests.

data/Rakefile

@@ -29,11 +29,12 @@ Rake::TestTask.new { |t|
 }
 
 
-# Genereate the RDoc documentation
+# Generate the RDoc documentation
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
+  rdoc.options << '--charset' << 'utf-8'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/action_mailer.rb')
@@ -54,7 +55,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.13.6' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.0.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -92,4 +93,4 @@ task :release => [ :package ] do
   rubyforge = RubyForge.new
   rubyforge.login
   rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
+end

data/install.rb

@@ -18,7 +18,7 @@ unless $sitedir
   end
 end
 
-# the acual gruntwork
+# the actual gruntwork
 Dir.chdir("lib")
 
 Find.find("action_mailer", "action_mailer.rb") { |f|

data/lib/action_mailer.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2006 David Heinemeier Hansson
+# Copyright (c) 2004-2007 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,13 +31,15 @@ unless defined?(ActionController)
   end
 end
 
-$:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")
+require 'action_mailer/vendor'
+require 'tmail'
 
 require 'action_mailer/base'
 require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
-require 'tmail'
+require 'action_mailer/test_helper'
+
 require 'net/smtp'
 
 ActionMailer::Base.class_eval do

data/lib/action_mailer/base.rb

@@ -52,9 +52,9 @@ module ActionMailer #:nodoc:
   #
   # Like ActionController, 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>.rhtml</tt> file with the same name as the method
+  # 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.rhtml</tt> would be used to generate the email.
+  # <tt>app/views/notifier/signup_notification.erb</tt> would be used to generate the email.
   #
   # Variables defined in the model are accessible as instance variables in the view.
   #
@@ -103,7 +103,7 @@ module ActionMailer #:nodoc:
   #
   # = HTML email
   #
-  # To send mail as HTML, make sure your view (the <tt>.rhtml</tt> file) generates HTML and
+  # To send mail as HTML, make sure your view (the <tt>.erb</tt> file) generates HTML and
   # set the content type to html.
   #
   #   class MyMailer < ActionMailer::Base
@@ -142,10 +142,10 @@ module ActionMailer #:nodoc:
   # by the content type. Each such detected template will be added as separate part to the message.
   # 
   # For example, if the following templates existed:
-  # * signup_notification.text.plain.rhtml
-  # * signup_notification.text.html.rhtml
-  # * signup_notification.text.xml.rxml
-  # * signup_notification.text.x-yaml.rhtml
+  # * signup_notification.text.plain.erb
+  # * signup_notification.text.html.erb
+  # * signup_notification.text.xml.builder
+  # * signup_notification.text.x-yaml.erb
   #  
   # Each would be rendered and added as a separate part to the message,
   # with the corresponding content type. The same body hash is passed to
@@ -219,17 +219,16 @@ module ActionMailer #:nodoc:
   #   <tt>@implicit_parts_order</tt>.
   class Base
     include AdvAttrAccessor, PartContainer
-    include ActionController::UrlWriter
+    include ActionController::UrlWriter if Object.const_defined?(:ActionController)
 
-    # Action Mailer subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-    include Reloadable::Deprecated
-    
     private_class_method :new #:nodoc:
 
     class_inheritable_accessor :template_root
     cattr_accessor :logger
 
+    cattr_accessor :template_extensions
+    @@template_extensions = ['erb', 'builder', 'rhtml', 'rxml']
+
     @@smtp_settings = { 
       :address        => "localhost", 
       :port           => 25, 
@@ -249,8 +248,8 @@ module ActionMailer #:nodoc:
     @@raise_delivery_errors = true
     cattr_accessor :raise_delivery_errors
 
-    @@delivery_method = :smtp
-    cattr_accessor :delivery_method
+    superclass_delegating_accessor :delivery_method
+    self.delivery_method = :smtp
     
     @@perform_deliveries = true
     cattr_accessor :perform_deliveries
@@ -299,11 +298,6 @@ module ActionMailer #:nodoc:
     # This defaults to the value for the +default_implicit_parts_order+.
     adv_attr_accessor :implicit_parts_order
     
-    # Override the mailer name, which defaults to an inflected version of the
-    # mailer's class name. If you want to use a template in a non-standard
-    # location, you can use this to specify that location.
-    adv_attr_accessor :mailer_name
-    
     # Defaults to "1.0", but may be explicitly given if needed.
     adv_attr_accessor :mime_version
     
@@ -323,10 +317,35 @@ module ActionMailer #:nodoc:
     # have multiple mailer methods share the same template.
     adv_attr_accessor :template
 
+    # Override the mailer name, which defaults to an inflected version of the
+    # mailer's class name. If you want to use a template in a non-standard
+    # location, you can use this to specify that location.
+    def mailer_name(value = nil)
+      if value
+        self.mailer_name = value
+      else
+        self.class.mailer_name
+      end
+    end
+    
+    def mailer_name=(value)
+      self.class.mailer_name = value
+    end
+
     # The mail object instance referenced by this mailer.
     attr_reader :mail
 
     class << self
+      attr_writer :mailer_name
+
+      def mailer_name
+        @mailer_name ||= name.underscore
+      end
+
+      # for ActionView compatibility
+      alias_method :controller_name, :mailer_name
+      alias_method :controller_path, :mailer_name
+
       def method_missing(method_symbol, *parameters)#:nodoc:
         case method_symbol.id2name
           when /^create_([_a-z]\w*)/  then new($1, *parameters).mail
@@ -363,18 +382,17 @@ module ActionMailer #:nodoc:
       def deliver(mail)
         new.deliver!(mail)
       end
-      
-      # Server Settings is the old name for <tt>smtp_settings</tt>
-      def server_settings
-        smtp_settings
-      end
-      deprecate :server_settings=>"It's now named smtp_settings"
-      
-      def server_settings=(settings)
-        ActiveSupport::Deprecation.warn("server_settings has been renamed smtp_settings, this warning will be removed with rails 2.0", caller)
-        self.smtp_settings=settings
+
+      # Register a template extension so mailer templates written in a
+      # templating language other than rhtml or rxml are supported.
+      # To use this, include in your template-language plugin's init
+      # code or on a per-application basis, this can be invoked from
+      # config/environment.rb:
+      #
+      #   ActionMailer::Base.register_template_extension('haml')
+      def register_template_extension(extension)
+        template_extensions << extension
       end
-      
     end
 
     # Instantiate a new mailer object. If +method_name+ is not +nil+, the mailer
@@ -389,20 +407,20 @@ module ActionMailer #:nodoc:
     # rendered and a new TMail::Mail object created.
     def create!(method_name, *parameters) #:nodoc:
       initialize_defaults(method_name)
-      send(method_name, *parameters)
+      __send__(method_name, *parameters)
 
       # If an explicit, textual body has not been set, we check assumptions.
       unless String === @body
         # First, we look to see if there are any likely templates that match,
         # which include the content-type in their file name (i.e.,
-        # "the_template_file.text.html.rhtml", etc.). Only do this if parts
+        # "the_template_file.text.html.erb", etc.). Only do this if parts
         # have not already been specified manually.
         if @parts.empty?
           templates = Dir.glob("#{template_path}/#{@template}.*")
           templates.each do |path|
-            # TODO: don't hardcode rhtml|rxml
             basename = File.basename(path)
-            next unless md = /^([^\.]+)\.([^\.]+\.[^\.]+)\.(rhtml|rxml)$/.match(basename)
+            template_regex = Regexp.new("^([^\\\.]+)\\\.([^\\\.]+\\\.[^\\\.]+)\\\.(" + template_extensions.join('|') + ")$")
+            next unless md = template_regex.match(basename)
             template_name = basename
             content_type = md.captures[1].gsub('.', '/')
             @parts << Part.new(:content_type => content_type,
@@ -448,7 +466,7 @@ module ActionMailer #:nodoc:
       logger.info "Sent mail:\n #{mail.encoded}" unless logger.nil?
 
       begin
-        send("perform_delivery_#{delivery_method}", mail) if perform_deliveries
+        __send__("perform_delivery_#{delivery_method}", mail) if perform_deliveries
       rescue Exception => e  # Net::SMTP errors or sendmail pipe errors
         raise e if raise_delivery_errors
       end
@@ -478,6 +496,9 @@ module ActionMailer #:nodoc:
 
       def render(opts)
         body = opts.delete(:body)
+        if opts[:file] && opts[:file] !~ /\//
+          opts[:file] = "#{mailer_name}/#{opts[:file]}"
+        end
         initialize_template_class(body).render(opts)
       end
 
@@ -486,7 +507,7 @@ module ActionMailer #:nodoc:
       end
 
       def initialize_template_class(assigns)
-        ActionView::Base.new(template_path, assigns, self)
+        ActionView::Base.new([template_root], assigns, self)
       end
 
       def sort_parts(parts, order = [])

data/lib/action_mailer/helpers.rb

@@ -49,7 +49,7 @@ module ActionMailer
               begin
                 require_dependency(file_name)
               rescue LoadError => load_error
-                requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
+                requiree = / -- (.*?)(\.rb)?$/.match(load_error.message).to_a[1]
                 msg = (requiree == file_name) ? "Missing helper file helpers/#{file_name}.rb" : "Can't load file: #{requiree}"
                 raise LoadError.new(msg).copy_blame!(load_error)
               end
@@ -72,7 +72,7 @@ module ActionMailer
         methods.flatten.each do |method|
           master_helper_module.module_eval <<-end_eval
             def #{method}(*args, &block)
-              controller.send(%(#{method}), *args, &block)
+              controller.send!(%(#{method}), *args, &block)
             end
           end_eval
         end
@@ -92,7 +92,7 @@ module ActionMailer
           inherited_without_helper(child)
           begin
             child.master_helper_module = Module.new
-            child.master_helper_module.send :include, master_helper_module
+            child.master_helper_module.send! :include, master_helper_module
             child.helper child.name.underscore
           rescue MissingSourceFile => e
             raise unless e.is_missing?("helpers/#{child.name.underscore}_helper")
@@ -108,4 +108,4 @@ module ActionMailer
         end
       end
   end
-end
+end

data/lib/action_mailer/part.rb

@@ -84,11 +84,8 @@ module ActionMailer
         end        
       else
         if String === body
-          part = TMail::Mail.new
-          part.body = body
-          part.set_content_type(real_content_type, nil, ctype_attrs)
-          part.set_content_disposition "inline"
-          m.parts << part
+          @parts.unshift Part.new(:charset => charset, :body => @body, :content_type => 'text/plain')
+          @body = nil
         end
           
         @parts.each do |p|

data/lib/action_mailer/test_case.rb

@@ -0,0 +1,59 @@
+require 'active_support/test_case'
+
+module ActionMailer
+  class NonInferrableMailerError < ::StandardError
+    def initialize(name)
+      super "Unable to determine the mailer to test from #{name}. " +
+        "You'll need to specify it using tests YourMailer in your " +
+        "test case definition"
+    end
+  end
+  # New Test Super class for forward compatibility.
+  # To override
+  class TestCase < ActiveSupport::TestCase
+    include ActionMailer::Quoting
+
+    class << self
+      def tests(mailer)
+        write_inheritable_attribute(:mailer_class, mailer)
+      end
+
+      def mailer_class
+        if mailer = read_inheritable_attribute(:mailer_class)
+          mailer
+        else
+          tests determine_default_mailer(name)
+        end
+      end
+
+      def determine_default_mailer(name)
+        name.sub(/Test$/, '').constantize
+      rescue NameError => e
+        raise NonInferrableMailerError.new(name)
+      end
+    end
+
+    def setup
+      ActionMailer::Base.delivery_method = :test
+      ActionMailer::Base.perform_deliveries = true
+      ActionMailer::Base.deliveries = []
+
+      @expected = TMail::Mail.new
+      @expected.set_content_type "text", "plain", { "charset" => charset }
+      @expected.mime_version = '1.0'
+    end
+
+    private
+      def charset
+        "utf-8"
+      end
+
+      def encode(subject)
+        quoted_printable(subject, charset)
+      end
+
+      def read_fixture(action)
+        IO.readlines(File.join(RAILS_ROOT, 'test', 'fixtures', self.class.mailer_class.name.underscore, action))
+      end
+  end
+end