mandriller 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd96554dfe341939a2ceeece84b87063baffbbe
-  data.tar.gz: 46cc7feb2cb4b33d25cc330efe10eaf66286995c
+  metadata.gz: 1e882d4b5fa17b6061dfc6ed90a471cf0c9dd195
+  data.tar.gz: 9247bca77a75642a28bcfb36e606828513464383
 SHA512:
-  metadata.gz: 9aa5682fef78ec085c4609425d1dfa3244db78e45dddb23857d57b3a2e2c5c72c29735b081b6bafe60684763f480e6fc1c024f444e61f4ca8e757c921cdd18a0
-  data.tar.gz: 3ace4e02923f937852c4ac0c07618f280d7b70f99cc5a3e08987210a970779951cc170e5e66ee2ba5802d078cc29a6761225b44d7f7a6fb71dd0a6e156fdb341
+  metadata.gz: 21a027cabad51bd466a5f75b994f96f03b1635d96ac05c46e332574d584096e5131ee0ac3a5cdc45c00ea10aa2da7f80f98ebabecbaa420173a7f53be7659089
+  data.tar.gz: 6b9c6a4cc403f3230725490c6ca32dc495cecf7868059262a59cd797846f7dcacd1b44a0a756986fab4865577a7e9cf883eb7eb8c7fcd06933d3d07f17bb78d7

data/README.md

@@ -46,9 +46,9 @@ Enable open-tracking for the message.
 
 Enable click-tracking for the message.
 
-`set_click_track 'clicks_all'`: enables click tracking on all emails
-`set_click_track 'clicks_htmlonly'`: enables click tracking only on html emails
-`set_click_track 'clicks_textonly'`: enables click tracking only on text emails
+`set_click_track 'all'`: enables click tracking on all emails
+`set_click_track 'htmlonly'`: enables click tracking only on html emails
+`set_click_track 'textonly'`: enables click tracking only on text emails
 
 ### set_auto_text
 

data/lib/mandriller/base.rb

@@ -31,7 +31,7 @@ class Mandriller::Base < ActionMailer::Base
   define_settings_methods STRING_SETTINGS.keys
   define_settings_methods JSON_SETTINGS.keys
   define_settings_methods :open_track, default: true
-  define_settings_methods :click_track, default: 'clicks_all'
+  define_settings_methods :click_track, default: 'all'
   define_settings_methods :send_at
 
   class_attribute :mandrill_template, :mandrill_google_analytics
@@ -56,7 +56,12 @@ class Mandriller::Base < ActionMailer::Base
   end
 
   def mail(*args)
-    tracks = [get_mandrill_setting("open_track") ? 'opens' : nil, get_mandrill_setting("click_track")].compact.map(&:to_s)
+    tracks = []
+    tracks << (get_mandrill_setting("open_track") ? 'opens' : nil)
+    if v = get_mandrill_setting("click_track")
+      tracks << "clicks_#{v}"
+    end
+    tracks = tracks.compact.map(&:to_s)
     unless tracks.empty?
       tracks.each do |track|
         validate_values!(track, %w(opens clicks_all clicks_htmlonly clicks_textonly))

data/lib/mandriller/version.rb

@@ -1,3 +1,3 @@
 module Mandriller
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/mandriller/base_spec.rb

@@ -165,20 +165,20 @@ describe Mandriller::Base do
       it_behaves_like "with header", 'X-MC-Track', 'opens'
     end
     context "set by #set_open_track" do
-      let(:local_settings) { lambda{ set_click_track :clicks } }
-      it_behaves_like "with header", 'X-MC-Track', 'clicks'
+      let(:local_settings) { lambda{ set_click_track :all } }
+      it_behaves_like "with header", 'X-MC-Track', 'clicks_all'
       context "invalid type" do
         let(:local_settings) { lambda{ set_click_track :invalid } }
         it_behaves_like "raise an exception", Mandriller::InvalidHeaderValue
       end
     end
     context "set by ::set_open_track" do
-      let(:global_settings) { lambda{ set_click_track :clicks } }
-      it_behaves_like "with header", 'X-MC-Track', 'clicks'
+      let(:global_settings) { lambda{ set_click_track :all } }
+      it_behaves_like "with header", 'X-MC-Track', 'clicks_all'
     end
     context "set by both ::set_open_track and ::set_click_track" do
-      let(:global_settings) { lambda{ set_open_track; set_click_track :clicks } }
-      it_behaves_like "with header", 'X-MC-Track', 'opens,clicks'
+      let(:global_settings) { lambda{ set_open_track; set_click_track :all } }
+      it_behaves_like "with header", 'X-MC-Track', 'opens,clicks_all'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mandriller
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daisuke Taniwaki