smailer 0.7.3 → 0.7.4
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.
- checksums.yaml +4 -4
- data/lib/smailer/tasks/send.rb +3 -9
- data/lib/smailer/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c07a27e4bbea2f0bc95cde59fe7201647fb4a9ae
|
|
4
|
+
data.tar.gz: 6924a18b1447a50f47eaf08fa20295ae4ba4a530
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 23a2ae77e2d6416ae35f54277262238982627bf9d095ac1b1f0495c65144c128a593c6f29c31e654c3019e4ecee250b736c1c5422e685a40efe1ca57103f5d26
|
|
7
|
+
data.tar.gz: 4de9d3bbd461f9509cadac9699227428cc983dd7b6b07dccc5ab7d0b27ecf53b3af2df11350b49f383b17df3c0c842b6d039f6e074257511f59a1f7b4eb1ff82
|
data/lib/smailer/tasks/send.rb
CHANGED
|
@@ -11,15 +11,9 @@ module Smailer
|
|
|
11
11
|
raise "VERP is enabled, but a :return_path_domain option has not been specified or is blank."
|
|
12
12
|
end
|
|
13
13
|
|
|
14
|
-
rails_delivery_method = if Smailer::Compatibility.rails_3_or_4?
|
|
15
|
-
method = Rails.configuration.action_mailer.delivery_method
|
|
16
|
-
[method, Rails.configuration.action_mailer.send("#{method}_settings")]
|
|
17
|
-
else
|
|
18
|
-
[ActionMailer::Base.delivery_method]
|
|
19
|
-
end
|
|
20
|
-
|
|
21
14
|
Mail.defaults do
|
|
22
|
-
delivery_method
|
|
15
|
+
method = Rails.configuration.action_mailer.delivery_method
|
|
16
|
+
delivery_method method, Rails.configuration.action_mailer.send("#{method}_settings")
|
|
23
17
|
end
|
|
24
18
|
|
|
25
19
|
batch_size = (Smailer::Models::Property.get('queue.batch_size') || 100).to_i
|
|
@@ -70,7 +64,7 @@ module Smailer
|
|
|
70
64
|
# compute the VERP'd return_path if requested
|
|
71
65
|
# or fall-back to a global return-path if not
|
|
72
66
|
item_return_path = if options[:verp]
|
|
73
|
-
|
|
67
|
+
"#{Smailer::BOUNCES_PREFIX}#{queue_item.key}@#{options[:return_path_domain]}"
|
|
74
68
|
else
|
|
75
69
|
options[:return_path]
|
|
76
70
|
end
|
data/lib/smailer/version.rb
CHANGED