tocsin 0.1.1 → 0.1.2

data/lib/tocsin/config.rb

@@ -1,18 +1,15 @@
 module Tocsin
   class Config
-    attr_accessor :exception_level, :from_address, :logger, :queue, :recipient_groups
+    attr_accessor :mailer, :mailer_method, :exception_level, :from_address, :logger, :queue, :recipient_groups
 
     def initialize
       @exception_level  = StandardError
       @logger           = select_logger
+      @mailer           = select_mailer
+      @mailer_method    = select_mailer_method
       @queue            = :high
     end
 
-    def select_logger
-      rails = defined?(Rails) && Rails.respond_to?(:logger)
-      rails ? Rails.logger : Logger.new($stderr)
-    end
-
     # notify [r1, r2], :of => filters, :by => notifier 
     def notify(recipients, parameters)
       self.recipient_groups ||= []
@@ -25,5 +22,22 @@ module Tocsin
                        :notifier    => notifier}.merge(filters)
       self.recipient_groups.push(group_config)
     end
+
+    private
+
+    def select_logger
+      rails = defined?(Rails) && Rails.respond_to?(:logger)
+      rails ? Rails.logger : Logger.new($stderr)
+    end
+
+    def select_mailer
+      action_mailer = defined?(ActionMailer::Base) && ActionMailer::Base.respond_to?(:mail)
+      action_mailer ? ActionMailer::Base : Mail
+    end
+
+    def select_mailer_method
+      action_mailer = defined?(ActionMailer::Base) && mailer.ancestors.include?(ActionMailer::Base)
+      action_mailer ? :mail : :new
+    end
   end
 end

data/lib/tocsin/notifiers/email_notifier.rb

@@ -4,24 +4,50 @@ module Tocsin
   module Notifiers
     class EmailNotifier
       def self.notify(recipients, alert)
-        _body = "
-Alert raised by Tocsin on your site:
-\n
-Message: #{alert.message}
-Category: #{alert.category}
-Severity: #{alert.severity}
-Exception: #{alert.exception}
-Backtrace: #{alert.backtrace}
-        ";
-
-        from_address = Tocsin.config.from_address || recipients.first
-
-        Mail.deliver do
-          from    from_address
-          to      recipients.join(", ")
-          subject "[Tocsin] [#{alert.severity}] #{alert.message} (#{alert.category})"
-          body    _body
-        end
+        attrs = { :from     => sender(recipients),
+                  :to       => recipients,
+                  :subject  => subject(alert),
+                  :body     => compose(alert) }
+
+        message = mail(attrs)
+        message.deliver
+      end
+
+      private
+
+      def self.mail(attrs)
+        mailer.send mailer_method, attrs
+      end
+
+      def self.config
+        Tocsin.config
+      end
+
+      def self.mailer
+        config.mailer
+      end
+
+      def self.mailer_method
+        config.mailer_method
+      end
+
+      def self.sender(recipients)
+        config.from_address || recipients.first
+      end
+
+      def self.subject(alert)
+        "[Tocsin] [#{alert.severity}] #{alert.message} (#{alert.category})"
+      end
+
+      def self.compose(alert)
+        _body = []
+        _body << "Alert raised by Tocsin on your site:\n"
+        _body << "Message: #{alert.message}"
+        _body << "Category: #{alert.category}"
+        _body << "Severity: #{alert.severity}"
+        _body << "Exception: #{alert.exception}"
+        _body << "Backtrace: #{alert.backtrace}"
+        _body.join("\n")
       end
     end
 

data/lib/tocsin/version.rb

@@ -1,3 +1,3 @@
 module Tocsin
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/tocsin/notifiers/email_notifier_spec.rb

@@ -7,6 +7,65 @@ describe Tocsin::Notifiers::EmailNotifier do
                           :backtrace => 'backtrace')
   }
 
+  context "configurable mailer" do
+
+    let(:action_mailer_class) { ActionMailer::Base }
+    let(:alt_mailer_class)    { Foo }
+    let(:message)             { stub('message') }
+
+    before(:all) do
+      unless defined?(ActionMailer::Base)
+        ACTION_MAILER_LOCALLY_DEFINED = true
+        module ActionMailer
+          class Base
+            def self.mail(*args)
+              Mail.new(*args)
+            end
+          end
+        end
+      end
+
+      class Foo < ActionMailer::Base; end
+    end
+
+    after(:all) do
+      if defined?(ACTION_MAILER_LOCALLY_DEFINED)
+        # reset to default configuration after everything.
+        ActionMailer.send(:remove_const, :Base)
+        Object.send(:remove_const, :ActionMailer)
+        Tocsin.configure {}
+      end
+    end
+
+    it "uses ActionMailer::Base by default when available" do
+      Tocsin.configure {}
+      message.expects(:deliver).returns(true)
+      action_mailer_class.expects(:mail).returns(message)
+      described_class.notify(["a@b.com"], alert)
+    end
+
+    it "uses the specified mailer when configured" do
+      Tocsin.configure do |c|
+        c.mailer = alt_mailer_class
+      end
+
+      message.expects(:deliver).returns(true)
+      alt_mailer_class.expects(:mail).returns(message)
+      described_class.notify(["a@b.com"], alert)
+    end
+
+    it "uses the specified mail_method when configured" do
+      Tocsin.configure do |c|
+        c.mailer = alt_mailer_class
+        c.mailer_method = :some_dumb_method_name
+      end
+
+      message.expects(:deliver).returns(true)
+      alt_mailer_class.expects(:some_dumb_method_name).returns(message)
+      described_class.notify(["a@b.com"], alert)
+    end
+  end
+
   describe "notifying" do
     let(:origin_email) { "test@test.com" }
 

data/spec/tocsin_spec.rb

@@ -221,11 +221,15 @@ describe Tocsin do
     end
 
     context "common communication errors" do
+      let(:mail) { mock('mail') }
+
       before do
         Tocsin.configure do |c|
           c.notify ["a@b.com"], :of => { :severity => /.*/ }
           c.logger = Logger.new('/dev/null')
         end
+
+        Mail.expects(:new).returns(mail)
       end
 
       errors =  [ Timeout::Error,
@@ -237,7 +241,7 @@ describe Tocsin do
       errors.each do |err|
         it "logs #{err.to_s} without exploding" do
           alert_options.merge!(now: true)
-          Mail.expects(:deliver).raises(err)
+          mail.expects(:deliver).raises(err)
           Tocsin.logger.expects(:error)
           expect { alert }.to_not raise_error
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tocsin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec