safety_mailer 0.0.2 → 0.0.3

data/README.rdoc

@@ -19,7 +19,18 @@ Don't forget to <tt>bundle install</tt> to install
 In your environment file <tt>config/environments/development.rb</tt> configure it, and some regular expressions.
 
   config.action_mailer.delivery_method = :safety_mailer
-  SafetyMailer::Config.allowed_matchers = [ /mydomain.com/, /mytestacct@gmail.com/, /super_secret_test/ ]
+  config.action_mailer.safety_mailer_settings = {
+    allowed_matchers: [ /mydomain.com/, /mytestacct@gmail.com/, /super_secret_test/ ],
+    delivery_method: :smtp,
+    delivery_method_settings: {
+      :address => "smtp.mydomain.com",
+      :port => 25,
+      :domain => "mydomain.com",
+      :authentication => :plain,
+      :user_name => "mydomain_mailer@mydomain.com",
+      :password => "password"
+    }
+  }
 
 ... and now, email to anyone@mydomain.com, mytestacct@gmail.com, bob+super_secret_test@yahoo.com all get sent
 and email to other recipients (like the real users in the production database you copied to a test server) is suppressed.
@@ -30,9 +41,10 @@ Any user of the Mail gem can configure safety_mailer:
 
   require "safety_mailer"
   Mail.defaults do
-    delivery_method SafetyMailer::Carrier
+    delivery_method SafetyMailer::Carrier, {
+      ... same settings as above
+    }
   end
-  SafetyMailer::Config.allowed_matchers = [ /mydomain.com/, /mytestacct@gmail.com/, /super_secret_test/ ]
 
 == License
 

data/lib/safety_mailer/railtie.rb

@@ -1,6 +1,6 @@
 module SafetyMailer
   class Railtie < Rails::Railtie
-    initializer "safety_mailer.add_delivery_method" do
+    config.before_configuration do
       ActionMailer::Base.add_delivery_method :safety_mailer, SafetyMailer::Carrier
     end
   end

data/lib/safety_mailer/safety_mailer.rb

@@ -1,21 +1,18 @@
 module SafetyMailer
-  class Config
-    @@allowed_matchers = []
-    cattr_accessor :allowed_matchers
-    @@delivery_method = :smtp
-    cattr_accessor :delivery_method
-  end
   class Carrier
     attr_accessor :params
     def initialize(params = {})
       self.params = params
+      delivery_method = params[:delivery_method] || :smtp
+      settings = params[:delivery_method_settings] || {}
+      @delivery_method = Mail::Configuration.instance.lookup_delivery_method(delivery_method).new(settings)
     end
     def log(msg)
       Rails.logger.warn(msg) if defined?(Rails)
     end
     def deliver!(mail)
       mail.to = mail.to.reject do |recipient|
-        if SafetyMailer::Config.allowed_matchers.any?{ |m| recipient =~ m }
+        if params[:allowed_matchers].any?{ |m| recipient =~ m }
           false
         else
           log "*** safety_mailer suppressing mail to #{recipient}"
@@ -26,7 +23,7 @@ module SafetyMailer
         log "*** safety_mailer - no recipients left ... suppressing delivery altogether"
       else
         log "*** safety_mailer allowing delivery to #{mail.to}"
-        Mail::Configuration.instance.lookup_delivery_method(SafetyMailer::Config.delivery_method).deliver!(mail)
+        @delivery_method.deliver!(mail)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: safety_mailer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Bill Kirtley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: []
 
 description: Specify a domain (or set of domains, or magic word in email address) email is allowed to go to, and email to all other domains is silently dropped. Useful for testing and staging environments.