actionmailer 5.0.7.2 → 5.1.0.beta1
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 +5 -5
- data/CHANGELOG.md +16 -183
- data/MIT-LICENSE +1 -1
- data/README.rdoc +1 -1
- data/lib/action_mailer.rb +11 -11
- data/lib/action_mailer/base.rb +150 -137
- data/lib/action_mailer/collector.rb +3 -3
- data/lib/action_mailer/delivery_job.rb +1 -1
- data/lib/action_mailer/delivery_methods.rb +7 -7
- data/lib/action_mailer/gem_version.rb +3 -3
- data/lib/action_mailer/inline_preview_interceptor.rb +4 -8
- data/lib/action_mailer/log_subscriber.rb +2 -2
- data/lib/action_mailer/mail_helper.rb +1 -1
- data/lib/action_mailer/message_delivery.rb +4 -4
- data/lib/action_mailer/parameterized.rb +152 -0
- data/lib/action_mailer/preview.rb +13 -12
- data/lib/action_mailer/railtie.rb +6 -6
- data/lib/action_mailer/test_case.rb +17 -19
- data/lib/action_mailer/test_helper.rb +3 -3
- data/lib/action_mailer/version.rb +1 -1
- data/lib/rails/generators/mailer/mailer_generator.rb +10 -11
- metadata +13 -11
@@ -1,4 +1,4 @@
|
|
1
|
-
require
|
1
|
+
require "active_job"
|
2
2
|
|
3
3
|
module ActionMailer
|
4
4
|
# Provides helper methods for testing Action Mailer, including #assert_emails
|
@@ -88,7 +88,7 @@ module ActionMailer
|
|
88
88
|
# end
|
89
89
|
# end
|
90
90
|
def assert_enqueued_emails(number, &block)
|
91
|
-
assert_enqueued_jobs number, only: ActionMailer::DeliveryJob, &block
|
91
|
+
assert_enqueued_jobs number, only: [ ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob ], &block
|
92
92
|
end
|
93
93
|
|
94
94
|
# Asserts that no emails are enqueued for later delivery.
|
@@ -107,7 +107,7 @@ module ActionMailer
|
|
107
107
|
# end
|
108
108
|
# end
|
109
109
|
def assert_no_enqueued_emails(&block)
|
110
|
-
assert_no_enqueued_jobs only: ActionMailer::DeliveryJob, &block
|
110
|
+
assert_no_enqueued_jobs only: [ ActionMailer::DeliveryJob, ActionMailer::Parameterized::DeliveryJob ], &block
|
111
111
|
end
|
112
112
|
end
|
113
113
|
end
|
@@ -8,29 +8,28 @@ module Rails
|
|
8
8
|
check_class_collision suffix: "Mailer"
|
9
9
|
|
10
10
|
def create_mailer_file
|
11
|
-
template "mailer.rb", File.join(
|
11
|
+
template "mailer.rb", File.join("app/mailers", class_path, "#{file_name}_mailer.rb")
|
12
12
|
|
13
13
|
in_root do
|
14
|
-
if
|
15
|
-
template
|
14
|
+
if behavior == :invoke && !File.exist?(application_mailer_file_name)
|
15
|
+
template "application_mailer.rb", application_mailer_file_name
|
16
16
|
end
|
17
17
|
end
|
18
18
|
end
|
19
19
|
|
20
20
|
hook_for :template_engine, :test_framework
|
21
21
|
|
22
|
-
|
23
|
-
def file_name
|
24
|
-
@_file_name ||= super.gsub(/_mailer/i,
|
22
|
+
private
|
23
|
+
def file_name # :doc:
|
24
|
+
@_file_name ||= super.gsub(/_mailer/i, "")
|
25
25
|
end
|
26
26
|
|
27
|
-
private
|
28
27
|
def application_mailer_file_name
|
29
28
|
@_application_mailer_file_name ||= if mountable_engine?
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
29
|
+
"app/mailers/#{namespaced_path}/application_mailer.rb"
|
30
|
+
else
|
31
|
+
"app/mailers/application_mailer.rb"
|
32
|
+
end
|
34
33
|
end
|
35
34
|
end
|
36
35
|
end
|
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: 5.0.
|
4
|
+
version: 5.1.0.beta1
|
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:
|
11
|
+
date: 2017-02-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionpack
|
@@ -16,42 +16,42 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 5.0.
|
19
|
+
version: 5.1.0.beta1
|
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: 5.0.
|
26
|
+
version: 5.1.0.beta1
|
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: 5.0.
|
33
|
+
version: 5.1.0.beta1
|
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: 5.0.
|
40
|
+
version: 5.1.0.beta1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: activejob
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - '='
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 5.0.
|
47
|
+
version: 5.1.0.beta1
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - '='
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 5.0.
|
54
|
+
version: 5.1.0.beta1
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: mail
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -106,6 +106,7 @@ files:
|
|
106
106
|
- lib/action_mailer/log_subscriber.rb
|
107
107
|
- lib/action_mailer/mail_helper.rb
|
108
108
|
- lib/action_mailer/message_delivery.rb
|
109
|
+
- lib/action_mailer/parameterized.rb
|
109
110
|
- lib/action_mailer/preview.rb
|
110
111
|
- lib/action_mailer/railtie.rb
|
111
112
|
- lib/action_mailer/rescuable.rb
|
@@ -131,12 +132,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
131
132
|
version: 2.2.2
|
132
133
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
133
134
|
requirements:
|
134
|
-
- - "
|
135
|
+
- - ">"
|
135
136
|
- !ruby/object:Gem::Version
|
136
|
-
version:
|
137
|
+
version: 1.3.1
|
137
138
|
requirements:
|
138
139
|
- none
|
139
|
-
|
140
|
+
rubyforge_project:
|
141
|
+
rubygems_version: 2.6.10
|
140
142
|
signing_key:
|
141
143
|
specification_version: 4
|
142
144
|
summary: Email composition, delivery, and receiving framework (part of Rails).
|