jeremyevans-simple_mailer 1.0.0 → 1.1.0

data/README

@@ -49,7 +49,7 @@ Testing support is probably the main reason to use simple_mailer over
 using net/smtp directly.  After you enter test mode, emails you send
 are available via the emails_sent option:
 
-  SimpleMailer.simple_mailer_test_mode!
+  SimpleMailer.test_mode!
   SimpleMailer.emails_sent # []
   SimpleMailer.send_email('from@from.com', 'to@to.com', 'S, 'B')
   SimpleMailer.emails_sent # [[message, 'from@from.com', 'to@to.com']]

data/lib/simple_mailer.rb

@@ -9,18 +9,42 @@ require 'net/smtp'
 # it handles headers and it has a test mode that just records the number of
 # emails sent instead of actually sending the messages.
 module SimpleMailer
+  @test_mode = false
+  @emails_sent = []
+
   extend self
 
   DEFAULT_SMTP_HOST = 'localhost'.freeze
 
-  # The emails sent in test mode.  Is an array of arrays.  Each
-  # element array is a array of three elements, the message, from address,
-  # and to address.
-  attr_reader :emails_sent
+  # The array of emails sent
+  def self.emails_sent
+    @emails_sent
+  end
+
+  # Turn on the test mode.  There is no method given to turn it off.
+  # While in test mode, messages will not be sent, but the messages
+  # that would have been sent are available via emails_sent.
+  # This method also resets the emails_sent variable to the empty array.
+  def self.test_mode!
+    @emails_sent.clear
+    @test_mode = true
+  end
+  
+  # Whether we are in simple mailer's test mode
+  def self.test_mode?
+    @test_mode
+  end
 
   # The smtp server to sent email to
   attr_accessor :smtp_server
   
+  # The emails sent in test mode.  Is an array of arrays.  Each
+  # element array is a array of three elements, the message, from address,
+  # and to address.
+  def emails_sent
+    SimpleMailer.emails_sent
+  end
+
   # Formats email message using from address, to address, subject, message,
   # and header hash.  Arguments:
   # * from - From address for the message
@@ -49,21 +73,12 @@ Subject: #{subject}
 END_OF_MESSAGE
   end
   
-  # Turn on the test mode.  There is no method given to turn it off.
-  # While in test mode, messages will not be sent, but the messages
-  # that would have been sent are available via emails_sent.
-  # This method also resets the emails_sent variable to the empty array.
-  def simple_mailer_test_mode!
-    @emails_sent = []
-    @simple_mailer_test_mode = true
-  end
-  
   private
 
   # If in test mode, call test_mode_send_email with the arguments.
   # Otherwise, use net/smtp to send the message to the smtp server.
   def _send_email(msg, from, to)
-    if simple_mailer_test_mode?
+    if SimpleMailer.test_mode?
       test_mode_send_email(msg, from, to)
     else
       Net::SMTP.start(smtp_server || DEFAULT_SMTP_HOST){|s| s.send_message(msg, from, to)}
@@ -75,9 +90,4 @@ END_OF_MESSAGE
   def test_mode_send_email(msg, from, to)
     emails_sent << [msg, from, to]
   end
-  
-  # Whether we are in simple mailer's test mode
-  def simple_mailer_test_mode?
-    @simple_mailer_test_mode
-  end
 end

data/spec/simple_mailer.rb

@@ -72,13 +72,13 @@ END_MESSAGE
   end
 
   it "should not send emails in test mode" do
-    @mailer.simple_mailer_test_mode!
+    SimpleMailer.test_mode!
     @mailer.send_email('from3@from.com', 'to3@to.com', 'Test Subject 3', 'Test Body 3', 'HeaderKey3'=>'HeaderValue3', :smtp_from=>'from@to.com', :smtp_to=>'to@from.com')
     $message.should == [nil, nil, nil]
   end
 
   it "should record emails sent to emails_sent in test mode" do
-    @mailer.simple_mailer_test_mode!
+    SimpleMailer.test_mode!
     @mailer.send_email('from3@from.com', 'to3@to.com', 'Test Subject 3', 'Test Body 3', 'HeaderKey3'=>'HeaderValue3', :smtp_from=>'from@to.com', :smtp_to=>'to@from.com')
     @mailer.emails_sent.should == [[<<END_MESSAGE, 'from@to.com', 'to@from.com']]
 From: from3@from.com
@@ -88,6 +88,7 @@ HeaderKey3: HeaderValue3
 
 Test Body 3
 END_MESSAGE
+    SimpleMailer.instance_variable_set(:@test_mode, false)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremyevans-simple_mailer
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Jeremy Evans