actionmailer 4.0.3 → 4.0.4.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a014d8d798583f2ecebf84e9d53f77b9b6c1c7a
-  data.tar.gz: 1a769ffe31cc3ce7f1576bc5c43fec1b616236df
+  metadata.gz: 94e455d8417bed63234639d208c6158b7067d16a
+  data.tar.gz: 048f8439dbc2b765c62fa3075a352a16d765743a
 SHA512:
-  metadata.gz: a2f84f358e6b9a20f3b9834175c285e243b842fbda6825c114b69fbb6bb2baabc40e3fd5bff54641a75826e1f4ab80ca8c835096d61d7bd3751d0ad8485c1f14
-  data.tar.gz: 068d56970b4f1c0caa84137731af104b3b705d9655a636d7eec8c5a519ba39de7fe3846becc4de7b651d35c1b38e9b3f76c6035216b1247814326b2fd30cbf68
+  metadata.gz: 077c943cda358bbec8e98e5bd5404df985a0f10c9f41b9e4ec2fbd57bd491ddefcb4d015f81181ed8d47de9e2094c1ccd27c1a6a90beb1b5a83bb558c7326ec3
+  data.tar.gz: b079c8c615f0304b01c7290dcc7584b0970030108692392e6aa814cb780685068d4f069b70b821bb16b49d5cc29c82643da40cbb59451ecb9627192d2b408a54

data/CHANGELOG.md

@@ -1,5 +1,40 @@
+## Rails 4.0.4 ##
+
+*   Calling `mail()` without arguments serves as getter for the current mail
+    message and keeps previously set headers.
+
+    Example:
+
+        class MailerWithCallback < ActionMailer::Base
+          after_action :a_callback
+
+          def welcome
+            mail subject: "subject", to: ["joe@example.com"]
+          end
+
+          def a_callback
+            mail # => returns the current mail message
+          end
+        end
+
+    *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.

data/lib/action_mailer/base.rb

@@ -661,6 +661,8 @@ module ActionMailer
     #   end
     #
     def mail(headers = {}, &block)
+      return @_message if @_mail_was_called && headers.blank? && !block
+
       @_mail_was_called = true
       m = @_message
 

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.3"
+    Gem::Version.new "4.0.4.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.0.4.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -76,13 +76,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       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.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).