actionmailer 2.2.2 → 2.2.3

data/CHANGELOG

@@ -1,9 +1,10 @@
-*2.2.1 [RC2] (November 14th, 2008)*
+*2.2.3 (September 4th, 2009)*
 
-* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]
+Version bump.
 
+*2.2 (November 21st, 2008)*
 
-*2.2.0 [RC1] (October 24th, 2008)*
+* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]
 
 * Add layout functionality to mailers [Pratik]
 

data/Rakefile

@@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.2.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.2.3' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/lib/action_mailer/base.rb

@@ -429,7 +429,7 @@ module ActionMailer #:nodoc:
       def register_template_extension(extension)
         ActiveSupport::Deprecation.warn(
           "ActionMailer::Base.register_template_extension has been deprecated." +
-          "Use ActionView::Base.register_template_extension instead", caller)
+          "Use ActionView::Template.register_template_handler instead", caller)
       end
 
       def template_root
@@ -549,7 +549,12 @@ module ActionMailer #:nodoc:
       end
 
       def render_message(method_name, body)
+        if method_name.respond_to?(:content_type)
+          @current_template_content_type = method_name.content_type
+        end
         render :file => method_name, :body => body
+      ensure
+        @current_template_content_type = nil
       end
 
       def render(opts)
@@ -568,7 +573,11 @@ module ActionMailer #:nodoc:
       end
 
       def default_template_format
-        :html
+        if @current_template_content_type
+          Mime::Type.lookup(@current_template_content_type).to_sym
+        else
+          :html
+        end
       end
 
       def candidate_for_layout?(options)
@@ -588,7 +597,9 @@ module ActionMailer #:nodoc:
       end
 
       def initialize_template_class(assigns)
-        ActionView::Base.new(view_paths, assigns, self)
+        template = ActionView::Base.new(view_paths, assigns, self)
+        template.template_format = default_template_format
+        template
       end
 
       def sort_parts(parts, order = [])

data/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/fixtures/auto_layout_mailer/multipart.text.html.erb

@@ -0,0 +1 @@
+text/html multipart

data/test/fixtures/auto_layout_mailer/multipart.text.plain.erb

@@ -0,0 +1 @@
+text/plain multipart

data/test/fixtures/layouts/auto_layout_mailer.text.erb

@@ -0,0 +1 @@
+text/plain layout - <%= yield %>

data/test/mail_layout_test.rb

@@ -20,6 +20,12 @@ class AutoLayoutMailer < ActionMailer::Base
     from       "tester@example.com"
     body       render(:inline => "Hello, <%= @world %>", :layout => false, :body => { :world => "Earth" })
   end
+
+  def multipart(recipient)
+    recipients recipient
+    subject    "You have a mail"
+    from       "tester@example.com"
+  end
 end
 
 class ExplicitLayoutMailer < ActionMailer::Base
@@ -56,6 +62,17 @@ class LayoutMailerTest < Test::Unit::TestCase
     assert_equal "Hello from layout Inside", mail.body.strip
   end
 
+  def test_should_pickup_multipart_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient)
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
   def test_should_pickup_layout_given_to_render
     mail = AutoLayoutMailer.create_spam(@recipient)
     assert_equal "Spammer layout Hello, Earth", mail.body.strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire: action_mailer
 bindir: bin
 cert_chain: []
 
-date: 2008-11-20 00:00:00 +01:00
+date: 2009-09-28 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 2.2.3
     version: 
 description: Makes it trivial to test and deliver emails sent from a single service layer.
 email: david@loudthinking.com
@@ -36,7 +36,6 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
-- lib/action_mailer
 - lib/action_mailer/adv_attr_accessor.rb
 - lib/action_mailer/base.rb
 - lib/action_mailer/helpers.rb
@@ -47,12 +46,7 @@ files:
 - lib/action_mailer/test_case.rb
 - lib/action_mailer/test_helper.rb
 - lib/action_mailer/utils.rb
-- lib/action_mailer/vendor
-- lib/action_mailer/vendor/text-format-0.6.3
-- lib/action_mailer/vendor/text-format-0.6.3/text
 - lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
-- lib/action_mailer/vendor/tmail-1.2.3
-- lib/action_mailer/vendor/tmail-1.2.3/tmail
 - lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb
 - lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
 - lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb
@@ -86,26 +80,20 @@ files:
 - lib/actionmailer.rb
 - test/abstract_unit.rb
 - test/delivery_method_test.rb
-- test/fixtures
-- test/fixtures/auto_layout_mailer
 - test/fixtures/auto_layout_mailer/hello.html.erb
-- test/fixtures/explicit_layout_mailer
+- test/fixtures/auto_layout_mailer/multipart.text.html.erb
+- test/fixtures/auto_layout_mailer/multipart.text.plain.erb
 - test/fixtures/explicit_layout_mailer/logout.html.erb
 - test/fixtures/explicit_layout_mailer/signup.html.erb
-- test/fixtures/first_mailer
 - test/fixtures/first_mailer/share.erb
-- test/fixtures/helper_mailer
 - test/fixtures/helper_mailer/use_example_helper.erb
 - test/fixtures/helper_mailer/use_helper.erb
 - test/fixtures/helper_mailer/use_helper_method.erb
 - test/fixtures/helper_mailer/use_mail_helper.erb
-- test/fixtures/helpers
 - test/fixtures/helpers/example_helper.rb
-- test/fixtures/layouts
 - test/fixtures/layouts/auto_layout_mailer.html.erb
+- test/fixtures/layouts/auto_layout_mailer.text.erb
 - test/fixtures/layouts/spam.html.erb
-- test/fixtures/path.with.dots
-- test/fixtures/path.with.dots/funky_path_mailer
 - test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
 - test/fixtures/raw_email
 - test/fixtures/raw_email10
@@ -123,11 +111,8 @@ files:
 - test/fixtures/raw_email_with_invalid_characters_in_content_type
 - test/fixtures/raw_email_with_nested_attachment
 - test/fixtures/raw_email_with_partially_quoted_subject
-- test/fixtures/second_mailer
 - test/fixtures/second_mailer/share.erb
-- test/fixtures/templates
 - test/fixtures/templates/signed_up.erb
-- test/fixtures/test_mailer
 - test/fixtures/test_mailer/_subtemplate.text.plain.erb
 - test/fixtures/test_mailer/body_ivar.erb
 - test/fixtures/test_mailer/custom_templating_extension.text.html.haml
@@ -153,6 +138,8 @@ files:
 - test/url_test.rb
 has_rdoc: true
 homepage: http://www.rubyonrails.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -173,9 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionmailer
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Service layer for easy email delivery and testing.
 test_files: []