actionmailer 4.1.7.1 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beaf483576f86d9eaf45f3a42df489b5f7ad4e7d
-  data.tar.gz: 66239dc818d51770b915bd19a0e4756b777a6bb7
+  metadata.gz: 29408b0bbc5a30de701574cb035bcb2b4eddfabf
+  data.tar.gz: 8ce851facde6c592400878b779e7b245b9558ffb
 SHA512:
-  metadata.gz: bf6c66c86380361018f46dcafe28d36290134625766f4ba8b87ea8e836fc23704afccbab6f9a5a21081f9b3c886c44de046ca54c01b6a7e60a31cf14aa098e6d
-  data.tar.gz: 20741b228d3c71c95320dd94f0d0e6f51e0fad35b9d6dcabd3451f10523752ad618339649b2223fa1687b4bd2a2728a17deee8d3fbbbfaa0a2ceb5fef1e8cfd2
+  metadata.gz: 498d18b0c08699f49d4090548aa5513b0ea2d848012857a74ac0da36a079523af14aaa8fce2903b03ed005124d30890f1d47a3c3b04d26df7d9a52f8ee229a63
+  data.tar.gz: cdddc0b0a430a9178660960c8ecc325a8c27f1f380df02ba617becf25acf65ac92b2c6c8c32d9114c4e3fac2d9de11a136eb989576027939a9666eaaa211319b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+*   Attachments can be added while rendering the mail template.
+
+    Fixes #16974.
+
+    *Christian Felder*
+
 ## Rails 4.1.6 (September 11, 2014) ##
 
 *   Make ActionMailer::Previews methods class methods. Previously they were

data/lib/action_mailer/base.rb

@@ -759,7 +759,6 @@ module ActionMailer
     def mail(headers = {}, &block)
       return @_message if @_mail_was_called && headers.blank? && !block
 
-      @_mail_was_called = true
       m = @_message
 
       # At the beginning, do not consider class default for content_type
@@ -787,6 +786,8 @@ module ActionMailer
 
       # Render the templates and blocks
       responses = collect_responses(headers, &block)
+      @_mail_was_called = true
+
       create_parts_from_responses(m, responses)
 
       # Setup content type, reapply charset and handle parts order

data/lib/action_mailer/gem_version.rb

@@ -7,8 +7,8 @@ module ActionMailer
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 7
-    PRE   = "1"
+    TINY  = 8
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/mail_helper.rb

@@ -29,7 +29,7 @@ module ActionMailer
 
     # Access the message attachments list.
     def attachments
-      @_message.attachments
+      mailer.attachments
     end
 
     # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.1.7.1
+  version: 4.1.8
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7.1
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7.1
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7.1
+        version: 4.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.7.1
+        version: 4.1.8
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).