mandriller 0.0.3 → 0.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -3
- data/lib/mandriller/base.rb +7 -2
- data/lib/mandriller/version.rb +1 -1
- data/spec/mandriller/base_spec.rb +6 -6
- 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: 1e882d4b5fa17b6061dfc6ed90a471cf0c9dd195
|
4
|
+
data.tar.gz: 9247bca77a75642a28bcfb36e606828513464383
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 21a027cabad51bd466a5f75b994f96f03b1635d96ac05c46e332574d584096e5131ee0ac3a5cdc45c00ea10aa2da7f80f98ebabecbaa420173a7f53be7659089
|
7
|
+
data.tar.gz: 6b9c6a4cc403f3230725490c6ca32dc495cecf7868059262a59cd797846f7dcacd1b44a0a756986fab4865577a7e9cf883eb7eb8c7fcd06933d3d07f17bb78d7
|
data/README.md
CHANGED
@@ -46,9 +46,9 @@ Enable open-tracking for the message.
|
|
46
46
|
|
47
47
|
Enable click-tracking for the message.
|
48
48
|
|
49
|
-
`set_click_track '
|
50
|
-
`set_click_track '
|
51
|
-
`set_click_track '
|
49
|
+
`set_click_track 'all'`: enables click tracking on all emails
|
50
|
+
`set_click_track 'htmlonly'`: enables click tracking only on html emails
|
51
|
+
`set_click_track 'textonly'`: enables click tracking only on text emails
|
52
52
|
|
53
53
|
### set_auto_text
|
54
54
|
|
data/lib/mandriller/base.rb
CHANGED
@@ -31,7 +31,7 @@ class Mandriller::Base < ActionMailer::Base
|
|
31
31
|
define_settings_methods STRING_SETTINGS.keys
|
32
32
|
define_settings_methods JSON_SETTINGS.keys
|
33
33
|
define_settings_methods :open_track, default: true
|
34
|
-
define_settings_methods :click_track, default: '
|
34
|
+
define_settings_methods :click_track, default: 'all'
|
35
35
|
define_settings_methods :send_at
|
36
36
|
|
37
37
|
class_attribute :mandrill_template, :mandrill_google_analytics
|
@@ -56,7 +56,12 @@ class Mandriller::Base < ActionMailer::Base
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def mail(*args)
|
59
|
-
tracks = [
|
59
|
+
tracks = []
|
60
|
+
tracks << (get_mandrill_setting("open_track") ? 'opens' : nil)
|
61
|
+
if v = get_mandrill_setting("click_track")
|
62
|
+
tracks << "clicks_#{v}"
|
63
|
+
end
|
64
|
+
tracks = tracks.compact.map(&:to_s)
|
60
65
|
unless tracks.empty?
|
61
66
|
tracks.each do |track|
|
62
67
|
validate_values!(track, %w(opens clicks_all clicks_htmlonly clicks_textonly))
|
data/lib/mandriller/version.rb
CHANGED
@@ -165,20 +165,20 @@ describe Mandriller::Base do
|
|
165
165
|
it_behaves_like "with header", 'X-MC-Track', 'opens'
|
166
166
|
end
|
167
167
|
context "set by #set_open_track" do
|
168
|
-
let(:local_settings) { lambda{ set_click_track :
|
169
|
-
it_behaves_like "with header", 'X-MC-Track', '
|
168
|
+
let(:local_settings) { lambda{ set_click_track :all } }
|
169
|
+
it_behaves_like "with header", 'X-MC-Track', 'clicks_all'
|
170
170
|
context "invalid type" do
|
171
171
|
let(:local_settings) { lambda{ set_click_track :invalid } }
|
172
172
|
it_behaves_like "raise an exception", Mandriller::InvalidHeaderValue
|
173
173
|
end
|
174
174
|
end
|
175
175
|
context "set by ::set_open_track" do
|
176
|
-
let(:global_settings) { lambda{ set_click_track :
|
177
|
-
it_behaves_like "with header", 'X-MC-Track', '
|
176
|
+
let(:global_settings) { lambda{ set_click_track :all } }
|
177
|
+
it_behaves_like "with header", 'X-MC-Track', 'clicks_all'
|
178
178
|
end
|
179
179
|
context "set by both ::set_open_track and ::set_click_track" do
|
180
|
-
let(:global_settings) { lambda{ set_open_track; set_click_track :
|
181
|
-
it_behaves_like "with header", 'X-MC-Track', 'opens,
|
180
|
+
let(:global_settings) { lambda{ set_open_track; set_click_track :all } }
|
181
|
+
it_behaves_like "with header", 'X-MC-Track', 'opens,clicks_all'
|
182
182
|
end
|
183
183
|
end
|
184
184
|
|