mailthis 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 608767c6e27a04598a5587e1780bd19eebf3c4ef
+  data.tar.gz: 662844c65e2222e5511d10da12c178b78602c9cc
+SHA512:
+  metadata.gz: 8bf6873b478690277c6e3cf6fc37ae1d3e9259211be70f7a3dc0b4acabde8ec1ef5193da24240c3720afd66015962bd20449e31bb238ab980834332e5f3f8b94
+  data.tar.gz: f0c55b73b2ecbde6ed842d8d86caa2c410dfe58392a086b9e2cf781b6e32848c0dd4d4f85b8ec3cf1963fb92d72faeb0d1dfdda774898d98ef66c08b96178e3f

data/Gemfile

@@ -2,5 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
-gem 'pry'
+gem 'rake', "~> 10.4.0"
+gem 'pry', "~> 0.9.0"
+
+# mail dependencies that are 1.8.7 compatible
+gem 'mime-types', "=1.25.1"

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009-Present Kelly Redding
+Copyright (c) 2009-Present Kelly Redding and Collin Redding
 
 MIT License
 

data/README.md

@@ -43,7 +43,7 @@ GMAIL = Mailthis.mailer do
   logger    Logger.new("log/email.log") # (optional) default: no logger, no logging
 end
 
-msg = Mail.new
+msg = Mailthis::Message.new
 msg.from     = 'bob@example.com',       # (optional) default: mailer #from
 msg.reply_to = 'bob@me.com',            # (optional) default: self #from
 msg.to       = "you@example.com",
@@ -55,6 +55,19 @@ msg.body     = "a message body"
 GMAIL.deliver(msg)
 ```
 
+### Disable sending mail
+
+You can disable actually sending mail (in tests, non-production envs, etc) by setting the `MAILTHIS_DISABLE_SEND` environment variable.  For example:
+
+```ruby
+if !production?
+  # disable actually delivering emails when not in production
+  ENV['MAILTHIS_DISABLE_SEND'] = 'y'
+end
+```
+
+Just set the env var to *any* not-nil value and mailthis will not send any mail.  It will do everything else, however, including logging the mail it would have sent.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/mailthis/mailer.rb

@@ -1,41 +1,60 @@
 require 'ns-options/proxy'
-require 'mail'
 require 'mailthis/exceptions'
+require 'mailthis/message'
 require 'mailthis/outgoing_email'
 
 module Mailthis
 
-  class Mailer
-    include NsOptions::Proxy
-
-    option :smtp_helo,   String,  :required => true
-    option :smtp_server, String,  :required => true
-    option :smtp_port,   Integer, :required => true
-    option :smtp_user,   String,  :required => true
-    option :smtp_pw,     String,  :required => true
-    option :smtp_auth,   String,  :required => true, :default => proc{ "login" }
-
-    option :from, String, :required => true
-    option :logger,       :required => true, :default => proc{ NullLogger.new }
-
-    def initialize(values=nil, &block)
-      # this is defaulted here because we want to use the Configuration instance
-      # `smtp_user`. If we define a proc above, we will be using the Configuration
-      # class `smtp_user`, which will not update the option as expected.
-      super((values || {}).merge(:from => proc{ self.smtp_user }))
-      self.define(&block)
+  module Mailer
+
+    def self.new(*args, &block)
+      if !ENV['MAILTHIS_TEST_MODE']
+        MailthisMailer.new(*args, &block)
+      else
+        TestMailer.new(*args, &block)
+      end
     end
 
-    def validate!
-      raise(MailerError, "missing required settings") if !valid?
-      self # for chaining
+    def self.included(klass)
+      klass.class_eval do
+        include NsOptions::Proxy
+        include InstanceMethods
+
+        option :smtp_helo,   String,  :required => true
+        option :smtp_server, String,  :required => true
+        option :smtp_port,   Integer, :required => true
+        option :smtp_user,   String,  :required => true
+        option :smtp_pw,     String,  :required => true
+        option :smtp_auth,   String,  :required => true, :default => proc{ "login" }
+
+        option :from,   String, :required => true
+        option :logger,         :required => true, :default => proc{ NullLogger.new }
+
+      end
     end
 
-    def deliver(message = nil, &block)
-      (message || ::Mail.new).tap do |msg|
-        msg.instance_eval(&block) if block
-        OutgoingEmail.new(self, msg).deliver
+    module InstanceMethods
+
+      def initialize(values = nil, &block)
+        # this is defaulted here because we want to use the Configuration instance
+        # `smtp_user`. If we define a proc above, we will be using the Configuration
+        # class `smtp_user`, which will not update the option as expected.
+        super((values || {}).merge(:from => proc{ self.smtp_user }))
+        self.define(&block)
       end
+
+      def validate!
+        raise(MailerError, "missing required settings") if !valid?
+        self # for chaining
+      end
+
+      def deliver(message = nil, &block)
+        (message || ::Mailthis::Message.new).tap do |msg|
+          msg.instance_eval(&block) if block
+          OutgoingEmail.new(self, msg).deliver
+        end
+      end
+
     end
 
     class NullLogger
@@ -47,4 +66,31 @@ module Mailthis
 
   end
 
+  class MailthisMailer
+    include Mailer
+
+  end
+
+  class TestMailer
+    include Mailer
+
+    attr_reader :delivered_messages
+
+    def initialize(*args, &block)
+      super
+      @delivered_messages = []
+    end
+
+    def deliver(*args, &block)
+      super(*args, &block).tap do |msg|
+        @delivered_messages << msg
+      end
+    end
+
+    def reset
+      self.delivered_messages.clear
+    end
+
+  end
+
 end

data/lib/mailthis/message.rb

@@ -0,0 +1,33 @@
+require 'mail'
+
+module Mailthis
+
+  class Message
+
+    def initialize
+      @mail = ::Mail.new
+    end
+
+    def from(*args);     @mail.from(*args);     end
+    def reply_to(*args); @mail.reply_to(*args); end
+    def to(*args);       @mail.to(*args);       end
+    def cc(*args);       @mail.cc(*args);       end
+    def bcc(*args);      @mail.bcc(*args);      end
+    def subject(*args);  @mail.subject(*args);  end
+    def body(*args);     @mail.body(*args);     end
+
+    def from=(value);     @mail.from     = value; end
+    def reply_to=(value); @mail.reply_to = value; end
+    def to=(value);       @mail.to       = value; end
+    def cc=(value);       @mail.cc       = value; end
+    def bcc=(value);      @mail.bcc      = value; end
+    def subject=(value);  @mail.subject  = value; end
+    def body=(value);     @mail.body     = value; end
+
+    def to_s
+      @mail.to_s
+    end
+
+  end
+
+end

data/lib/mailthis/outgoing_email.rb

@@ -1,5 +1,5 @@
-require 'mail'
 require 'mailthis/exceptions'
+require 'mailthis/message'
 require 'mailthis/net_smtp_tls'
 
 module Mailthis
@@ -16,23 +16,21 @@ module Mailthis
     attr_reader :mailer, :message
 
     def initialize(mailer, message)
+      raise Mailthis::MessageError, "invalid message" if !valid_message?(message)
+
       @mailer, @message = mailer, message
-      @message.from     ||= @mailer.from  if @message.respond_to?(:from=)
-      @message.reply_to ||= @message.from if @message.respond_to?(:reply_to=)
+      @message.from     ||= @mailer.from
+      @message.reply_to ||= @message.from
     end
 
     def validate!
-      if !valid_message?
-        raise Mailthis::MessageError, "invalid message"
-      end
-
       REQUIRED_FIELDS.each do |field|
-        if @message.send(field).nil?
+        if !field_present?(@message, field)
           raise Mailthis::MessageError, "missing `#{field}` field"
         end
       end
 
-      if !address_exists?
+      if !fields_present?(@message, ADDRESS_FIELDS)
         raise Mailthis::MessageError, "no #{ADDRESS_FIELDS.join('/')} specified"
       end
     end
@@ -42,21 +40,22 @@ module Mailthis
       @mailer.validate!
       deliver_smtp if ENV['MAILTHIS_DISABLE_SEND'].nil?
 
-      log_message # and return it
+      log_message(@message)
+      @message
     end
 
     private
 
-    def valid_message?
-      (REQUIRED_FIELDS + ADDRESS_FIELDS + [:to_s]).inject(true) do |invalid, meth|
-        invalid && @message.respond_to?(meth)
-      end
+    def valid_message?(message)
+      message.kind_of?(Mailthis::Message)
     end
 
-    def address_exists?
-      ADDRESS_FIELDS.inject(false) do |exists, field|
-        exists || (!@message.send(field).nil? && !@message.send(field).empty?)
-      end
+    def fields_present?(message, fields)
+      fields.inject(false){ |present, f| present || field_present?(message, f) }
+    end
+
+    def field_present?(message, field)
+      !message.send(field).nil? && !message.send(field).empty?
     end
 
     def deliver_smtp
@@ -78,15 +77,16 @@ module Mailthis
       end
     end
 
-    def log_message
-      @message.tap do |msg|
-        log "Sent '#{msg.subject}' to #{msg.to ? msg.to.join(', ') : "''"}"
+    def log_message(msg)
+      log "Sent '#{msg.subject}' to #{msg.to ? msg.to.join(', ') : "''"}"
+      log debug_log_entry(msg), :debug
+    end
 
-        log "\n"\
-            "==============================================================\n"\
-            "#{msg}\n"\
-            "==============================================================\n", :debug
-      end
+    def debug_log_entry(msg)
+      "\n"\
+      "==============================================================\n"\
+      "#{msg}\n"\
+      "==============================================================\n"
     end
 
     def log(msg, level = nil)

data/lib/mailthis/version.rb

@@ -1,3 +1,3 @@
 module Mailthis
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/mailthis.rb

@@ -1,5 +1,6 @@
 require 'mailthis/version'
 require 'mailthis/exceptions'
+require 'mailthis/message'
 require 'mailthis/mailer'
 
 module Mailthis

data/mailthis.gemspec

@@ -6,11 +6,11 @@ require "mailthis/version"
 Gem::Specification.new do |gem|
   gem.name        = "mailthis"
   gem.version     = Mailthis::VERSION
-  gem.authors     = ["Kelly Redding"]
-  gem.email       = ["kelly@kellyredding.com"]
-  gem.description = %q{a simple mailer for ruby}
-  gem.summary     = %q{a simple mailer for ruby}
-  gem.homepage    = "http://github.com/kellyredding/mailthis"
+  gem.authors     = ["Kelly Redding", "Collin Redding"]
+  gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
+  gem.description = %q{mailer for ruby}
+  gem.summary     = %q{mailer for ruby}
+  gem.homepage    = "http://github.com/redding/mailthis"
   gem.license     = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.0"])
+  gem.add_development_dependency("assert", ["~> 2.14"])
 
   gem.add_dependency("ns-options", ["~> 1.1", ">= 1.1.4"])
   gem.add_dependency("mail",       ["~> 2.5"])

data/test/helper.rb

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 
 # require pry for debugging (`binding.pry`)
 require 'pry'
+require 'test/support/factory'
 
 # disable actually delivering emails for testing purposes
-ENV['MAILTHIS_DISABLE_SEND'] = 'yes'
+ENV['MAILTHIS_DISABLE_SEND'] = 'y'

data/test/support/factory.rb

@@ -1,4 +1,7 @@
+require 'assert/factory'
+
 module Factory
+  extend Assert::Factory
 
   def self.mailer
     require 'mailthis/mailer'
@@ -14,13 +17,13 @@ module Factory
   end
 
   def self.message(settings = nil)
-    require 'mail'
-    message = Mail.new do
-      to      'you@example.com'
-      subject 'a message'
-    end
+    require 'mailthis/message'
+    message = Mailthis::Message.new
+    message.to      'you@example.com'
+    message.subject 'a message'
+
     (settings || {}).inject(message) do |msg, (setting, value)|
-      msg[setting] = value
+      msg.send("#{setting}=", value)
       msg
     end
   end

data/test/unit/mailer_tests.rb

@@ -1,15 +1,44 @@
 require 'assert'
 require 'mailthis/mailer'
 
-require 'test/support/factory'
 require 'mailthis/exceptions'
+require 'mailthis/message'
 
-class Mailthis::Mailer
+module Mailthis::Mailer
 
   class UnitTests < Assert::Context
     desc "Mailthis::Mailer"
     setup do
-      @mailer = Mailthis::Mailer.new
+      @current_test_mode = ENV['MAILTHIS_TEST_MODE']
+      ENV['MAILTHIS_TEST_MODE'] = 'yes'
+    end
+    teardown do
+      ENV['MAILTHIS_TEST_MODE'] = @current_test_mode
+    end
+    subject{ Mailthis::Mailer }
+
+    should have_imeths :new
+
+    should "return a mailthis mailer using `new`" do
+      ENV.delete('MAILTHIS_TEST_MODE')
+      mailer = subject.new
+      assert_instance_of Mailthis::MailthisMailer, mailer
+    end
+
+    should "return a test mailer using `new` in test mode" do
+      mailer = subject.new
+      assert_instance_of Mailthis::TestMailer, mailer
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @mailer_class = Class.new do
+        include Mailthis::Mailer
+      end
+      @mailer = @mailer_class.new
     end
     subject{ @mailer }
 
@@ -19,11 +48,11 @@ class Mailthis::Mailer
     should have_imeths :validate!, :deliver
 
     should "know its smtp settings" do
-      { :smtp_helo   => 'example.com',
-        :smtp_server => 'smtp.example.com',
-        :smtp_port   => 25,
-        :smtp_user   => 'test@example.com',
-        :smtp_pw     => 'secret'
+      { :smtp_helo   => Factory.string,
+        :smtp_server => Factory.string,
+        :smtp_port   => Factory.integer,
+        :smtp_user   => Factory.email,
+        :smtp_pw     => Factory.string
       }.each do |setting, val|
         assert_nil subject.send(setting)
 
@@ -39,7 +68,7 @@ class Mailthis::Mailer
       assert_equal 'plain', subject.smtp_auth
     end
 
-    should "use smtp_user as the from by default" do
+    should "use the smtp user as the from by default" do
       assert_nil subject.from
 
       subject.smtp_user 'user'
@@ -51,21 +80,65 @@ class Mailthis::Mailer
       assert_equal 'a-user', subject.from
     end
 
-    should "know its logger" do
+    should "use a null logger by default" do
       assert_kind_of Mailthis::Mailer::NullLogger, subject.logger
     end
 
   end
 
+  class SendMailTests < InitTests
+    desc "and sending mail"
+    setup do
+      @message = Factory.message(:from => "me@example.com")
+      @mailer  = Factory.mailer
+      @mailer.logger = Factory.logger(@out = "")
+
+      @sent_msg = @mailer.deliver(@message)
+    end
+
+    should "return the message that was sent" do
+      assert_same @message, @sent_msg
+    end
+
+    should "log that the message was sent" do
+      assert_not_empty @out
+    end
+
+    should "build the message from the given block" do
+      built_msg = @mailer.deliver do
+        from    'me@example.com'
+        to      'you@example.com'
+        subject 'a message'
+      end
+
+      assert_kind_of Mailthis::Message, built_msg
+      assert_equal ['me@example.com'], built_msg.from
+      assert_equal ['you@example.com'], built_msg.to
+      assert_equal 'a message', built_msg.subject
+    end
+
+    should "task a message and apply the given block" do
+      built_msg = @mailer.deliver(Factory.message) do
+        from 'me@example.com'
+      end
+
+      assert_kind_of Mailthis::Message, built_msg
+      assert_equal ['me@example.com'], built_msg.from
+      assert_equal ['you@example.com'], built_msg.to
+      assert_equal 'a message', built_msg.subject
+    end
+
+  end
+
   class ValidationTests < UnitTests
     desc "when validating"
     setup do
       @invalid = Mailthis::Mailer.new do
-        smtp_helo   "example.com"
-        smtp_server "smtp.example.com"
-        smtp_port   25
-        smtp_user   "test@example.com"
-        smtp_pw     "secret"
+        smtp_helo   Factory.string
+        smtp_server Factory.string
+        smtp_port   Factory.integer
+        smtp_user   Factory.email
+        smtp_pw     Factory.string
         smtp_auth   :plain
       end
     end
@@ -135,46 +208,60 @@ class Mailthis::Mailer
 
   end
 
-  class SendMailTests < UnitTests
-    desc "when sending mail"
+  class MailthisMailerTests < UnitTests
+    desc "MailthisMailer"
     setup do
-      @message = Factory.message(:from => "me@example.com")
-      @mailer  = Factory.mailer
-      @mailer.logger = Factory.logger(@out = "")
+      @mailer_class = Mailthis::MailthisMailer
+    end
+    subject{ @mailer_class }
 
-      @sent_msg = @mailer.deliver(@message)
+    should "include the Mailer mixin" do
+      assert_includes Mailthis::Mailer, subject
     end
 
-    should "return the message that was sent" do
-      assert_same @message, @sent_msg
+  end
+
+  class TestMailerTests < UnitTests
+    desc "TestMailer"
+    setup do
+      @mailer_class = Mailthis::TestMailer
     end
+    subject{ @mailer_class }
 
-    should "log that the message was sent" do
-      assert_not_empty @out
+    should "include the Mailer mixin" do
+      assert_includes Mailthis::Mailer, subject
     end
 
-    should "build the message from the given block" do
-      built_msg = @mailer.deliver do
-        from    'me@example.com'
-        to      'you@example.com'
-        subject 'a message'
-      end
+  end
 
-      assert_kind_of ::Mail::Message, built_msg
-      assert_equal ['me@example.com'], built_msg.from
-      assert_equal ['you@example.com'], built_msg.to
-      assert_equal 'a message', built_msg.subject
+  class TestMailerInitTests < TestMailerTests
+    desc "when init"
+    setup do
+      @message = Factory.message
+      @mailer  = Factory.mailer # b/c in test mode, this is a test mailer
     end
+    subject{ @mailer }
 
-    should "task a message and apply the given block" do
-      built_msg = @mailer.deliver(Factory.message) do
-        from 'me@example.com'
-      end
+    should have_readers :delivered_messages
+    should have_imeths :reset
 
-      assert_kind_of ::Mail::Message, built_msg
-      assert_equal ['me@example.com'], built_msg.from
-      assert_equal ['you@example.com'], built_msg.to
-      assert_equal 'a message', built_msg.subject
+    should "not have any delivered messages by default" do
+      assert_empty subject.delivered_messages
+    end
+
+    should "add messages to its delivered messages when delivering them" do
+      subject.deliver(@message)
+
+      assert_equal 1, subject.delivered_messages.size
+      assert_same @message, subject.delivered_messages.last
+    end
+
+    should "clear its delivered messages on reset" do
+      subject.deliver(@message)
+      assert_equal 1, subject.delivered_messages.size
+
+      subject.reset
+      assert_empty subject.delivered_messages
     end
 
   end

data/test/unit/mailthis_tests.rb

@@ -10,25 +10,33 @@ module Mailthis
     desc "Mailthis"
     subject{ Mailthis }
 
-    should have_imeth :mailer
+    should have_imeths :mailer
 
     should "build a mailer with given args" do
+      helo   = Factory.string
+      server = Factory.string
+      port   = Factory.integer
+      user   = Factory.email
+      pw     = Factory.string
+      auth   = [:plain, :login].choice
+
       mailer = Mailthis.mailer do
-        smtp_helo   "example.com"
-        smtp_server "smtp.example.com"
-        smtp_port   25
-        smtp_user   "test@example.com"
-        smtp_pw     "secret"
-        smtp_auth   :plain
+        smtp_helo   helo
+        smtp_server server
+        smtp_port   port
+        smtp_user   user
+        smtp_pw     pw
+        smtp_auth   auth
       end
 
       assert_kind_of Mailer, mailer
-      assert_equal "example.com", mailer.smtp_helo
-      assert_equal "smtp.example.com", mailer.smtp_server
-      assert_equal 25, mailer.smtp_port
-      assert_equal "test@example.com", mailer.smtp_user
-      assert_equal "secret", mailer.smtp_pw
-      assert_equal 'plain', mailer.smtp_auth
+
+      assert_equal helo,      mailer.smtp_helo
+      assert_equal server,    mailer.smtp_server
+      assert_equal port,      mailer.smtp_port
+      assert_equal user,      mailer.smtp_user
+      assert_equal pw,        mailer.smtp_pw
+      assert_equal auth.to_s, mailer.smtp_auth
     end
 
     should "complain if building a mailer with missing settings" do

data/test/unit/message_tests.rb

@@ -0,0 +1,82 @@
+require 'assert'
+require 'mailthis/message'
+
+require 'mail'
+
+class Mailthis::Message
+
+  class UnitTests < Assert::Context
+    desc "Mailthis::Message"
+    setup do
+      @from     = Factory.email
+      @reply_to = Factory.email
+      @to       = Factory.email
+      @cc       = Factory.email
+      @bcc      = Factory.email
+      @subject  = Factory.string
+      @body     = Factory.text
+
+      @mail = ::Mail.new
+      Assert.stub(::Mail, :new){ @mail }
+
+      @message = Mailthis::Message.new
+    end
+    subject{ @message }
+
+    should have_imeths :from, :reply_to, :to, :cc, :bcc, :subject, :body
+    should have_imeths :from=, :reply_to=, :to=, :cc=, :bcc=, :subject=, :body=
+    should have_imeths :to_s
+
+    should "use Mail's default attrs" do
+      assert_equal @mail.from,      subject.from
+      assert_equal @mail.reply_to,  subject.reply_to
+      assert_equal @mail.to,        subject.to
+      assert_equal @mail.cc,        subject.cc
+      assert_equal @mail.bcc,       subject.bcc
+      assert_equal @mail.subject,   subject.subject
+      assert_equal @mail.body.to_s, subject.body.to_s
+    end
+
+    should "write attrs with traditional writers" do
+      subject.from     = @from
+      subject.reply_to = @reply_to
+      subject.to       = @to
+      subject.cc       = @cc
+      subject.bcc      = @bcc
+      subject.subject  = @subject
+      subject.body     = @body
+
+      assert_equal [@from],     subject.from
+      assert_equal [@reply_to], subject.reply_to
+      assert_equal [@to],       subject.to
+      assert_equal [@cc],       subject.cc
+      assert_equal [@bcc],      subject.bcc
+      assert_equal @subject,    subject.subject
+      assert_equal @body,       subject.body.to_s
+    end
+
+    should "write attrs using DSL methods" do
+      subject.from     @from
+      subject.reply_to @reply_to
+      subject.to       @to
+      subject.cc       @cc
+      subject.bcc      @bcc
+      subject.subject  @subject
+      subject.body     @body
+
+      assert_equal [@from],     subject.from
+      assert_equal [@reply_to], subject.reply_to
+      assert_equal [@to],       subject.to
+      assert_equal [@cc],       subject.cc
+      assert_equal [@bcc],      subject.bcc
+      assert_equal @subject,    subject.subject
+      assert_equal @body,       subject.body.to_s
+    end
+
+    should "know its string representation" do
+      assert_equal @mail.to_s, subject.to_s
+    end
+
+  end
+
+end

data/test/unit/outgoing_email_tests.rb

@@ -1,7 +1,6 @@
 require 'assert'
 require 'mailthis/outgoing_email'
 
-require 'test/support/factory'
 require 'mailthis/exceptions'
 
 class Mailthis::OutgoingEmail
@@ -35,22 +34,17 @@ class Mailthis::OutgoingEmail
       assert_equal subject.message.from, subject.message.reply_to
     end
 
-    should "complain if delivering with an invalid mailer" do
-      @mailer.smtp_server = nil
-      assert_not @mailer.valid?
-
-      assert_raises(Mailthis::MailerError) do
-        subject.deliver
+    should "complain if given an invalid message" do
+      assert_raises(Mailthis::MessageError) do
+        Mailthis::OutgoingEmail.new(@mailer, 'invalid-msg')
       end
     end
 
-    should "complain if delivering an invalid message" do
-      msg = Factory.message
-      msg.to = nil
+    should "complain if delivering with an invalid mailer" do
+      @mailer.smtp_server = nil
+      assert_not @mailer.valid?
 
-      assert_raises(Mailthis::MessageError) do
-        Mailthis::OutgoingEmail.new(@mailer, msg).deliver
-      end
+      assert_raises(Mailthis::MailerError){ subject.deliver }
     end
 
     should "log when delivering a message" do
@@ -84,13 +78,14 @@ class Mailthis::OutgoingEmail
     should "complain if the message is missing required fields" do
       msg = Factory.message
       msg.subject = nil
+
       assert_invalid_with msg
     end
 
     should "complain if the message is not addressed to anyone" do
       msg = Factory.message
-
       msg.to = msg.cc = msg.bcc = nil
+
       assert_invalid_with msg
     end
 

metadata

@@ -1,86 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mailthis
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Kelly Redding
+- Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-07-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: assert
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ns-options
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: ns-options
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 5
-        version: "2.5"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
-  version_requirements: *id003
-description: a simple mailer for ruby
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+description: mailer for ruby
+email:
 - kelly@kellyredding.com
+- collin.redding@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,6 +75,7 @@ files:
 - lib/mailthis.rb
 - lib/mailthis/exceptions.rb
 - lib/mailthis/mailer.rb
+- lib/mailthis/message.rb
 - lib/mailthis/net_smtp_tls.rb
 - lib/mailthis/outgoing_email.rb
 - lib/mailthis/version.rb
@@ -97,44 +85,37 @@ files:
 - test/support/factory.rb
 - test/unit/mailer_tests.rb
 - test/unit/mailthis_tests.rb
+- test/unit/message_tests.rb
 - test/unit/outgoing_email_tests.rb
 - tmp/.gitkeep
-homepage: http://github.com/kellyredding/mailthis
-licenses: 
+homepage: http://github.com/redding/mailthis
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
-summary: a simple mailer for ruby
-test_files: 
+specification_version: 4
+summary: mailer for ruby
+test_files:
 - test/helper.rb
 - test/support/factory.rb
 - test/unit/mailer_tests.rb
 - test/unit/mailthis_tests.rb
+- test/unit/message_tests.rb
 - test/unit/outgoing_email_tests.rb