mandriller 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6471be440ee6fe69a9383bebf2ea69fb6d05ad5
-  data.tar.gz: 88888794cc5c8b1528b1a1e34d9fa81b74c48744
+  metadata.gz: f6f8a21fe30516b7591eac904689150c3231f3a3
+  data.tar.gz: 5e70cb7b74773ff237770cde06c4f8afec9db816
 SHA512:
-  metadata.gz: 8884f892a5f9531decc1c96e9eccbecd222cab9a00d2b9df82c8842caf982f1b44595b6afa268c27b95b2221d12efd3eae19e7ae904d280e1e88cb782082fbe4
-  data.tar.gz: a485da59610919903d1ff3b123cde479f22240ca7d79e6e060a9279fc7d0af96811a2ed4ca49d1e16d38c4f96b4366c2f2ea340188e2d2c255f8fa9da448aaca
+  metadata.gz: 0167c5e60881e6427b01508055339a3ccfc4b7dd05c7031735d7132b9e5a1042093c048bdf70f0e8c49f36365f651804be506ef8fa98a215661b31d0a27de557
+  data.tar.gz: b6eda0ad6ca15ef2b287b14d0234ed3056e78f9584a69e166d426c7b008c5ff042dee068c0bd8d974246e626d5fc7f44dba6b97225366d2e7486be0c83658fbe

data/lib/mandriller/base.rb

@@ -31,13 +31,16 @@ class Mandriller::Base < ActionMailer::Base
     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
+  DATETIME_SETTINGS = {
+    send_at:                   'X-MC-SendAt',
+  }
+  define_settings_methods BOOLEAN_SETTINGS.keys, default: true, getter: lambda { |v| v ? 'true' : 'false' }
+  define_settings_methods STRING_SETTINGS.keys, getter: lambda { |v| v.to_s }
+  define_settings_methods JSON_SETTINGS.keys, getter: lambda { |v| MultiJson.dump(v) }
+  define_settings_methods ARRAY_SETTINGS.keys, getter: lambda { |v| Array(v).join(',') }
+  define_settings_methods DATETIME_SETTINGS.keys, getter: lambda { |v| v.to_time.utc.strftime('%Y-%m-%d %H:%M:%S') }
   define_settings_methods :open_track, default: true
   define_settings_methods :click_track, default: 'all'
-  define_settings_methods :send_at
 
   class_attribute :mandrill_template
 
@@ -53,8 +56,8 @@ class Mandriller::Base < ActionMailer::Base
 
   def mail(*args)
     tracks = []
-    tracks << (get_mandrill_setting("open_track") ? 'opens' : nil)
-    if v = get_mandrill_setting("click_track")
+    tracks << (mandrill_open_track ? 'opens' : nil)
+    if v = mandrill_click_track
       tracks << "clicks_#{v}"
     end
     tracks = tracks.compact.map(&:to_s)
@@ -65,30 +68,13 @@ class Mandriller::Base < ActionMailer::Base
       self.headers['X-MC-Track'] = tracks.join(',')
     end
 
-    v = get_mandrill_setting("template")
+    v = mandrill_template
     self.headers['X-MC-Template'] = 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?
-
-    BOOLEAN_SETTINGS.each do |key, header_name|
-      v = get_mandrill_setting(key)
-      self.headers[header_name] = v ? 'true' : 'false' unless v.nil?
-    end
-
-    STRING_SETTINGS.each do |key, header_name|
-      v = get_mandrill_setting(key)
-      self.headers[header_name] = v.to_s unless v.nil?
-    end
-
-    JSON_SETTINGS.each do |key, header_name|
-      v = get_mandrill_setting(key)
-      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?
+    [BOOLEAN_SETTINGS, STRING_SETTINGS, JSON_SETTINGS, ARRAY_SETTINGS, DATETIME_SETTINGS].inject({}, :merge).each do |key, header_name|
+      if is_mandrill_setting_defined?(key)
+        self.headers[header_name] = get_mandrill_setting(key)
+      end
     end
 
     super(*args)

data/lib/mandriller/settings_methods.rb

@@ -7,30 +7,59 @@ module Mandriller
     module ClassMethods
       def define_settings_methods(*keys)
         options = keys[-1].is_a?(Hash) ? keys.pop : {}
+
+        keys.flatten.each do |key|
+          class_attribute "mandrill_#{key}"
+
+          define_mandrill_setter(key, options)
+          define_mandrill_getter(key, options)
+        end
+      end
+
+      private
+
+      def define_mandrill_setter(key, options = {})
         if default = options[:default]
           arg_s = "v = #{default.inspect}"
         else
           arg_s = "v"
         end
 
-        keys.flatten.each do |key|
-          class_eval <<-EOS
-          class_attribute :mandrill_#{key}
-          def self.set_#{key}(#{arg_s})
+        method_name = "set_mandrill_setting_#{key}"
+        [self, singleton_class].each do |base|
+          base.class_eval <<-EOS
+          def #{method_name}(#{arg_s})
             self.mandrill_#{key} = v
           end
-          private_class_method :set_#{key}
-          def set_#{key}(#{arg_s})
-            @mandrill_#{key} = v
-          end
-          private :set_#{key}
+          private :#{method_name}
+          alias_method :set_#{key}, :#{method_name}
           EOS
         end
       end
+
+      def define_mandrill_getter(key, options = {})
+        getter = options[:getter]
+
+        method_name = "get_mandrill_setting_#{key}"
+        define_method method_name do
+          v = __send__("mandrill_#{key}")
+          if getter
+            getter.call(v)
+          else
+            v
+          end
+        end
+        private method_name
+      end
+    end
+
+    def is_mandrill_setting_defined?(key)
+      !__send__("mandrill_#{key}").nil?
     end
+    private :is_mandrill_setting_defined?
 
     def get_mandrill_setting(key)
-      instance_variable_defined?("@mandrill_#{key}") ? instance_variable_get("@mandrill_#{key}") : __send__("mandrill_#{key}")
+      __send__ "get_mandrill_setting_#{key}"
     end
     private :get_mandrill_setting
   end

data/lib/mandriller/version.rb

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

data/spec/mandriller/base_spec.rb

@@ -154,7 +154,7 @@ describe Mandriller::Base do
     tags:                 'X-MC-Tags',
   }
   ARRAY_SETTINGS.each do |key, header|
-    describe "X-MC-GoogleAnalytics header" do
+    describe "#{header} header" do
       context "no set" do
         it_behaves_like "without header", header
       end
@@ -181,6 +181,37 @@ describe Mandriller::Base do
     end
   end
 
+  DATETIME_SETTINGS = {
+    send_at:       'X-MC-SendAt',
+  }
+  DATETIME_SETTINGS.each do |key, header|
+    describe "#{header} 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}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
+        it_behaves_like "with header", header, '2001-01-02 03:04:05'
+      end
+      context "set by ::set_#{key}" do
+        let(:global_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
+        it_behaves_like "with header", header, '2001-01-02 03:04:05'
+      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}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
+          let(:local_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 6)) } }
+          it_behaves_like "with header", header, '2001-01-02 03:04:06'
+        end
+        context "set value globally but set nil locally" do
+          let(:global_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
+          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
@@ -241,32 +272,4 @@ describe Mandriller::Base do
       end
     end
   end
-
-  describe "X-MC-SendAt header" do
-    key = 'send_at'
-    header = "X-MC-SendAt"
-    context "no set" do
-      it_behaves_like "without header", header
-    end
-    context "set by #set_#{key}" do
-      let(:local_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
-      it_behaves_like "with header", header, '2001-01-02 03:04:05'
-    end
-    context "set by ::set_#{key}" do
-      let(:global_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
-      it_behaves_like "with header", header, '2001-01-02 03:04:05'
-    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}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
-        let(:local_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 6)) } }
-        it_behaves_like "with header", header, '2001-01-02 03:04:06'
-      end
-      context "set value globally but set nil locally" do
-        let(:global_settings) { lambda{ __send__("set_#{key}", DateTime.new(2001, 1, 2, 3, 4, 5)) } }
-        let(:local_settings) { lambda{ __send__("set_#{key}", nil) } }
-        it_behaves_like "without header", header
-      end
-    end
-  end
 end

data/spec/mandriller/settings_methods_spec.rb

@@ -13,58 +13,90 @@ describe Mandriller::SettingsMethods do
     klass
   end
 
-  it "defines the methods" do
-    expect(subject.private_methods).to include(:set_foo)
-    expect(subject).to respond_to(:mandrill_foo)
-    expect(subject.private_instance_methods).to include(:set_foo)
+  describe "::define_settings_methods" do
+    it "defines the methods" do
+      expect(subject.private_methods).to include(:set_mandrill_setting_foo)
+      expect(subject.private_methods).to include(:set_foo)
+      expect(subject).to respond_to(:mandrill_foo)
+      expect(subject.private_instance_methods).to include(:set_mandrill_setting_foo)
+      expect(subject.private_instance_methods).to include(:set_foo)
+      expect(subject.private_instance_methods).to include(:get_mandrill_setting_foo)
 
-    instance = subject.new
-    expect(instance.instance_variable_defined?("@mandrill_foo")).to eq(false)
-  end
-  it "sets the instance variable" do
-    instance = subject.new
-    instance.send :set_foo, 'foo'
-    expect(instance.instance_variable_get("@mandrill_foo")).to eq('foo')
-  end
-  it "sets the class attribute" do
-    subject.send :set_foo, 'foo'
-    expect(subject.mandrill_foo).to eq('foo')
-  end
+      instance = subject.new
+      expect(instance.instance_variable_defined?("@mandrill_foo")).to eq(false)
+    end
 
-  context "with default option" do
-    subject do
-      klass.class_eval do
-        define_settings_methods :foo, default: 'bar'
-      end
-      klass
+    it "sets the instance variable" do
+      instance = subject.new
+      instance.send :set_mandrill_setting_foo, 'foo'
+      expect(instance.instance_variable_get("@mandrill_foo")).to eq('foo')
+    end
+    it "sets the class attribute" do
+      subject.send :set_mandrill_setting_foo, 'foo'
+      expect(subject.mandrill_foo).to eq('foo')
     end
-    it "sets the instance variable with default value" do
+    it "gets the value as is" do
       instance = subject.new
-      instance.send :set_foo
-      expect(instance.instance_variable_get("@mandrill_foo")).to eq('bar')
+      instance.send :set_mandrill_setting_foo, 'foo'
+      expect(instance.send(:get_mandrill_setting_foo)).to eq('foo')
+    end
+
+    context "with default option" do
+      subject do
+        klass.class_eval do
+          define_settings_methods :foo, default: 'bar'
+        end
+        klass
+      end
+      it "sets the instance variable with default value" do
+        instance = subject.new
+        instance.send :set_mandrill_setting_foo
+        expect(instance.instance_variable_get("@mandrill_foo")).to eq('bar')
+      end
+      it "sets the class attribute with default value" do
+        subject.send :set_mandrill_setting_foo
+        expect(subject.mandrill_foo).to eq('bar')
+      end
     end
-    it "sets the class attribute with default value" do
-      subject.send :set_foo
-      expect(subject.mandrill_foo).to eq('bar')
+
+    context "with getter option" do
+      subject do
+        klass.class_eval do
+          define_settings_methods :foo, getter: lambda { |v| v.to_sym }
+        end
+        klass
+      end
+      it "gets the value as is" do
+        instance = subject.new
+        instance.send :set_mandrill_setting_foo, 'foo'
+        expect(instance.send(:get_mandrill_setting_foo)).to eq(:foo)
+      end
     end
   end
 
-  describe "#get_mandrill_setting" do
-    it "returns class_attribute" do
-      subject.send :set_foo, 1
+  describe "#is_mandrill_setting_defined?" do
+    it "returns true for the value set globally" do
+      subject.send :set_mandrill_setting_foo, 1
       instance = subject.new
-      expect(instance.send(:get_mandrill_setting, :foo)).to eq(1)
+      expect(instance.send(:is_mandrill_setting_defined?, :foo)).to eq(true)
     end
-    it "returns instance_variable" do
+    it "returns true for the value set localy" do
       instance = subject.new
-      instance.send :set_foo, 2
-      expect(instance.send(:get_mandrill_setting, :foo)).to eq(2)
+      instance.send :set_mandrill_setting_foo, 2
+      expect(instance.send(:is_mandrill_setting_defined?, :foo)).to eq(true)
     end
-    it "returns instance_variable over class_attribute" do
-      subject.send :set_foo, 1
+    it "returns false for non set value" do
+      instance = subject.new
+      expect(instance.send(:is_mandrill_setting_defined?, :foo)).to eq(false)
+    end
+  end
+
+  describe "#get_mandrill_setting" do
+    it "delegates to the setting method" do
       instance = subject.new
-      instance.send :set_foo, 2
-      expect(instance.send(:get_mandrill_setting, :foo)).to eq(2)
+      ret = double
+      expect(instance).to receive(:get_mandrill_setting_foo).and_return(ret)
+      expect(instance.send(:get_mandrill_setting, :foo)).to eq(ret)
     end
   end
 end

metadata

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