mandriller 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57d0cef20fb012f1d81d456f5fd1d672ffe29c7
-  data.tar.gz: f648f0400cbf9955bf54ff1a52f33480219e547a
+  metadata.gz: e6471be440ee6fe69a9383bebf2ea69fb6d05ad5
+  data.tar.gz: 88888794cc5c8b1528b1a1e34d9fa81b74c48744
 SHA512:
-  metadata.gz: d1e81dba186fe87e613128cf97b7abc1b020454037b3beefd75fcee4323476fa9bc66803cab7b026c8b00cd0e4002da96ae7e63011a7f169e1a46a203ad2c20a
-  data.tar.gz: a7d2e3e3149847839731f4347bf9d51fe67f48043fa71efe840964632f3d3a2c41735dd0dd83a3681352c1dd8cf02d1754d25a3b1a44269b2f8638d111738aa8
+  metadata.gz: 8884f892a5f9531decc1c96e9eccbecd222cab9a00d2b9df82c8842caf982f1b44595b6afa268c27b95b2221d12efd3eae19e7ae904d280e1e88cb782082fbe4
+  data.tar.gz: a485da59610919903d1ff3b123cde479f22240ca7d79e6e060a9279fc7d0af96811a2ed4ca49d1e16d38c4f96b4366c2f2ea340188e2d2c255f8fa9da448aaca

data/README.md

@@ -40,7 +40,7 @@ class UserMailer < Mandriller::Base
 
   set_open_track
   set_click_track
-  set_google_analytics Settings.root_host, Settings.admin.host
+  set_google_analytics [Settings.root_host, Settings.admin.host].uniq
 
   before_filter do
     set_google_analytics_campaign "#{mailer_name.gsub(/_mailer$/, '')}/#{action_name.gsub(/_email$/, '')}"
@@ -109,7 +109,7 @@ Add dynamic data to replace mergetags that appear in your message content.
 
 Add Google Analytics tracking to links in your email for the specified domains.
 
-- `set_google_analytics 'foo.com', 'bar.com'`
+- `set_google_analytics ['foo.com', 'bar.com'`]
 
 ### set_google_analytics_campaign
 
@@ -204,6 +204,12 @@ Specify a future date/time that the message should be [scheduled](http://help.ma
 
 __Only available for paid accounts__
 
+### set_tags
+
+Add tags to your emails.
+
+- `set_tags ['tag1', 'tag2'`]
+
 ## Contributing
 
 1. Fork it

data/lib/mandriller/base.rb

@@ -27,34 +27,30 @@ class Mandriller::Base < ActionMailer::Base
     metadata:                  'X-MC-Metadata',
     merge_vars:                'X-MC-MergeVars',
   }
+  ARRAY_SETTINGS = {
+    google_analytics:          'X-MC-GoogleAnalytics',
+    tags:                      'X-MC-Tags',
+  }
   define_settings_methods BOOLEAN_SETTINGS.keys, default: true
   define_settings_methods STRING_SETTINGS.keys
   define_settings_methods JSON_SETTINGS.keys
+  define_settings_methods ARRAY_SETTINGS.keys
   define_settings_methods :open_track, default: true
   define_settings_methods :click_track, default: 'all'
   define_settings_methods :send_at
 
-  class_attribute :mandrill_template, :mandrill_google_analytics
+  class_attribute :mandrill_template
 
   class << self
     def set_template(template_name, block_name = nil)
       self.mandrill_template = [template_name, block_name]
     end
-
-    def set_google_analytics(*domains)
-      self.mandrill_google_analytics = domains.flatten
-    end
   end
 
   def set_template(template_name, block_name = nil)
     @mandrill_template = [template_name, block_name].compact
   end
 
-  def set_google_analytics(*domains)
-    domains = domains.flatten.compact
-    @mandrill_google_analytics = domains
-  end
-
   def mail(*args)
     tracks = []
     tracks << (get_mandrill_setting("open_track") ? 'opens' : nil)
@@ -72,9 +68,6 @@ class Mandriller::Base < ActionMailer::Base
     v = get_mandrill_setting("template")
     self.headers['X-MC-Template'] = v.join('|') unless v.nil? || v.empty?
 
-    v = get_mandrill_setting("google_analytics")
-    self.headers['X-MC-GoogleAnalytics'] = v.join(',') unless v.nil? || v.empty?
-
     v = get_mandrill_setting("send_at")
     self.headers['X-MC-SendAt'] = v.to_time.utc.strftime('%Y-%m-%d %H:%M:%S') unless v.nil?
 
@@ -93,6 +86,11 @@ class Mandriller::Base < ActionMailer::Base
       self.headers[header_name] = MultiJson.dump(v) unless v.nil?
     end
 
+    ARRAY_SETTINGS.each do |key, header_name|
+      v = get_mandrill_setting(key)
+      self.headers[header_name] = Array(v).join(',') unless v.nil?
+    end
+
     super(*args)
   end
 

data/lib/mandriller/version.rb

@@ -1,3 +1,3 @@
 module Mandriller
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/mandriller/base_spec.rb

@@ -149,6 +149,38 @@ describe Mandriller::Base do
     end
   end
 
+  ARRAY_SETTINGS = {
+    google_analytics:     'X-MC-GoogleAnalytics',
+    tags:                 'X-MC-Tags',
+  }
+  ARRAY_SETTINGS.each do |key, header|
+    describe "X-MC-GoogleAnalytics header" do
+      context "no set" do
+        it_behaves_like "without header", header
+      end
+      context "set by #set_#{key}" do
+        let(:local_settings) { lambda{ __send__("set_#{key}", ['string1', 'string2']) } }
+        it_behaves_like "with header", header, 'string1,string2'
+      end
+      context "set by ::set_#{key}" do
+        let(:global_settings) { lambda{ __send__("set_#{key}", ['string1', 'string2']) } }
+        it_behaves_like "with header", header, 'string1,string2'
+      end
+      context "set by both #set_#{key} and ::set_#{key}" do
+        context "set value globally and set value locally" do
+          let(:global_settings) { lambda{ __send__("set_#{key}", ['string1', 'string2']) } }
+          let(:local_settings) { lambda{ __send__("set_#{key}", ['string2', 'string3']) } }
+          it_behaves_like "with header", header, 'string2,string3'
+        end
+        context "set value globally but set nil locally" do
+          let(:global_settings) { lambda{ __send__("set_#{key}", ['string1', 'string2']) } }
+          let(:local_settings) { lambda{ __send__("set_#{key}", nil) } }
+          it_behaves_like "without header", header
+        end
+      end
+    end
+  end
+
   describe "X-MC-Track header" do
     header = "X-MC-Track"
     context "no set" do
@@ -210,34 +242,6 @@ describe Mandriller::Base do
     end
   end
 
-  describe "X-MC-GoogleAnalytics header" do
-    key = "google_analytics"
-    header = "X-MC-GoogleAnalytics"
-    context "no set" do
-      it_behaves_like "without header", header
-    end
-    context "set by #set_#{key}" do
-      let(:local_settings) { lambda{ __send__("set_#{key}", 'domain1', 'domain2') } }
-      it_behaves_like "with header", header, 'domain1,domain2'
-    end
-    context "set by ::set_#{key}" do
-      let(:global_settings) { lambda{ __send__("set_#{key}", 'domain1', 'domain2') } }
-      it_behaves_like "with header", header, 'domain1,domain2'
-    end
-    context "set by both #set_#{key} and ::set_#{key}" do
-      context "set value globally and set value locally" do
-        let(:global_settings) { lambda{ __send__("set_#{key}", 'domain1', 'domain2') } }
-        let(:local_settings) { lambda{ __send__("set_#{key}", 'domain2', 'domain3') } }
-        it_behaves_like "with header", header, 'domain2,domain3'
-      end
-      context "set value globally but set nil locally" do
-        let(:global_settings) { lambda{ __send__("set_#{key}", 'domain1', 'domain2') } }
-        let(:local_settings) { lambda{ __send__("set_#{key}", nil) } }
-        it_behaves_like "without header", header
-      end
-    end
-  end
-
   describe "X-MC-SendAt header" do
     key = 'send_at'
     header = "X-MC-SendAt"

metadata

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