actionmailer 4.1.7.1 → 4.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of actionmailer might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: beaf483576f86d9eaf45f3a42df489b5f7ad4e7d
4
- data.tar.gz: 66239dc818d51770b915bd19a0e4756b777a6bb7
3
+ metadata.gz: 29408b0bbc5a30de701574cb035bcb2b4eddfabf
4
+ data.tar.gz: 8ce851facde6c592400878b779e7b245b9558ffb
5
5
  SHA512:
6
- metadata.gz: bf6c66c86380361018f46dcafe28d36290134625766f4ba8b87ea8e836fc23704afccbab6f9a5a21081f9b3c886c44de046ca54c01b6a7e60a31cf14aa098e6d
7
- data.tar.gz: 20741b228d3c71c95320dd94f0d0e6f51e0fad35b9d6dcabd3451f10523752ad618339649b2223fa1687b4bd2a2728a17deee8d3fbbbfaa0a2ceb5fef1e8cfd2
6
+ metadata.gz: 498d18b0c08699f49d4090548aa5513b0ea2d848012857a74ac0da36a079523af14aaa8fce2903b03ed005124d30890f1d47a3c3b04d26df7d9a52f8ee229a63
7
+ data.tar.gz: cdddc0b0a430a9178660960c8ecc325a8c27f1f380df02ba617becf25acf65ac92b2c6c8c32d9114c4e3fac2d9de11a136eb989576027939a9666eaaa211319b
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ * Attachments can be added while rendering the mail template.
2
+
3
+ Fixes #16974.
4
+
5
+ *Christian Felder*
6
+
1
7
  ## Rails 4.1.6 (September 11, 2014) ##
2
8
 
3
9
  * Make ActionMailer::Previews methods class methods. Previously they were
@@ -759,7 +759,6 @@ module ActionMailer
759
759
  def mail(headers = {}, &block)
760
760
  return @_message if @_mail_was_called && headers.blank? && !block
761
761
 
762
- @_mail_was_called = true
763
762
  m = @_message
764
763
 
765
764
  # At the beginning, do not consider class default for content_type
@@ -787,6 +786,8 @@ module ActionMailer
787
786
 
788
787
  # Render the templates and blocks
789
788
  responses = collect_responses(headers, &block)
789
+ @_mail_was_called = true
790
+
790
791
  create_parts_from_responses(m, responses)
791
792
 
792
793
  # Setup content type, reapply charset and handle parts order
@@ -7,8 +7,8 @@ module ActionMailer
7
7
  module VERSION
8
8
  MAJOR = 4
9
9
  MINOR = 1
10
- TINY = 7
11
- PRE = "1"
10
+ TINY = 8
11
+ PRE = nil
12
12
 
13
13
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
14
14
  end
@@ -29,7 +29,7 @@ module ActionMailer
29
29
 
30
30
  # Access the message attachments list.
31
31
  def attachments
32
- @_message.attachments
32
+ mailer.attachments
33
33
  end
34
34
 
35
35
  # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: actionmailer
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.7.1
4
+ version: 4.1.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-19 00:00:00.000000000 Z
11
+ date: 2014-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.1.7.1
19
+ version: 4.1.8
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 4.1.7.1
26
+ version: 4.1.8
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: actionview
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.1.7.1
33
+ version: 4.1.8
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 4.1.7.1
40
+ version: 4.1.8
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: mail
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
104
104
  requirements:
105
105
  - none
106
106
  rubyforge_project:
107
- rubygems_version: 2.2.2
107
+ rubygems_version: 2.4.2
108
108
  signing_key:
109
109
  specification_version: 4
110
110
  summary: Email composition, delivery, and receiving framework (part of Rails).