mail_safe 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 31c1a2b64eb57573f90a15add88b559edeec9b8e
+  data.tar.gz: 2f4bba2d1e5d7176d1b9882be77adc7bc94b89cc
+SHA512:
+  metadata.gz: 5e05fe8957e4f3d977e23d7f714219bbd636d4fdd47349f63860d0cbabe96357fb0799119527720fdda9a0d7c37ca5a7b5c9a9c3e955edaad2ab67abdbe92f10
+  data.tar.gz: 63a8b3ab0f0ad45ec17f53417225097a4571915c192345da892ad5842d7ebd65c9d91eb7d0cf2686ce620e29e313f7b78c6018fe35179c3dcb39e551713f3f2b

data/.gitignore

@@ -3,4 +3,4 @@
 coverage
 rdoc
 pkg
-.ginger
+gemfiles/*.lock

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.2"
+gemfile:
+  - gemfiles/actionmailer_3_2.gemfile
+  - gemfiles/actionmailer_4_0.gemfile
+  - gemfiles/actionmailer_4_1.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "actionmailer-3_2" do
+  gem "actionmailer", "~> 3.2.0"
+end
+
+appraise "actionmailer-4_0" do
+  gem "actionmailer", "~> 4.0.0"
+end
+
+appraise "actionmailer-4_1" do
+  gem "actionmailer", "~> 4.1.0"
+end

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mail_safe.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,97 @@
+PATH
+  remote: .
+  specs:
+    mail_safe (0.3.2)
+      actionmailer (>= 3.0.0)
+      coveralls
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      mail (~> 2.5.4)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    erubis (2.7.0)
+    i18n (0.6.11)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    minitest (5.4.1)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    rdoc (4.1.0)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tins (1.3.2)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler
+  mail_safe!
+  rake
+  rspec (~> 3.0, >= 3.0.0)

data/LICENSE

@@ -1,4 +1,7 @@
-Copyright (c) 2009-2010 Myron Marston
+Copyright (c) 2009-2010, Myron Marston, Kashless.org
+Copyright (c) 2014, Watu
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/{README.rdoc → README.md}

@@ -1,4 +1,11 @@
-= mail_safe
+[![Build Status](https://travis-ci.org/watu/mail_safe.png?branch=master)](https://travis-ci.org/watu/mail_safe)
+[![Coverage Status](https://coveralls.io/repos/watu/mail_safe/badge.png?branch=master)](https://coveralls.io/r/watu/mail_safe?branch=master)
+[![Code Climate](https://codeclimate.com/github/watu/mail_safe.png)](https://codeclimate.com/github/watu/mail_safe)
+[![Inline docs](http://inch-ci.org/github/watu/mail_safe.png)](http://inch-ci.org/github/watu/mail_safe)
+[![Gem Version](https://badge.fury.io/rb/mail_safe.png)](http://badge.fury.io/rb/mail_safe)
+
+
+# mail_safe
 
 Mail safe provides a safety net while you're developing an application that uses ActionMailer.
 It keeps emails from escaping into the wild.
@@ -8,41 +15,42 @@ emails to external email addresses.  Instead, emails that would normally be deli
 addresses will be sent to an address of your choosing, and the body of the email will be appended
 with a note stating where the email was originally intended to go.
 
-== Download
+## Download
 
 Github: http://github.com/myronmarston/mail_safe
 
-Gem:
-  gem install mail_safe
+Gem: `gem install mail_safe`
 
-== Installation
+## Installation
 
-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:
+Load the gem in the appropriate environments using Rails' 3.2+ gem support.  For example, I'm loading this in Gemfile as:
 
-  config.gem 'mail_safe'
+  `gem "mail_safe", group: [:development, :staging]`
 
 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
+recipients. In your test environment, you probably won't want this either. Rails ensures that no emails are ever sent in the
 test environment, and tests that check outbound email recipients may fail.
 
-== Configuration
+## Configuration
 
 In many cases, no configuration is necessary.  If you have git installed, and you've registered your email address
 with it (check with "git config user.email" in your shell), mail safe will use this.  All emails will be sent to this address.
 
 Otherwise, you can configure mail safe's behavior.  Create a file at config/initializers/mail_safe.rb, similar to the following:
 
+```ruby
   if defined?(MailSafe::Config)
     MailSafe::Config.internal_address_definition = /.*@my-domain\.com/i
     MailSafe::Config.replacement_address = 'me@my-domain.com'
   end
+```
 
 The internal address definition determines which addresses will be ignored (i.e. sent normally) and which will be replaced.  Email
 being sent to internal addresses will be sent normally; all other email addresses will be replaced by the replacement address.
 
 These settings can also take procs if you need something more flexible:
 
+```ruby
   if defined?(MailSafe::Config)
     MailSafe::Config.internal_address_definition = lambda { |address|
       address =~ /.*@domain1\.com/i ||
@@ -53,9 +61,11 @@ These settings can also take procs if you need something more flexible:
     # Useful if your mail server allows + dynamic email addresses like gmail.
     MailSafe::Config.replacement_address = lambda { |address| "my-address+#{address.gsub(/[\w\-.]/, '_')}@gmail.com" }
   end
+```
 
 When mail safe replaces an email address, it appends a notice to the bottom of the email body, such as:
 
+```
   **************************************************
   This email originally had different recipients,
   but MailSafe has prevented it from being sent to them.
@@ -68,13 +78,15 @@ When mail safe replaces an email address, it appends a notice to the bottom of t
    - external-address-3@domain.com
 
   **************************************************
+```
+## Version Compatibility and Continuous Integration
+
+Tested with [Travis](https://travis-ci.org/watu/mail_safe) using Ruby 1.9, 2.0 and 2.1 against actionmailer 3.2, 4.0 and 4.1. ![Build Status](https://travis-ci.org/watu/mail_safe.svg?branch=master)
 
-== Version Compatibility and Continuous Integration
 
-Mail safe works on ruby {1.8.6}[http://integrity186.heroku.com/mail-safe], {1.8.7}[http://integrity187.heroku.com/mail-safe] and {1.9.1}[http://integrity191.heroku.com/mail-safe],
-and any version of actionmailer since 1.3.6 (the version used by rails 1.2.6), including 3.0.0.  The builds (linked to above)
-use {ginger}[http://github.com/freelancing-god/ginger] to run the specs against 16 different versions of actionmailer.
+## Copyright
 
-== Copyright
+Copyright (c) 2009-2010 Myron Marston, Kashless.org.
+Copyright (c) 2014, Watu
 
-Copyright (c) 2009-2010 Myron Marston, Kashless.org. See LICENSE for details.
+See LICENSE for details.

data/Rakefile

@@ -1,54 +1,16 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mail_safe"
-    gem.summary = %Q{Keep your ActionMailer emails from escaping into the wild during development.}
-    gem.email = "myron.marston@gmail.com"
-    gem.homepage = "http://github.com/myronmarston/mail_safe"
-    gem.authors = ["Myron Marston"]
-
-    gem.add_dependency 'actionmailer',  '>= 1.3.6'
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
-
-    gem.files.exclude 'vendor/ginger'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
+require "rubygems"
+require "bundler/setup"
+require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  #t.rspec_opts = %w[--format documentation]
-end
-
-task :spec => :check_dependencies if defined?(Jeweler)
+require 'rdoc/task'
 
-task :default => :ginger
+RSpec::Core::RakeTask.new(:test)
 
-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
-    version = ""
-  end
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mail_safe #{version}"
+  rdoc.title = "mail_safe #{MailSafe::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Run ginger tests'
-task :ginger do
-  $LOAD_PATH << File.join(*%w[vendor ginger lib])
-  ARGV.clear
-  ARGV << 'spec'
-  load File.join(*%w[vendor ginger bin ginger])
-end
+task :default => :test

data/gemfiles/actionmailer_3_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionmailer", "~> 3.2.0"
+
+gemspec :path => "../"

data/gemfiles/actionmailer_4_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionmailer", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/actionmailer_4_1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionmailer", "~> 4.1.0"
+
+gemspec :path => "../"

data/lib/mail_safe.rb

@@ -1,11 +1,7 @@
 require 'action_mailer'
-require 'action_mailer/version'
+require 'active_support/core_ext/class/attribute_accessors' # to be able to use cattr_accessor
 
 require 'mail_safe/config'
 require 'mail_safe/address_replacer'
 
-if ActionMailer::VERSION::MAJOR < 3
-  require 'mail_safe/rails2_hook'
-else
-  require 'mail_safe/rails3_hook'
-end
+require 'mail_safe/rails_hook'

data/lib/mail_safe/address_replacer.rb

@@ -7,19 +7,18 @@ module MailSafe
         replaced_addresses = {}
 
         ADDRESS_TYPES.each do |address_type|
-          if addresses = mail.send(address_type)
+          if addresses = mail[address_type].try(:value)
             new_addresses = []
 
-            addresses.each do |a|
+            Array(addresses).each do |a|
               new_addresses << if MailSafe::Config.is_internal_address?(a)
-                a
-              else
-                (replaced_addresses[address_type] ||= []) << a
-                MailSafe::Config.get_replacement_address(a)
-              end
+                                 a
+                               else
+                                 (replaced_addresses[address_type] ||= []) << a
+                                 MailSafe::Config.get_replacement_address(a)
+                               end
             end
-
-            mail.send("#{address_type}=", new_addresses)
+            mail.send("#{address_type}=", new_addresses.uniq)
           end
         end
 
@@ -95,28 +94,9 @@ The original recipients were:
         add_postscript(part, postscript)
       end
 
-      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)
-          postscript = postscript.html_safe  if postscript.respond_to?(:html_safe)
-          part.body = part.body.to_s + postscript
-        end
+      def add_postscript(part, postscript)
+        postscript = postscript.html_safe  if postscript.respond_to?(:html_safe)
+        part.body = part.body.to_s + postscript
       end
     end
   end

data/lib/mail_safe/config.rb

@@ -29,13 +29,14 @@ module MailSafe
     def self.developer_email_address
       unless defined?(@@developer_email_address)
         @@developer_email_address = begin
-          `git config user.email`.chomp
+          `git config user.email`.strip
         rescue
           nil
         end
+        @@developer_email_address = nil  if @@developer_email_address.blank?
       end
 
       @@developer_email_address
     end
   end
-end
+end

data/lib/mail_safe/rails_hook.rb

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

data/lib/mail_safe/version.rb

@@ -0,0 +1,3 @@
+module MailSafe
+  VERSION = "0.3.2"
+end

data/mail_safe.gemspec

@@ -1,66 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "mail_safe/version"
 
-Gem::Specification.new do |s|
-  s.name = %q{mail_safe}
-  s.version = "0.3.1"
+Gem::Specification.new do |spec|
+  spec.name          = "mail_safe"
+  spec.version       = MailSafe::VERSION
+  spec.authors       = ["Myron Marston", "Juan José Conti"]
+  spec.email         = ["myron.marston@gmail.com", "jjconti@gmail.com"]
+  spec.summary       = %q{Keep your ActionMailer emails from escaping into the wild during development.}
+  spec.description   = %q{Mail safe provides a safety net while you"re developing an application that uses ActionMailer.
+                          It keeps emails from escaping into the wild.
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Myron Marston"]
-  s.date = %q{2010-10-14}
-  s.email = %q{myron.marston@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "autotest/discover.rb",
-     "ginger_scenarios.rb",
-     "lib/mail_safe.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",
-     "spec/config_spec.rb",
-     "spec/mailer_spec.rb",
-     "spec/mailers/test_mailer.rb",
-     "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.7}
-  s.summary = %q{Keep your ActionMailer emails from escaping into the wild during development.}
-  s.test_files = [
-    "spec/config_spec.rb",
-     "spec/mailer_spec.rb",
-     "spec/mailers/test_mailer.rb",
-     "spec/spec_helper.rb"
-  ]
+                          Once you"ve installed and configured this gem, you can rest assure that your app won"t send
+                          emails to external email addresses. Instead, emails that would normally be delivered to external
+                          addresses will be sent to an address of your choosing, and the body of the email will be appended
+                          with a note stating where the email was originally intended to go.}
+  spec.homepage      = "http://github.com/myronmarston/mail_safe"
+  spec.license       = "MIT"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<actionmailer>, [">= 1.3.6"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<actionmailer>, [">= 1.3.6"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<actionmailer>, [">= 1.3.6"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
+  spec.add_dependency "actionmailer", ">= 3.0.0"
+  spec.add_dependency "coveralls"
 
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", "~> 3.0", ">= 3.0.0"
+  spec.add_development_dependency "appraisal"
+end

data/spec/config_spec.rb

@@ -11,29 +11,29 @@ describe MailSafe::Config do
 
     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")
+        expect(MailSafe::Config).to 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'
+        expect(MailSafe::Config.developer_email_address).to eq('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
+        expect(MailSafe::Config.developer_email_address).to eq(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)
+        expect(MailSafe::Config).to receive(:`).with('git config user.email').once.and_return(nil)
       end
 
       it "returns nil" do
-        MailSafe::Config.developer_email_address.should be_nil
+        expect(MailSafe::Config.developer_email_address).to 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
+        expect(MailSafe::Config.developer_email_address).to eq(MailSafe::Config.developer_email_address)
       end
     end
   end
@@ -47,29 +47,29 @@ describe MailSafe::Config do
       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)
+          expect(MailSafe::Config).to 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
+          expect(MailSafe::Config.is_internal_address?(@developer_address)).to be_truthy
         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
+          expect(MailSafe::Config.is_internal_address?(@developer_address.upcase)).to be_truthy
         end
 
         it 'returns false when passed another email address' do
-          MailSafe::Config.is_internal_address?('another-address@domain.com').should be_false
+          expect(MailSafe::Config.is_internal_address?('another-address@domain.com')).to be_falsey
         end
       end
 
       context 'and #developer_email_address has no value' do
         before(:each) do
-          MailSafe::Config.should_receive(:developer_email_address).and_return(nil)
+          expect(MailSafe::Config).to 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)
+          expect { MailSafe::Config.is_internal_address?('abc@foo.com') }.to raise_error(MailSafe::InvalidConfigSettingError)
         end
       end
     end
@@ -80,11 +80,11 @@ describe MailSafe::Config do
       end
 
       it 'returns true if the address matches the regexp' do
-        MailSafe::Config.is_internal_address?('someone@example.com').should be_true
+        expect(MailSafe::Config.is_internal_address?('someone@example.com')).to be_truthy
       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
+        expect(MailSafe::Config.is_internal_address?('someone@another-domain.com')).to be_falsey
       end
     end
 
@@ -94,11 +94,11 @@ describe MailSafe::Config do
       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
+        expect(MailSafe::Config.is_internal_address?('abc@foo.com')).to be_truthy
       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
+        expect(MailSafe::Config.is_internal_address?('a-long-address@example.com')).to be_falsey
       end
     end
   end
@@ -110,7 +110,7 @@ describe MailSafe::Config do
       end
 
       it 'returns the configured replacement address' do
-        MailSafe::Config.get_replacement_address('you@example.com').should == 'me@mydomain.com'
+        expect(MailSafe::Config.get_replacement_address('you@example.com')).to eq('me@mydomain.com')
       end
     end
 
@@ -120,7 +120,7 @@ describe MailSafe::Config do
       end
 
       it 'returns the configured replacement address' do
-        MailSafe::Config.get_replacement_address('you@example.com').should == 'me+you@mydomain.com'
+        expect(MailSafe::Config.get_replacement_address('you@example.com')).to eq('me+you@mydomain.com')
       end
     end
 
@@ -132,21 +132,21 @@ describe MailSafe::Config do
       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)
+          expect(MailSafe::Config).to 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
+          expect(MailSafe::Config.get_replacement_address('you@example.com')).to eq(@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)
+          expect(MailSafe::Config).to 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)
+          expect { MailSafe::Config.get_replacement_address('you@example.com') }.to raise_error(MailSafe::InvalidConfigSettingError)
         end
       end
     end

data/spec/mailer_spec.rb

@@ -5,11 +5,7 @@ describe MailSafe do
   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
+    TestMailer.send(message_name, *args).deliver
   end
 
   RSpec::Matchers.define :have_addresses do |*expected|
@@ -18,34 +14,69 @@ describe MailSafe do
     end
   end
 
+  describe 'Delivering a plain text email to internal addresses with empty fields' do
+    before(:each) do
+      allow(MailSafe::Config).to receive(:is_internal_address?).and_return(true)
+      @email = deliver_message(:plain_text_message,
+                               :to => 'internal-to@address.com')
+    end
+
+    it 'sends the email to the original addresses and dont fail' do
+      expect(@email[:to].value).to have_addresses('internal-to@address.com')
+    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')
+      allow(MailSafe::Config).to receive(: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
+      expect(@email.to).to  have_addresses('internal-to@address.com')
+      expect(@email.cc).to  have_addresses('internal-cc@address.com')
+      expect(@email.bcc).to have_addresses('internal-bcc@address.com')
+    end
+
+    it 'does not add a post script to the body' do
+       expect(@email.body.to_s).not_to match(TEXT_POSTSCRIPT_PHRASE)
+    end
+  end
+
+  describe 'Delivering a plain text email to internal addresses with names' do
+    before(:each) do
+      allow(MailSafe::Config).to receive(:is_internal_address?).and_return(true)
+      @email = deliver_message(:plain_text_message,
+                               :to => 'Internal To <internal-to@address.com>',
+                               :bcc => 'Internal Bcc <internal-bcc@address.com>',
+                               :cc => 'Internal 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')
+      expect(@email[:to].value).to have_addresses('Internal To <internal-to@address.com>')
+      expect(@email[:cc].value).to have_addresses('Internal Cc <internal-cc@address.com>')
+      expect(@email[:bcc].value).to have_addresses('Internal Bcc <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
+      expect(@email.body.to_s).not_to match(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')
+      allow(MailSafe::Config).to receive(:is_internal_address?).and_return(false)
+      allow(MailSafe::Config).to receive(: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')
+      expect(@email.to).to  have_addresses('replacement@example.com')
+      expect(@email.cc).to  have_addresses('replacement@example.com')
+      expect(@email.bcc).to have_addresses('replacement@example.com')
     end
   end
 
@@ -67,13 +98,13 @@ describe MailSafe do
     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')
+      expect(@email.to).to  have_addresses('internal1@address.com', 'internal@domain.com')
+      expect(@email.cc).to  have_addresses('internal1@address.com', 'internal2@address.com')
+      expect(@email.bcc).to have_addresses('internal@domain.com')
     end
 
     it 'adds a plain text post script to the body' do
-      @email.body.to_s.should =~ TEXT_POSTSCRIPT_PHRASE
+      expect(@email.body.to_s).to match(TEXT_POSTSCRIPT_PHRASE)
     end
   end
 
@@ -83,7 +114,7 @@ describe MailSafe do
     end
 
     it 'adds an html post script to the body' do
-      @email.body.to_s.should =~ HTML_POSTSCRIPT_PHRASE
+      expect(@email.body.to_s).to match(HTML_POSTSCRIPT_PHRASE)
     end
   end
 
@@ -97,11 +128,11 @@ describe MailSafe do
     end
 
     it 'adds a text post script to the body of the text part' do
-      part(/text\/plain/).should =~ TEXT_POSTSCRIPT_PHRASE
+      expect(part(/text\/plain/)).to match(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
+      expect(part(/text\/html/)).to match(HTML_POSTSCRIPT_PHRASE)
     end
   end
 end

data/spec/mailers/test_mailer.rb

@@ -1,45 +1,37 @@
 class TestMailer < ActionMailer::Base
-  # template root must be set for multipart emails, or ActionMailer will throw an exception.
-  if ActionMailer::VERSION::MAJOR == 2
-    self.template_root = File.dirname(__FILE__)
-  end
 
   def plain_text_message(options)
-    setup_recipients(options)
-    from       'test@mailsafe.org'
-    subject    "Plain text Message Test"
-    body       "Here is the message body."
+    setup = setup_recipients(options)
+    mail({from: 'test@mailsafe.org',
+         subject: "Plain text Message Test"}.update(setup)) do |format|
+      format.text { render text: "Here is the message body." }
+    end
   end
 
   def html_message(options)
-    setup_recipients(options)
-    from       'test@mailsafe.org'
-    subject    "Html Message Test"
-    body       "<p>Here is the message body.</p>"
-    content_type 'text/html'
-
-    body(body.html_safe)  if body.respond_to?(:html_safe)
+    setup = setup_recipients(options)
+    body = "<p>Here is the message body.</p>"
+    body = body.html_safe  if body.respond_to?(:html_safe)
+    mail({from: 'test@mailsafe.org',
+         subject: "Html Message Test"}.update(setup)) do |format|
+      format.html { render text: body }
+    end
   end
 
   def multipart_message(options)
-    setup_recipients(options)
-    from       'test@mailsafe.org'
-    subject    "Html Message Test"
-
-    content_type 'multipart/alternative'
-
-    part :content_type => 'text/plain', :body => "Here is the message body."
-
+    setup = setup_recipients(options)
     html_body = "<p>Here is the message body.</p>"
     html_body = html_body.html_safe  if html_body.respond_to?(:html_safe)
-    part :content_type => 'text/html',  :body => html_body
+    mail({from: 'test@mailsafe.org',
+         subject: "Html Message Test"}.update(setup)) do |format|
+      format.text { render text: "Here is the message body." }
+      format.html { render text: html_body }
+    end
   end
 
   protected
 
   def setup_recipients(options)
-    recipients options[:to]
-    cc         options[:cc]
-    bcc        options[:bcc]
+    options.select { |k,_| [:to, :cc, :bcc].include? k }
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
-require 'rubygems'
+require "coveralls"
+Coveralls.wear!
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. vendor ginger lib])
-require 'ginger'
 require 'mail_safe'
 require 'mailers/test_mailer'
 
@@ -9,9 +8,7 @@ ActionMailer::Base.delivery_method = :test
 
 require 'rspec'
 RSpec.configure do |config|
-  config.color_enabled = true
-  config.debug = true
+  config.color = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end
-

metadata

@@ -1,118 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mail_safe
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Myron Marston
+- Juan José Conti
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-14 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 3
-        - 6
-        version: 1.3.6
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: 
-email: myron.marston@gmail.com
-executables: []
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |-
+  Mail safe provides a safety net while you"re developing an application that uses ActionMailer.
+                            It keeps emails from escaping into the wild.
 
+                            Once you"ve installed and configured this gem, you can rest assure that your app won"t send
+                            emails to external email addresses. Instead, emails that would normally be delivered to external
+                            addresses will be sent to an address of your choosing, and the body of the email will be appended
+                            with a note stating where the email was originally intended to go.
+email:
+- myron.marston@gmail.com
+- jjconti@gmail.com
+executables: []
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- README.rdoc
-files: 
-- .document
-- .gitignore
-- LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION.yml
-- autotest/discover.rb
-- ginger_scenarios.rb
+- gemfiles/actionmailer_3_2.gemfile
+- gemfiles/actionmailer_4_0.gemfile
+- gemfiles/actionmailer_4_1.gemfile
 - lib/mail_safe.rb
 - lib/mail_safe/address_replacer.rb
 - lib/mail_safe/config.rb
-- lib/mail_safe/rails2_hook.rb
-- lib/mail_safe/rails3_hook.rb
+- lib/mail_safe/rails_hook.rb
+- lib/mail_safe/version.rb
 - mail_safe.gemspec
 - spec/config_spec.rb
 - spec/mailer_spec.rb
 - spec/mailers/test_mailer.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/myronmarston/mail_safe
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+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.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Keep your ActionMailer emails from escaping into the wild during development.
-test_files: 
+test_files:
 - spec/config_spec.rb
 - spec/mailer_spec.rb
 - spec/mailers/test_mailer.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION.yml

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

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { 'rspec2' }

data/ginger_scenarios.rb

@@ -1,43 +0,0 @@
-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"
-
-  # Rails 3 doesn't work on Ruby 1.8.6 or 1.9.1 so skip it.
-  if RUBY_VERSION == '1.8.7'
-    rails3 = create_scenario('3.0.0')
-    rails3['mail'] = '2.2.7'
-    config.scenarios << rails3
-  end
-
-  %w( 2.3.9 2.3.8 2.3.5 2.3.4 2.3.3 2.3.2 ).each do |version|
-    config.scenarios << create_scenario(version)
-  end
-
-  # Rails 2.3 was the first version that ran on ruby 1.9, so don't bother testing older versions.
-  if RUBY_VERSION =~ /^1\.8/
-    %w(
-    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
-end

data/lib/mail_safe/rails2_hook.rb

@@ -1,16 +0,0 @@
-module MailSafe
-  module ActionMailer
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :deliver!, :mail_safe
-      end
-    end
-
-    def deliver_with_mail_safe!(mail = @mail)
-      MailSafe::AddressReplacer.replace_external_addresses(mail) if mail
-      deliver_without_mail_safe!(mail)
-    end
-  end
-end
-
-ActionMailer::Base.send(:include, MailSafe::ActionMailer) unless ActionMailer::Base.ancestors.include?(MailSafe::ActionMailer)

data/lib/mail_safe/rails3_hook.rb

@@ -1,11 +0,0 @@
-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