mail_safe 0.2.0 → 0.3.0

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+.ginger

data/README.rdoc

@@ -13,14 +13,14 @@ with a note stating where the email was originally intended to go.
 Github: http://github.com/myronmarston/mail_safe
 
 Gem:
-  gem install mail_safe --source http://gemcutter.org
+  gem install mail_safe
 
 == Installation
 
-Load the gem in your non-production environments using Rails' 2.1+ gem support.  For example, I'm loading this in
+Load the gem in the appropriate environments using Rails' 2.1+ gem support.  For example, I'm loading this in
 config/environments/development.rb and config/environments/staging.rb:
 
-  config.gem 'mail_safe', :source => 'http://gemcutter.org'
+  config.gem 'mail_safe'
 
 IMPORTANT: Be sure not to load this in your production environment, otherwise, your emails won't be sent to the proper
 recipients.  In your test environment, you probably won't want this, either--rails ensures that no emails are ever sent in the
@@ -69,6 +69,14 @@ When mail safe replaces an email address, it appends a notice to the bottom of t
 
   **************************************************
 
+== Version Compatibility
+
+specs.should pass if RUBY_VERSION =~ /^1.(8.6|8.7|9.1)$/ && Rails.version =~ /^(1.2.6|2.\d.\d|3.0.0.beta)$/
+
+== Continuous Integration
+
+You can see the current status of the spec suite, for Ruby 1.8.6 and 1.9.1, on {runcoderun.org}[http://runcoderun.com/myronmarston/mail_safe].
+
 == Copyright
 
 Copyright (c) 2009 Myron Marston, Kashless.org. See LICENSE for details.

data/Rakefile

@@ -10,11 +10,8 @@ begin
     gem.homepage = "http://github.com/myronmarston/mail_safe"
     gem.authors = ["Myron Marston"]
 
-    gem.add_dependency 'activesupport'
-    gem.add_dependency 'actionmailer'
-
-    gem.add_development_dependency 'Shoulda'
-    gem.add_development_dependency 'mocha'
+    gem.add_dependency 'actionmailer',  '>= 1.3.6'
+    gem.add_development_dependency 'rspec', '>= 1.2.9'
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -22,32 +19,26 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = false
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
+task :spec => :check_dependencies if defined?(Jeweler)
 
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
+    require 'yaml' unless defined?(YAML) # seems to be needed for ruby 1.9.1
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   else

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 2
+:minor: 3
 :patch: 0
 :build: 

data/ginger_scenarios.rb

@@ -0,0 +1,34 @@
+require 'ginger'
+
+def create_scenario(version)
+  scenario = Ginger::Scenario.new("Rails #{version}")
+  scenario[/^action_?mailer$/] = version
+  scenario[/^action_?pack$/] = version
+  scenario[/^active_?support$/] = version
+  scenario
+end
+
+Ginger.configure do |config|
+  config.aliases["action_mailer"] = "actionmailer"
+  config.aliases["action_pack"] = "actionpack"
+  config.aliases["active_support"] = "activesupport"
+
+  rails3 = create_scenario('3.0.0.beta')
+  rails3['mail'] = '2.1.3'
+  config.scenarios << rails3
+
+  %w(
+  2.3.5 2.3.4 2.3.3 2.3.2
+  2.2.3 2.2.2
+  2.1.2 2.1.1 2.1.0
+  2.0.5 2.0.4 2.0.2 2.0.1 2.0.0
+  ).each do |version|
+    config.scenarios << create_scenario(version)
+  end
+
+  rails126 = Ginger::Scenario.new("Rails 1.2.6")
+  rails126[/^action_?mailer$/] = '1.3.6'
+  rails126[/^action_?pack$/] = '1.13.6'
+  rails126[/^active_?support$/] = '1.4.4'
+  config.scenarios << rails126
+end

data/lib/mail_safe.rb

@@ -1,8 +1,12 @@
 require 'active_support'
 require 'action_mailer'
+require 'action_mailer/version'
 
 require 'mail_safe/config'
-require 'mail_safe/action_mailer'
 require 'mail_safe/address_replacer'
 
-ActionMailer::Base.send(:include, MailSafe::ActionMailer) unless ActionMailer::Base.ancestors.include?(MailSafe::ActionMailer)
+if ActionMailer::VERSION::MAJOR < 3
+  require 'mail_safe/rails2_hook'
+else
+  require 'mail_safe/rails3_hook'
+end

data/lib/mail_safe/address_replacer.rb

@@ -1,7 +1,6 @@
 module MailSafe
   class AddressReplacer
     class << self
-      include ::ActionMailer::Utils
       ADDRESS_TYPES = [:to, :cc, :bcc].freeze
 
       def replace_external_addresses(mail)
@@ -33,8 +32,8 @@ module MailSafe
         return unless replaced_addresses.size > 0
 
         case part.content_type
-          when 'text/plain' then add_text_postscript(part, replaced_addresses)
-          when 'text/html'  then add_html_postscript(part, replaced_addresses)
+          when %r{^text/plain} then add_text_postscript(part, replaced_addresses)
+          when %r{^text/html}  then add_html_postscript(part, replaced_addresses)
         end
 
         part.parts.each { |p| add_body_postscript(p, replaced_addresses) }
@@ -60,7 +59,7 @@ The original recipients were:
 **************************************************
         EOS
 
-        set_part_body(part, part.body + postscript)
+        add_postscript(part, postscript)
       end
 
       def add_html_postscript(part, replaced_addresses)
@@ -93,19 +92,29 @@ The original recipients were:
           </div>
         EOS
 
-        set_part_body(part, part.body + postscript)
+        add_postscript(part, postscript)
       end
 
-      def set_part_body(part, body)
-        # taken from action mailer:
-        # http://github.com/rails/rails/blob/05d7409ae5fd423be6f747ad553f659fcecbf548/actionmailer/lib/action_mailer/part.rb#L58-65
-        case part.content_transfer_encoding.to_s.downcase
-          when "base64" then
-            part.body = TMail::Base64.folding_encode(body)
-          when "quoted-printable"
-            part.body = [normalize_new_lines(body)].pack("M*")
-          else
-            part.body = body
+      if ActionMailer::VERSION::MAJOR < 3
+        include ::ActionMailer::Utils
+
+        def add_postscript(part, postscript)
+          body = part.body + postscript
+
+          # taken from action mailer:
+          # http://github.com/rails/rails/blob/05d7409ae5fd423be6f747ad553f659fcecbf548/actionmailer/lib/action_mailer/part.rb#L58-65
+          case part.content_transfer_encoding.to_s.downcase
+            when "base64" then
+              part.body = TMail::Base64.folding_encode(body)
+            when "quoted-printable"
+              part.body = [normalize_new_lines(body)].pack("M*")
+            else
+              part.body = body
+          end
+        end
+      else
+        def add_postscript(part, postscript)
+          part.body = part.body.to_s + postscript
         end
       end
     end

data/lib/mail_safe/config.rb

@@ -6,7 +6,7 @@ module MailSafe
 
     def self.is_internal_address?(address)
       case internal_address_definition
-        when Regexp then address =~ internal_address_definition
+        when Regexp then !!(address =~ internal_address_definition)
         when Proc   then internal_address_definition.call(address)
         else
           return address.downcase == developer_email_address.downcase if developer_email_address

data/lib/mail_safe/{action_mailer.rb → rails2_hook.rb}

@@ -11,4 +11,6 @@ module MailSafe
       deliver_without_mail_safe!(mail)
     end
   end
-end
+end
+
+ActionMailer::Base.send(:include, MailSafe::ActionMailer) unless ActionMailer::Base.ancestors.include?(MailSafe::ActionMailer)

data/lib/mail_safe/rails3_hook.rb

@@ -0,0 +1,11 @@
+require 'mail'
+
+module MailSafe
+  class MailInterceptor
+    def self.delivering_email(mail)
+      MailSafe::AddressReplacer.replace_external_addresses(mail) if mail
+    end
+
+    ::Mail.register_interceptor(self)
+  end
+end

data/mail_safe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_safe}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myron Marston"]
-  s.date = %q{2009-11-06}
+  s.date = %q{2010-02-24}
   s.email = %q{myron.marston@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,26 +22,29 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
+     "ginger_scenarios.rb",
      "lib/mail_safe.rb",
-     "lib/mail_safe/action_mailer.rb",
      "lib/mail_safe/address_replacer.rb",
      "lib/mail_safe/config.rb",
+     "lib/mail_safe/rails2_hook.rb",
+     "lib/mail_safe/rails3_hook.rb",
      "mail_safe.gemspec",
-     "test/config_test.rb",
-     "test/mailer_test.rb",
-     "test/mailers/test_mailer.rb",
-     "test/test_helper.rb"
+     "spec/spec/config_spec.rb",
+     "spec/spec/mailer_spec.rb",
+     "spec/spec/mailers/test_mailer.rb",
+     "spec/spec/spec.opts",
+     "spec/spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/myronmarston/mail_safe}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Keep your ActionMailer emails from escaping into the wild during development.}
   s.test_files = [
-    "test/config_test.rb",
-     "test/mailer_test.rb",
-     "test/mailers/test_mailer.rb",
-     "test/test_helper.rb"
+    "spec/spec/config_spec.rb",
+     "spec/spec/mailer_spec.rb",
+     "spec/spec/mailers/test_mailer.rb",
+     "spec/spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -49,21 +52,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<actionmailer>, [">= 0"])
-      s.add_development_dependency(%q<Shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_runtime_dependency(%q<actionmailer>, [">= 1.3.6"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<actionmailer>, [">= 0"])
-      s.add_dependency(%q<Shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<actionmailer>, [">= 1.3.6"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<actionmailer>, [">= 0"])
-    s.add_dependency(%q<Shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<actionmailer>, [">= 1.3.6"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

data/spec/spec/config_spec.rb

@@ -0,0 +1,154 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe MailSafe::Config do
+  describe '#developer_email_address' do
+    after(:each) do
+      # clear class variable caching...
+      MailSafe::Config.class_eval do
+        remove_class_variable(:@@developer_email_address)
+      end
+    end
+
+    context 'when git is installed' do
+      before(:each) do
+        MailSafe::Config.should_receive(:`).with('git config user.email').once.and_return("developer@domain.com\n")
+      end
+
+      it "guesses the developer's email address using git" do
+        MailSafe::Config.developer_email_address.should == 'developer@domain.com'
+      end
+
+      it "caches the developer's email address so multiple system calls aren't made" do
+        MailSafe::Config.developer_email_address.should == MailSafe::Config.developer_email_address
+      end
+    end
+
+    context 'when git is not installed' do
+      before(:each) do
+        MailSafe::Config.should_receive(:`).with('git config user.email').once.and_return(nil)
+      end
+
+      it "returns nil" do
+        MailSafe::Config.developer_email_address.should be_nil
+      end
+
+      it "caches the developer's email address so multiple system calls aren't made" do
+        MailSafe::Config.developer_email_address.should == MailSafe::Config.developer_email_address
+      end
+    end
+  end
+
+  describe '#is_internal_address?' do
+    context 'when internal_address_definition is not set' do
+      before(:each) do
+        MailSafe::Config.internal_address_definition = nil
+      end
+
+      context 'and #developer_email_address has a value' do
+        before(:each) do
+          @developer_address = 'developer@domain.com'
+          MailSafe::Config.should_receive(:developer_email_address).at_least(1).and_return(@developer_address)
+        end
+
+        it 'returns true when passed the developer email address' do
+          MailSafe::Config.is_internal_address?(@developer_address).should be_true
+        end
+
+        it 'returns true when passed the developer email address with different casing' do
+          MailSafe::Config.is_internal_address?(@developer_address.upcase).should be_true
+        end
+
+        it 'returns false when passed another email address' do
+          MailSafe::Config.is_internal_address?('another-address@domain.com').should be_false
+        end
+      end
+
+      context 'and #developer_email_address has no value' do
+        before(:each) do
+          MailSafe::Config.should_receive(:developer_email_address).and_return(nil)
+        end
+
+        it 'raises an error' do
+          lambda { MailSafe::Config.is_internal_address?('abc@foo.com') }.should raise_error(MailSafe::InvalidConfigSettingError)
+        end
+      end
+    end
+
+    context 'when internal_address_definition is set to a regexp' do
+      before(:each) do
+        MailSafe::Config.internal_address_definition = /.*@example\.com/
+      end
+
+      it 'returns true if the address matches the regexp' do
+        MailSafe::Config.is_internal_address?('someone@example.com').should be_true
+      end
+
+      it 'returns false if the address does not match the regexp' do
+        MailSafe::Config.is_internal_address?('someone@another-domain.com').should be_false
+      end
+    end
+
+    context 'When internal_address_definition is set to a lambda, #is_internal_address?' do
+      before(:each) do
+        MailSafe::Config.internal_address_definition = lambda { |address| address.size < 15 }
+      end
+
+      it 'returns true if the lambda returns true for the given address' do
+        MailSafe::Config.is_internal_address?('abc@foo.com').should be_true
+      end
+
+      it 'returns false if the lambda returns false for the given address' do
+        MailSafe::Config.is_internal_address?('a-long-address@example.com').should be_false
+      end
+    end
+  end
+
+  describe '#get_replacement_address' do
+    context 'when replacement_address is set to a string' do
+      before(:each) do
+        MailSafe::Config.replacement_address = 'me@mydomain.com'
+      end
+
+      it 'returns the configured replacement address' do
+        MailSafe::Config.get_replacement_address('you@example.com').should == 'me@mydomain.com'
+      end
+    end
+
+    context 'when replacement_address is set to a proc' do
+      before(:each) do
+        MailSafe::Config.replacement_address = lambda { |address| "me+#{address.split('@').first}@mydomain.com" }
+      end
+
+      it 'returns the configured replacement address' do
+        MailSafe::Config.get_replacement_address('you@example.com').should == 'me+you@mydomain.com'
+      end
+    end
+
+    context 'when replacement_address is not set' do
+      before(:each) do
+        MailSafe::Config.replacement_address = nil
+      end
+
+      context 'and #developer_email_address has a value' do
+        before(:each) do
+          @developer_address = 'developer@domain.com'
+          MailSafe::Config.should_receive(:developer_email_address).at_least(1).and_return(@developer_address)
+        end
+
+        it 'returns the developer address' do
+          MailSafe::Config.get_replacement_address('you@example.com').should == @developer_address
+        end
+      end
+
+      context 'and #developer_email_address has no value' do
+        before(:each) do
+          MailSafe::Config.should_receive(:developer_email_address).and_return(nil)
+        end
+
+        it 'raises an error' do
+          lambda { MailSafe::Config.get_replacement_address('you@example.com') }.should raise_error(MailSafe::InvalidConfigSettingError)
+        end
+      end
+    end
+  end
+end

data/spec/spec/mailer_spec.rb

@@ -0,0 +1,107 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe MailSafe do
+  TEXT_POSTSCRIPT_PHRASE = /The original recipients were:/
+  HTML_POSTSCRIPT_PHRASE = /<p>\s+The original recipients were:\s+<\/p>/
+
+  def deliver_message(message_name, *args)
+    if ActionMailer::VERSION::MAJOR < 3
+      TestMailer.send("deliver_#{message_name}", *args)
+    else
+      TestMailer.send(message_name, *args).deliver
+    end
+  end
+
+  def have_addresses(*addresses)
+    simple_matcher("have addresses #{addresses.inspect}") do |array|
+      array.to_a.sort == addresses
+    end
+  end
+
+  describe 'Delivering a plain text email to internal addresses' do
+    before(:each) do
+      MailSafe::Config.stub(:is_internal_address?).and_return(true)
+      @email = deliver_message(:plain_text_message, :to => 'internal-to@address.com', :bcc => 'internal-bcc@address.com', :cc => 'internal-cc@address.com')
+    end
+
+    it 'sends the email to the original addresses' do
+      @email.to.should  have_addresses('internal-to@address.com')
+      @email.cc.should  have_addresses('internal-cc@address.com')
+      @email.bcc.should have_addresses('internal-bcc@address.com')
+    end
+
+    it 'does not add a post script to the body' do
+       @email.body.to_s.should_not =~ TEXT_POSTSCRIPT_PHRASE
+    end
+  end
+
+  describe 'Delivering a plain text email to external addresses' do
+    before(:each) do
+      MailSafe::Config.stub(:is_internal_address?).and_return(false)
+      MailSafe::Config.stub(:get_replacement_address).and_return('replacement@example.com')
+      @email = deliver_message(:plain_text_message, :to => 'external-to@address.com', :bcc => 'external-bcc@address.com', :cc => 'external-cc@address.com')
+    end
+
+    it 'sends the email to the replacement address' do
+      @email.to.should  have_addresses('replacement@example.com')
+      @email.cc.should  have_addresses('replacement@example.com')
+      @email.bcc.should have_addresses('replacement@example.com')
+    end
+  end
+
+  def deliver_email_with_mix_of_internal_and_external_addresses(message_name)
+    MailSafe::Config.internal_address_definition = /internal/
+    MailSafe::Config.replacement_address = 'internal@domain.com'
+    @email = deliver_message(message_name,
+      {
+        :to  => ['internal1@address.com', 'external1@address.com'],
+        :cc  => ['internal1@address.com', 'internal2@address.com'],
+        :bcc => ['external1@address.com', 'external2@address.com']
+      }
+    )
+  end
+
+  describe 'Delivering a plain text email to a mix of internal and external addresses' do
+    before(:each) do
+      deliver_email_with_mix_of_internal_and_external_addresses(:plain_text_message)
+    end
+
+    it 'sends the email to the appropriate address' do
+      @email.to.should  have_addresses('internal1@address.com', 'internal@domain.com')
+      @email.cc.should  have_addresses('internal1@address.com', 'internal2@address.com')
+      @email.bcc.should have_addresses('internal@domain.com',   'internal@domain.com')
+    end
+
+    it 'adds a plain text post script to the body' do
+      @email.body.to_s.should =~ TEXT_POSTSCRIPT_PHRASE
+    end
+  end
+
+  describe 'Delivering an html email to a mix of internal and external addresses' do
+    before(:each) do
+      deliver_email_with_mix_of_internal_and_external_addresses(:html_message)
+    end
+
+    it 'adds an html post script to the body' do
+      @email.body.to_s.should =~ HTML_POSTSCRIPT_PHRASE
+    end
+  end
+
+  describe 'Delivering a multipart email to a mix of internal and external addresses' do
+    before(:each) do
+      deliver_email_with_mix_of_internal_and_external_addresses(:multipart_message)
+    end
+
+    def part(type)
+      @email.parts.detect { |p| p.content_type == type }.body.to_s
+    end
+
+    it 'adds a text post script to the body of the text part' do
+      part('text/plain').should =~ TEXT_POSTSCRIPT_PHRASE
+    end
+
+    it 'adds an html post script to the body of the html part' do
+      part('text/html').should =~  HTML_POSTSCRIPT_PHRASE
+    end
+  end
+end

data/{test → spec/spec}/mailers/test_mailer.rb

@@ -1,6 +1,14 @@
+if ActionMailer::VERSION::MAJOR == 3
+  require 'action_dispatch/http/mime_type' # needs to be required to avoid an error: uninitialized constant AbstractController::Collector::Mime
+end
+
 class TestMailer < ActionMailer::Base
   # template root must be set for multipart emails, or ActionMailer will throw an exception.
-  self.template_root = File.dirname(__FILE__)
+  if respond_to?(:view_paths)
+    view_paths.unshift File.dirname(__FILE__)
+  else
+    template_root File.dirname(__FILE__)
+  end
 
   def plain_text_message(options)
     setup_recipients(options)

data/spec/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/{test/test_helper.rb → spec/spec/spec_helper.rb}

@@ -1,7 +1,11 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'spec'
+require 'spec/autorun'
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
+require 'ginger'
+require 'mail_safe'
+require 'mailers/test_mailer'
 
 begin
   require 'ruby-debug'
@@ -11,12 +15,7 @@ rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
 end
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'mail_safe'
-require 'mailers/test_mailer'
-
 ActionMailer::Base.delivery_method = :test
 
-class Test::Unit::TestCase
-end
+Spec::Runner.configure do |config|
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mail_safe
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Myron Marston
@@ -9,49 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -08:00
+date: 2010-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 1
+        - 3
+        - 6
+        version: 1.3.6
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: Shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  version_requirements: *id002
 description: 
 email: myron.marston@gmail.com
 executables: []
@@ -68,15 +61,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- ginger_scenarios.rb
 - lib/mail_safe.rb
-- lib/mail_safe/action_mailer.rb
 - lib/mail_safe/address_replacer.rb
 - lib/mail_safe/config.rb
+- lib/mail_safe/rails2_hook.rb
+- lib/mail_safe/rails3_hook.rb
 - mail_safe.gemspec
-- test/config_test.rb
-- test/mailer_test.rb
-- test/mailers/test_mailer.rb
-- test/test_helper.rb
+- spec/spec/config_spec.rb
+- spec/spec/mailer_spec.rb
+- spec/spec/mailers/test_mailer.rb
+- spec/spec/spec.opts
+- spec/spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/myronmarston/mail_safe
 licenses: []
@@ -90,23 +86,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Keep your ActionMailer emails from escaping into the wild during development.
 test_files: 
-- test/config_test.rb
-- test/mailer_test.rb
-- test/mailers/test_mailer.rb
-- test/test_helper.rb
+- spec/spec/config_spec.rb
+- spec/spec/mailer_spec.rb
+- spec/spec/mailers/test_mailer.rb
+- spec/spec/spec_helper.rb

data/test/config_test.rb

@@ -1,178 +0,0 @@
-require 'test_helper'
-
-class ConfigTest < Test::Unit::TestCase
-  context '#developer_email_address' do
-    teardown do
-      # clear class variable caching...
-      MailSafe::Config.class_eval do
-        remove_class_variable(:@@developer_email_address)
-      end
-    end
-
-    context 'when git is installed' do
-      setup do
-        backtick_call_count = 0
-        # mock out the ` method.  I can't find a simpler way to do this with mocha.
-        Kernel.class_eval do
-          define_method '`'.to_sym do |cmd|
-            backtick_call_count += 1
-            return "too many calls" if backtick_call_count > 1
-            if cmd == 'git config user.email'
-              "developer@domain.com\n"
-            end
-          end
-        end
-      end
-
-      should "guess the developer's email address using git" do
-        assert_equal 'developer@domain.com', MailSafe::Config.developer_email_address
-      end
-
-      should "cache the developer's email address so multiple system calls aren't made" do
-        assert_equal MailSafe::Config.developer_email_address, MailSafe::Config.developer_email_address
-      end
-    end
-
-    context 'when git is not installed' do
-      setup do
-        backtick_call_count = 0
-        # mock out the ` method.  I can't find a simpler way to do this with mocha.
-        Kernel.class_eval do
-          define_method '`'.to_sym do |cmd|
-            backtick_call_count += 1
-            return "too many calls" if backtick_call_count > 1
-            if cmd == 'git config user.email'
-              raise RuntimeError.new("Git is not installed")
-            end
-          end
-        end
-      end
-
-      should "return nil" do
-        assert_nil MailSafe::Config.developer_email_address
-      end
-
-      should "cache the developer's email address so multiple system calls aren't made" do
-        assert_equal MailSafe::Config.developer_email_address, MailSafe::Config.developer_email_address
-      end
-    end
-  end
-
-  context '#is_internal_address?' do
-    context 'when internal_address_definition is not set' do
-      setup do
-        MailSafe::Config.internal_address_definition = nil
-      end
-
-      context 'and #developer_email_address has a value' do
-        setup do
-          @developer_address = 'developer@domain.com'
-          MailSafe::Config.expects(:developer_email_address).at_least_once.returns(@developer_address)
-        end
-
-        should 'return true when passed the developer email address' do
-          assert MailSafe::Config.is_internal_address?(@developer_address)
-        end
-
-        should 'return true when passed the developer email address with different casing' do
-          assert MailSafe::Config.is_internal_address?(@developer_address.upcase)
-        end
-
-        should 'return false when passed another email address' do
-          assert !MailSafe::Config.is_internal_address?('another-address@domain.com')
-        end
-      end
-
-      context 'and #developer_email_address has no value' do
-        setup do
-          MailSafe::Config.expects(:developer_email_address).returns(nil)
-        end
-
-        should 'raise an error' do
-          assert_raise MailSafe::InvalidConfigSettingError do
-            MailSafe::Config.is_internal_address?('abc@foo.com')
-          end
-        end
-      end
-    end
-
-    context 'when internal_address_definition is set to a regexp' do
-      setup do
-        MailSafe::Config.internal_address_definition = /.*@example\.com/
-      end
-
-      should 'return true if the address matches the regexp' do
-        assert MailSafe::Config.is_internal_address?('someone@example.com')
-      end
-
-      should 'return false if the address does not match the regexp' do
-        assert !MailSafe::Config.is_internal_address?('someone@another-domain.com')
-      end
-    end
-
-    context 'When internal_address_definition is set to a lambda, #is_internal_address?' do
-      setup do
-        MailSafe::Config.internal_address_definition = lambda { |address| address.size < 15 }
-      end
-
-      should 'return true if the lambda returns true for the given address' do
-        assert MailSafe::Config.is_internal_address?('abc@foo.com')
-      end
-
-      should 'return false if the lambda returns false for the given address' do
-        assert !MailSafe::Config.is_internal_address?('a-long-address@example.com')
-      end
-    end
-  end
-
-  context '#get_replacement_address' do
-    context 'when replacement_address is set to a string' do
-      setup do
-        MailSafe::Config.replacement_address = 'me@mydomain.com'
-      end
-
-      should 'return the configured replacement address' do
-        assert_equal 'me@mydomain.com', MailSafe::Config.get_replacement_address('you@example.com')
-      end
-    end
-
-    context 'when replacement_address is set to a proc' do
-      setup do
-        MailSafe::Config.replacement_address = lambda { |address| "me+#{address.split('@').first}@mydomain.com" }
-      end
-
-      should 'return the configured replacement address' do
-        assert_equal 'me+you@mydomain.com', MailSafe::Config.get_replacement_address('you@example.com')
-      end
-    end
-
-    context 'when replacement_address is not set' do
-      setup do
-        MailSafe::Config.replacement_address = nil
-      end
-
-      context 'and #developer_email_address has a value' do
-        setup do
-          @developer_address = 'developer@domain.com'
-          MailSafe::Config.expects(:developer_email_address).at_least_once.returns(@developer_address)
-        end
-
-        should 'return the developer address' do
-          assert_equal @developer_address, MailSafe::Config.get_replacement_address('you@example.com')
-        end
-      end
-
-      context 'and #developer_email_address has no value' do
-        setup do
-          MailSafe::Config.expects(:developer_email_address).returns(nil)
-        end
-
-        should 'raise an error' do
-          assert_raise MailSafe::InvalidConfigSettingError do
-            MailSafe::Config.get_replacement_address('you@example.com')
-          end
-        end
-      end
-    end
-  end
-end

data/test/mailer_test.rb

@@ -1,88 +0,0 @@
-require 'test_helper'
-
-class MailerTest < Test::Unit::TestCase
-  TEXT_POSTSCRIPT_PHRASE = /The original recipients were:/
-  HTML_POSTSCRIPT_PHRASE = /<p>\s+The original recipients were:\s+<\/p>/
-
-  context 'Delivering a plain text email to internal addresses' do
-    setup do
-      MailSafe::Config.stubs(:is_internal_address? => true)
-      @email = TestMailer.deliver_plain_text_message(:to => 'internal-to@address.com', :bcc => 'internal-bcc@address.com', :cc => 'internal-cc@address.com')
-    end
-
-    should 'send the email to the original addresses' do
-      assert_equal ['internal-to@address.com'], @email.to
-      assert_equal ['internal-cc@address.com'], @email.cc
-      assert_equal ['internal-bcc@address.com'], @email.bcc
-    end
-
-    should 'not add a post script to the body' do
-      assert_no_match TEXT_POSTSCRIPT_PHRASE, @email.body
-    end
-  end
-
-  context 'Delivering a plain text email to external addresses' do
-    setup do
-      MailSafe::Config.stubs(:is_internal_address? => false, :get_replacement_address => 'replacement@example.com')
-      @email = TestMailer.deliver_plain_text_message(:to => 'internal-to@address.com', :bcc => 'internal-bcc@address.com', :cc => 'internal-cc@address.com')
-    end
-
-    should 'send the email to the replacement address' do
-      assert_equal ['replacement@example.com'], @email.to
-      assert_equal ['replacement@example.com'], @email.cc
-      assert_equal ['replacement@example.com'], @email.bcc
-    end
-  end
-
-  def deliver_email_with_mix_of_internal_and_external_addresses(delivery_method)
-    MailSafe::Config.internal_address_definition = /internal/
-    MailSafe::Config.replacement_address = 'internal@domain.com'
-    @email = TestMailer.send(delivery_method,
-      {
-        :to  => ['internal1@address.com', 'external1@address.com'],
-        :cc  => ['internal1@address.com', 'internal2@address.com'],
-        :bcc => ['external1@address.com', 'external2@address.com']
-      }
-    )
-  end
-
-  context 'Delivering a plain text email to a mix of internal and external addresses' do
-    setup do
-      deliver_email_with_mix_of_internal_and_external_addresses(:deliver_plain_text_message)
-    end
-
-    should 'send the email to the appropriate address' do
-      assert_same_elements ['internal1@address.com', 'internal@domain.com'],   @email.to
-      assert_same_elements ['internal1@address.com', 'internal2@address.com'], @email.cc
-      assert_same_elements ['internal@domain.com',   'internal@domain.com'],   @email.bcc
-    end
-
-    should 'add a plain text post script to the body' do
-      assert_match TEXT_POSTSCRIPT_PHRASE, @email.body
-    end
-  end
-
-  context 'Delivering an html email to a mix of internal and external addresses' do
-    setup do
-      deliver_email_with_mix_of_internal_and_external_addresses(:deliver_html_message)
-    end
-
-    should 'add an html post script to the body' do
-      assert_match HTML_POSTSCRIPT_PHRASE, @email.body
-    end
-  end
-
-  context 'Delivering a multipart email to a mix of internal and external addresses' do
-    setup do
-      deliver_email_with_mix_of_internal_and_external_addresses(:deliver_multipart_message)
-    end
-
-    should 'add an text post script to the body of the text part' do
-      assert_match TEXT_POSTSCRIPT_PHRASE, @email.parts.detect { |p| p.content_type == 'text/plain' }.body
-    end
-
-    should 'add an html post script to the body of the html part' do
-      assert_match HTML_POSTSCRIPT_PHRASE, @email.parts.detect { |p| p.content_type == 'text/html' }.body
-    end
-  end
-end