sanitize_email 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fdeb24b19f1398c5541c1ac64d76181662ff475
-  data.tar.gz: 9f08881fb0027324fc4487f2f9cca2044df2a3bb
+  metadata.gz: 64c390a96c6347527bd9d4b0833a65ad16e3a837
+  data.tar.gz: 02b106a696439a87a0001370d25316d7df494340
 SHA512:
-  metadata.gz: caf6b42229c732c67b5372cc2862e089e4abaa23f6fe25c8e46719ba4f1538a7ac67f220d637b28f235e25b6b38b18934a4dba6fe4e3e72d33acfad72e7caaf8
-  data.tar.gz: 450f79a5192e17f271f28adabca2cdac943cdddd5699bb380e3e3292294865c4a8eb21ba8021e4abf2e27b34c32f53c21f7f5ce92af6288b625039684917d4d9
+  metadata.gz: 8854adb0d44027a38fde49d390c1d9f1e43e149800ff0f87e67f110427f646ae355e18bf42880d1f5449f9df2c4b621ec707c1f5db8560a2f85041bdf5041906
+  data.tar.gz: 2b13251443bf8ad2f63dd7e4bdb41d721e373842907e3d3913bd1b8f952eddd258ac66a447bee79c3d3cacbf0745cdbd593eb7e269b0fd84f6c69d8c92de7cce

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p448
+ruby-2.2.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 1.1.6 - AUG.29.2015
+* spec run as default rake task & improve Rakefile syntax by Peter Boling
+* prevent direct configuration via `DEFAULTS` from working, as that is not the API by Peter Boling
+* better gem summary: "Email Condom for your Ruby Server" by Peter Boling
+* Improve specs and spec config by Peter Boling
+
 Version 1.1.5 - MAR.10.2015
 * Refactored `prepend_subject_array` by Scott Rocher
 * Specs for prepending to subject by Scott Rocher

data/README.md

@@ -1,6 +1,6 @@
 # sanitize_email
 
-This gem allows you to override your mail delivery settings, globally or in a local context.
+This gem allows you to override your mail delivery settings, globally or in a local context.  It is like a Ruby encrusted condom for your email server, just in case it decides to have intercourse with other servers via sundry mail protocols.
 
 | Project                 |  Sanitize Email   |
 |------------------------ | ----------------- |
@@ -70,21 +70,29 @@ Then:
 
 There are four ways SanitizeEmail can be turned on; in order of precedence they are:
 
-1. SanitizeEmail.force_sanitize = true # by default it is nil
-    Only useful for local context.  Inside a method where you will be sending an email,
-    set SanitizeEmail.force_sanitize = true just prior to delivering it.  Also useful in the console.
-2. Mail.register_interceptor(SanitizeEmail::Bleach.new(:engage => true)) # by default it is nil
-    If SanitizeEmail seems to not be sanitizing you have probably not registered the interceptor.  SanitizeEmail tries to do this for you.
-    Note: If you are working in an environment that has a Mail or Mailer class that uses the register_interceptor API, the interceptor will already have been registered by SanitizeEmail (however, note lack of :engage => true):
+1. Only useful for local context.  Inside a method where you will be sending an email, set SanitizeEmail.force_sanitize = true just prior to delivering it.  Also useful in the console.
+
+        SanitizeEmail.force_sanitize = true # by default it is nil
+
+2. If SanitizeEmail seems to not be sanitizing you have probably not registered the interceptor.  SanitizeEmail tries to do this for you. *Note*: If you are working in an environment that has a Mail or Mailer class that uses the register_interceptor API, the interceptor will already have been registered by SanitizeEmail (however, note lack of `:engage => true):
+
+        Mail.register_interceptor(SanitizeEmail::Bleach.new(:engage => true)) # by default :engage is nil
 
-        Mail.register_interceptor(SanitizeEmail::Bleach.new
     Without :engage => true the interceptor is inactive, and will require engaging via one of the other methods.
+
+        Mail.register_interceptor(SanitizeEmail::Bleach.new)
+
     As an example you could do the following to engage SanitizeEmail:
 
         SanitizeEmail::Config.configure {|config| config[:engage] = true }
-3. SanitizeEmail::Config.configure {|config| config[:activation_proc] = Proc.new { true } } # by default it is false
-    If you don't need to compute anything, then don't use the Proc, go with the next option.
-4. SanitizeEmail::Config.configure {|config| config[:engage] = true } # by default it is nil
+
+3. If you don't need to compute anything, then don't use this option, go with the next option.
+
+        SanitizeEmail::Config.configure {|config| config[:activation_proc] = Proc.new { true } } # by default :activation_proc is false
+
+4. This will turn it on.  Period.
+
+        SanitizeEmail::Config.configure {|config| config[:engage] = true } # by default :engage is nil
 
 ### Notes
 

data/Rakefile

@@ -1,48 +1,47 @@
 # encoding: utf-8
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
-require 'rake'
+require "rake"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+begin
+  require "rspec/core/rake_task"
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+rescue LoadError
 end
 
-require 'reek/rake/task'
+require "reek/rake/task"
 Reek::Rake::Task.new do |t|
   t.fail_on_error = true
   t.verbose = false
-  t.source_files = 'lib/**/*.rb'
+  t.source_files = "lib/**/*.rb"
 end
 
-require 'roodi'
-require 'roodi_task'
+require "roodi"
+require "roodi_task"
 RoodiTask.new do |t|
   t.verbose = false
 end
 
-task :default => :spec
-
 namespace :test do
-  desc 'Test against all supported Rails versions'
+  desc "Test against all supported Rails versions"
   task :all do
     %w(3.0.x 3.1.x 3.2.x 4.0.x).each do |version|
-      sh "BUNDLE_GEMFILE='gemfiles/Gemfile.rails-#{version}' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/Gemfile.rails-#{version}' bundle exec rspec spec"
+      sh %[BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle --quiet]
+      sh %[BUNDLE_GEMFILE="gemfiles/Gemfile.rails-#{version}" bundle exec rspec spec]
     end
   end
 end
 
-require File.expand_path('../lib/sanitize_email/version', __FILE__)
-require 'rdoc'
-require 'rdoc/task'
+require File.expand_path("../lib/sanitize_email/version", __FILE__)
+require "rdoc"
+require "rdoc/task"
 RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = "rdoc"
   rdoc.title    = "SanitizeEmail #{SanitizeEmail::VERSION}"
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 Bundler::GemHelper.install_tasks

data/lib/sanitize_email/config.rb

@@ -44,7 +44,7 @@ module SanitizeEmail
       :activation_proc => Proc.new { false }
     }
 
-    @config ||= DEFAULTS
+    @config ||= DEFAULTS.dup
     def self.configure &block
       yield @config
 

data/lib/sanitize_email/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2008-13 Peter H. Boling of RailsBling.com
 # Released under the MIT license
 module SanitizeEmail
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/sanitize_email.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = SanitizeEmail::VERSION
 
   s.authors = ["Peter Boling", "John Trupiano", "George Anderson"]
-  s.summary = "Rails/Sinatra/Mail gem: Test email abilities without ever sending a message to actual live addresses"
+  s.summary = "Email Condom for your Ruby Server"
   s.description = "In Rails, Sinatra, or simply the mail gem: Aids in development, testing, qa, and production troubleshooting of email issues without worrying that emails will get sent to actual live addresses."
   s.email = ["peter.boling@gmail.com"]
   s.extra_rdoc_files = [
@@ -27,19 +27,19 @@ Gem::Specification.new do |s|
   # A project wanting to use this gem's engine/railtie will be expected to have already loaded the rails/railtie gem.
   #s.add_dependency "railties", ">= 3.2"
   # to replace the cattr_accessor method we lost when removing rails from run time dependencies
-  #s.add_runtime_dependency(%q<facets>, ["> 0"])
+  #s.add_runtime_dependency("facets", ["> 0"])
 
   # Development Dependencies
-  s.add_development_dependency(%q<rails>, [">= 3.0"])
-  s.add_development_dependency(%q<actionmailer>, [">= 3.0"])
-  s.add_development_dependency(%q<letter_opener>, [">= 0"])
-  s.add_development_dependency(%q<launchy>, [">= 0"])
-  s.add_development_dependency(%q<rspec>, [">= 2.11"])
-  s.add_development_dependency(%q<mail>, [">= 0"])
-  s.add_development_dependency(%q<rdoc>, [">= 3.12"])
-  s.add_development_dependency(%q<reek>, [">= 1.2.8"])
-  s.add_development_dependency(%q<roodi>, [">= 2.1.0"])
-  s.add_development_dependency(%q<rake>, [">= 0"])
-  s.add_development_dependency "coveralls"
+  s.add_development_dependency("rails", [">= 3.0"])
+  s.add_development_dependency("actionmailer", [">= 3.0"])
+  s.add_development_dependency("letter_opener", [">= 0"])
+  s.add_development_dependency("launchy", [">= 0"])
+  s.add_development_dependency("rspec", [">= 3"])
+  s.add_development_dependency("mail", [">= 0"])
+  s.add_development_dependency("rdoc", [">= 3.12"])
+  s.add_development_dependency("reek", [">= 1.2.8"])
+  s.add_development_dependency("roodi", [">= 2.1.0"])
+  s.add_development_dependency("rake", [">= 0"])
+  s.add_development_dependency("pry", [">= 0"])
+  s.add_development_dependency("coveralls")
 end
-

data/spec/sanitize_email_spec.rb

@@ -29,29 +29,30 @@ describe SanitizeEmail do
   end
 
   def sanitize_spec_dryer(rails_env = 'test')
-    Launchy.stub(:open)
+    allow(Launchy).to receive(:open)
     location = File.expand_path('../tmp/mail_dump', __FILE__)
-    FileUtils.rm_rf(location)
+    FileUtils.remove_file(location, true)
     Mail.defaults do
       delivery_method LetterOpener::DeliveryMethod, :location => location
     end
-    Rails.stub(:env).and_return(rails_env)
+    allow(Rails).to receive(:env).and_return(rails_env)
   end
 
   def configure_sanitize_email(sanitize_hash = {})
     options = DEFAULT_TEST_CONFIG.merge(sanitize_hash).dup
     options.reverse_merge!({ :sanitized_to => 'to@sanitize_email.org' }) unless sanitize_hash.has_key?(:sanitized_recipients)
     SanitizeEmail::Config.configure do |config|
-      config[:activation_proc] =      options[:activation_proc]
-      config[:sanitized_to] =         options[:sanitized_to]
-      config[:sanitized_cc] =         options[:sanitized_cc]
-      config[:sanitized_bcc] =        options[:sanitized_bcc]
+      config[:environment] = options[:environment]
+      config[:activation_proc] = options[:activation_proc]
+      config[:sanitized_to] = options[:sanitized_to]
+      config[:sanitized_cc] = options[:sanitized_cc]
+      config[:sanitized_bcc] = options[:sanitized_bcc]
       config[:use_actual_email_prepended_to_subject] = options[:use_actual_email_prepended_to_subject]
       config[:use_actual_environment_prepended_to_subject] = options[:use_actual_environment_prepended_to_subject]
       config[:use_actual_email_as_sanitized_user_name] = options[:use_actual_email_as_sanitized_user_name]
 
       # For testing *deprecated* configuration options:
-      config[:local_environments] =   options[:local_environments] if options[:local_environments]
+      config[:local_environments] = options[:local_environments] if options[:local_environments]
       config[:sanitized_recipients] = options[:sanitized_recipients] if options[:sanitized_recipients]
       config[:force_sanitize] = options[:force_sanitize] unless options[:force_sanitize].nil?
     end
@@ -137,24 +138,24 @@ describe SanitizeEmail do
         unsanitary_mail_delivery
       end
       it "should not alter non-sanitized attributes" do
-        @email_message.should have_from('from@example.org')
-        @email_message.should have_reply_to('reply_to@example.org')
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('from@example.org')
+        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_body_text('funky fresh')
       end
       it "should not prepend overrides" do
-        @email_message.should_not have_to_username("to at sanitize_email.org")
-        @email_message.should_not have_subject("(to at sanitize_email.org)")
+        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+        expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
       end
       it "alters nothing" do
-        @email_message.should have_from('from@example.org')
-        @email_message.should have_reply_to('reply_to@example.org')
-        @email_message.should have_from("from@example.org")
-        @email_message.should have_to("to@example.org")
-        @email_message.should_not have_to_username("to at")
-        @email_message.should have_cc("cc@example.org")
-        @email_message.should have_bcc("bcc@example.org")
-        @email_message.should have_subject("original subject")
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('from@example.org')
+        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_from("from@example.org")
+        expect(@email_message).to have_to("to@example.org")
+        expect(@email_message).not_to have_to_username("to at")
+        expect(@email_message).to have_cc("cc@example.org")
+        expect(@email_message).to have_bcc("bcc@example.org")
+        expect(@email_message).to have_subject("original subject")
+        expect(@email_message).to have_body_text('funky fresh')
       end
     end
 
@@ -164,27 +165,27 @@ describe SanitizeEmail do
         sanitary_mail_delivery
       end
       it "should not alter non-sanitized attributes" do
-        @email_message.should have_from('from@example.org')
-        @email_message.should have_reply_to('reply_to@example.org')
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('from@example.org')
+        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_body_text('funky fresh')
       end
       it "should not prepend overrides" do
-        @email_message.should_not have_to_username("to at sanitize_email.org")
-        @email_message.should_not have_subject("(to at sanitize_email.org)")
+        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+        expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
       end
       it "should override" do
-        @email_message.should have_to("to@sanitize_email.org")
-        @email_message.should have_cc("cc@sanitize_email.org")
-        @email_message.should have_bcc("bcc@sanitize_email.org")
+        expect(@email_message).to have_to("to@sanitize_email.org")
+        expect(@email_message).to have_cc("cc@sanitize_email.org")
+        expect(@email_message).to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers" do
-        @email_message.should have_header("X-Sanitize-Email-To", "to@example.org")
-        @email_message.should have_header("X-Sanitize-Email-Cc", "cc@example.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
       end
       it "should not prepend originals by default" do
-        @email_message.should_not have_to_username("to at example.org <to@sanitize_email.org>")
-        @email_message.should_not have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
+        expect(@email_message).not_to have_subject("(to at example.org) original subject")
       end
     end
 
@@ -194,43 +195,43 @@ describe SanitizeEmail do
         sanitary_mail_delivery_multiple_recipients
       end
       it "should not alter non-sanitized attributes" do
-        @email_message.should have_from('from@example.org')
-        @email_message.should have_reply_to('reply_to@example.org')
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('from@example.org')
+        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_body_text('funky fresh')
       end
       it "should not prepend overrides" do
-        @email_message.should_not have_to_username("to at sanitize_email.org")
-        @email_message.should_not have_subject("(to at sanitize_email.org)")
+        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+        expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
       end
       it "should override" do
-        @email_message.should have_to("to@sanitize_email.org")
-        @email_message.should have_cc("cc@sanitize_email.org")
-        @email_message.should have_bcc("bcc@sanitize_email.org")
+        expect(@email_message).to have_to("to@sanitize_email.org")
+        expect(@email_message).to have_cc("cc@sanitize_email.org")
+        expect(@email_message).to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers for sanitized :to recipients" do
-        @email_message.should have_header("X-Sanitize-Email-To", "to1@example.org")
-        @email_message.should_not have_header("X-Sanitize-Email-To-0", "to1@example.org")
-        @email_message.should_not have_header("X-Sanitize-Email-To-1", "to1@example.org")
-        @email_message.should have_header("X-Sanitize-Email-To-2", "to2@example.org")
-        @email_message.should have_header("X-Sanitize-Email-To-3", "to3@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To", "to1@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-To-0", "to1@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-To-1", "to1@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To-2", "to2@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To-3", "to3@example.org")
       end
       it "should set headers for sanitized :cc recipients" do
-        @email_message.should have_header("X-Sanitize-Email-Cc", "cc1@example.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Cc-0", "cc1@example.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Cc-1", "cc1@example.org")
-        @email_message.should have_header("X-Sanitize-Email-Cc-2", "cc2@example.org")
-        @email_message.should have_header("X-Sanitize-Email-Cc-3", "cc3@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc1@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc-0", "cc1@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc-1", "cc1@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc-2", "cc2@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc-3", "cc3@example.org")
       end
       it "should not set headers for sanitized :bcc recipients" do
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc1@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc-0", "bcc1@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc-1", "bcc1@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc-2", "bcc2@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc-3", "bcc3@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc1@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-0", "bcc1@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-1", "bcc1@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-2", "bcc2@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc-3", "bcc3@sanitize_email.org")
       end
       it "should not prepend originals by default" do
-        @email_message.should_not have_to_username("to at example.org <to@sanitize_email.org>")
-        @email_message.should_not have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
+        expect(@email_message).not_to have_subject("(to at example.org) original subject")
       end
     end
 
@@ -241,43 +242,43 @@ describe SanitizeEmail do
         mail_delivery
       end
       it "original to is prepended to subject" do
-        @email_message.should have_subject(/\(to at example.org\).*original subject/)
+        expect(@email_message).to have_subject(/\(to at example.org\).*original subject/)
       end
       it "original to is only prepended once to subject" do
-        @email_message.should_not have_subject(/\(to at example.org\).*\(to at example.org\).*original subject/)
+        expect(@email_message).not_to have_subject(/\(to at example.org\).*\(to at example.org\).*original subject/)
       end
       it "should not alter non-sanitized attributes" do
-        @email_message.should have_from('from@example.org')
-        @email_message.should have_reply_to('reply_to@example.org')
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('from@example.org')
+        expect(@email_message).to have_reply_to('reply_to@example.org')
+        expect(@email_message).to have_body_text('funky fresh')
       end
       it "should not prepend overrides" do
-        @email_message.should_not have_to_username("to at sanitize_email.org")
-        @email_message.should_not have_subject(/.*\(to at sanitize_email.org\).*/)
+        expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+        expect(@email_message).not_to have_subject(/.*\(to at sanitize_email.org\).*/)
       end
       it "should override where original recipients were not nil" do
-        @email_message.should have_to("funky@sanitize_email.org")
+        expect(@email_message).to have_to("funky@sanitize_email.org")
       end
       it "should not override where original recipients were nil" do
-        @email_message.should_not have_cc("cc@sanitize_email.org")
-        @email_message.should_not have_bcc("bcc@sanitize_email.org")
+        expect(@email_message).not_to have_cc("cc@sanitize_email.org")
+        expect(@email_message).not_to have_bcc("bcc@sanitize_email.org")
       end
       it "should set headers of originals" do
-        @email_message.should have_header("X-Sanitize-Email-To", "to@example.org")
-        @email_message.should have_header("X-Sanitize-Email-Cc", "cc@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
       end
       it "should not set headers of bcc" do
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
       end
       it "should not set headers of overrides" do
-        @email_message.should_not have_header("X-Sanitize-Email-To", "funky@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Cc", "cc@sanitize_email.org")
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-To", "funky@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@sanitize_email.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
         #puts "email headers:\n#{@email_message.header}"
       end
       it "should not prepend originals by default" do
-        @email_message.should_not have_to_username("to at example.org <to@sanitize_email.org>")
-        @email_message.should_not have_subject("(to at example.org) original subject")
+        expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
+        expect(@email_message).not_to have_subject("(to at example.org) original subject")
       end
     end
 
@@ -288,40 +289,40 @@ describe SanitizeEmail do
         mail_delivery_hot_mess
       end
       it "original to is prepended to subject" do
-        @email_message.should have_subject(/\(same at example.org\).*original subject/)
+        expect(@email_message).to have_subject(/\(same at example.org\).*original subject/)
       end
       it "original to is only prepended once to subject" do
-        @email_message.should_not have_subject(/\(same at example.org\).*\(same at example.org\).*original subject/)
+        expect(@email_message).not_to have_subject(/\(same at example.org\).*\(same at example.org\).*original subject/)
       end
       it "should not alter non-sanitized attributes" do
-        @email_message.should have_from('same@example.org')
-        @email_message.should have_reply_to('same@example.org')
-        @email_message.should have_body_text('funky fresh')
+        expect(@email_message).to have_from('same@example.org')
+        expect(@email_message).to have_reply_to('same@example.org')
+        expect(@email_message).to have_body_text('funky fresh')
       end
       it "should not prepend overrides" do
-        @email_message.should_not have_to_username("same at example.org")
+        expect(@email_message).not_to have_to_username("same at example.org")
       end
       it "should override where original recipients were not nil" do
-        @email_message.should have_to("same@example.org")
+        expect(@email_message).to have_to("same@example.org")
       end
       it "should not override where original recipients were nil" do
-        @email_message.should_not have_cc("same@example.org")
-        @email_message.should_not have_bcc("same@example.org")
+        expect(@email_message).not_to have_cc("same@example.org")
+        expect(@email_message).not_to have_bcc("same@example.org")
       end
       it "should set headers of originals" do
-        @email_message.should have_header("X-Sanitize-Email-To", "same@example.org")
-        @email_message.should have_header("X-Sanitize-Email-Cc", "same@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-To", "same@example.org")
+        expect(@email_message).to have_header("X-Sanitize-Email-Cc", "same@example.org")
       end
       it "should not set headers of bcc" do
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "same@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "same@example.org")
       end
       it "should not set headers of overrides" do
-        @email_message.should_not have_header("X-Sanitize-Email-Bcc", "same@example.org")
+        expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "same@example.org")
         puts "email headers:\n#{@email_message.header}"
       end
       it "should not prepend originals by default" do
-        @email_message.should_not have_to_username("same at example.org <same@example.org>")
-        @email_message.should_not have_subject("(same at example.org) original subject")
+        expect(@email_message).not_to have_to_username("same at example.org <same@example.org>")
+        expect(@email_message).not_to have_subject("(same at example.org) original subject")
       end
     end
 
@@ -334,19 +335,19 @@ describe SanitizeEmail do
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should override" do
-          @email_message.should have_to("to@sanitize_email.org")
-          @email_message.should have_cc("cc@sanitize_email.org")
-          @email_message.should have_bcc("bcc@sanitize_email.org")
+          expect(@email_message).to have_to("to@sanitize_email.org")
+          expect(@email_message).to have_cc("cc@sanitize_email.org")
+          expect(@email_message).to have_bcc("bcc@sanitize_email.org")
         end
         it "should set headers" do
-          @email_message.should have_header("X-Sanitize-Email-To", "to@example.org")
-          @email_message.should have_header("X-Sanitize-Email-Cc", "cc@example.org")
-          @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+          expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
+          expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+          expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
         end
       end
       context "false" do
@@ -357,17 +358,17 @@ describe SanitizeEmail do
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not alter normally sanitized attributes" do
-          @email_message.should have_to("to@example.org")
-          @email_message.should have_cc("cc@example.org")
-          @email_message.should have_bcc("bcc@example.org")
-          @email_message.should_not have_header("X-Sanitize-Email-To", "to@example.org")
-          @email_message.should_not have_header("X-Sanitize-Email-Cc", "cc@example.org")
-          @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
+          expect(@email_message).to have_to("to@example.org")
+          expect(@email_message).to have_cc("cc@example.org")
+          expect(@email_message).to have_bcc("bcc@example.org")
+          expect(@email_message).not_to have_header("X-Sanitize-Email-To", "to@example.org")
+          expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+          expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
         end
       end
       context "nil" do
@@ -380,17 +381,17 @@ describe SanitizeEmail do
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            @email_message.should have_from('from@example.org')
-            @email_message.should have_reply_to('reply_to@example.org')
-            @email_message.should have_body_text('funky fresh')
+            expect(@email_message).to have_from('from@example.org')
+            expect(@email_message).to have_reply_to('reply_to@example.org')
+            expect(@email_message).to have_body_text('funky fresh')
           end
           it "should override" do
-            @email_message.should have_to("to@sanitize_email.org")
-            @email_message.should have_cc("cc@sanitize_email.org")
-            @email_message.should have_bcc("bcc@sanitize_email.org")
-            @email_message.should have_header("X-Sanitize-Email-To", "to@example.org")
-            @email_message.should have_header("X-Sanitize-Email-Cc", "cc@example.org")
-            @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
+            expect(@email_message).to have_to("to@sanitize_email.org")
+            expect(@email_message).to have_cc("cc@sanitize_email.org")
+            expect(@email_message).to have_bcc("bcc@sanitize_email.org")
+            expect(@email_message).to have_header("X-Sanitize-Email-To", "to@example.org")
+            expect(@email_message).to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+            expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@sanitize_email.org")
           end
         end
         context "activation proc disables" do
@@ -402,17 +403,17 @@ describe SanitizeEmail do
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            @email_message.should have_from('from@example.org')
-            @email_message.should have_reply_to('reply_to@example.org')
-            @email_message.should have_body_text('funky fresh')
+            expect(@email_message).to have_from('from@example.org')
+            expect(@email_message).to have_reply_to('reply_to@example.org')
+            expect(@email_message).to have_body_text('funky fresh')
           end
           it "should not alter normally sanitized attributes" do
-            @email_message.should have_to("to@example.org")
-            @email_message.should have_cc("cc@example.org")
-            @email_message.should have_bcc("bcc@example.org")
-            @email_message.should_not have_header("X-Sanitize-Email-To", "to@example.org")
-            @email_message.should_not have_header("X-Sanitize-Email-Cc", "cc@example.org")
-            @email_message.should_not have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
+            expect(@email_message).to have_to("to@example.org")
+            expect(@email_message).to have_cc("cc@example.org")
+            expect(@email_message).to have_bcc("bcc@example.org")
+            expect(@email_message).not_to have_header("X-Sanitize-Email-To", "to@example.org")
+            expect(@email_message).not_to have_header("X-Sanitize-Email-Cc", "cc@example.org")
+            expect(@email_message).not_to have_header("X-Sanitize-Email-Bcc", "bcc@example.org")
           end
         end
       end
@@ -423,41 +424,40 @@ describe SanitizeEmail do
     context ":use_actual_environment_prepended_to_subject" do
       context "true" do
         before(:each) do
-          sanitize_spec_dryer('test')
-          configure_sanitize_email({:use_actual_environment_prepended_to_subject => true})
+          configure_sanitize_email({:environment => "{{serverABC}}", :use_actual_environment_prepended_to_subject => true})
           sanitary_mail_delivery
         end
         it "original to is prepended" do
-          @email_message.should have_subject("[test] original subject")
+          expect(@email_message).to have_subject("{{serverABC}} original subject")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
       context "false" do
         before(:each) do
           sanitize_spec_dryer('test')
-          configure_sanitize_email({:use_actual_environment_prepended_to_subject => false})
+          configure_sanitize_email({:environment => "{{serverABC}}", :use_actual_environment_prepended_to_subject => false})
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          @email_message.should_not have_subject("[test] original subject")
-          @email_message.subject.should eq("original subject")
+          expect(@email_message).not_to have_subject("{{serverABC}} original subject")
+          expect(@email_message.subject).to eq("original subject")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
     end
@@ -470,16 +470,16 @@ describe SanitizeEmail do
           sanitary_mail_delivery
         end
         it "original to is prepended" do
-          @email_message.should have_subject("(to at example.org) original subject")
+          expect(@email_message).to have_subject("(to at example.org) original subject")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
       context "false" do
@@ -489,16 +489,16 @@ describe SanitizeEmail do
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          @email_message.should_not have_subject("(to at example.org) original subject")
+          expect(@email_message).not_to have_subject("(to at example.org) original subject")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
     end
@@ -511,16 +511,16 @@ describe SanitizeEmail do
           sanitary_mail_delivery
         end
         it "original to is munged and prepended" do
-          @email_message.should have_to_username("to at example.org <to@sanitize_email.org>")
+          expect(@email_message).to have_to_username("to at example.org <to@sanitize_email.org>")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
       context "false" do
@@ -530,16 +530,16 @@ describe SanitizeEmail do
           sanitary_mail_delivery
         end
         it "original to is not prepended" do
-          @email_message.should_not have_to_username("to at example.org <to@sanitize_email.org>")
+          expect(@email_message).not_to have_to_username("to at example.org <to@sanitize_email.org>")
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not prepend overrides" do
-          @email_message.should_not have_to_username("to at sanitize_email.org")
-          @email_message.should_not have_subject("(to at sanitize_email.org)")
+          expect(@email_message).not_to have_to_username("to at sanitize_email.org")
+          expect(@email_message).not_to have_subject("(to at sanitize_email.org)")
         end
       end
     end
@@ -553,36 +553,36 @@ describe SanitizeEmail do
           before(:each) do
             sanitize_spec_dryer('test')
             configure_sanitize_email({:local_environments => ['test']})
-            SanitizeEmail[:activation_proc].call.should == true
+            expect(SanitizeEmail[:activation_proc].call).to eq(true)
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            @email_message.should have_from('from@example.org')
-            @email_message.should have_reply_to('reply_to@example.org')
-            @email_message.should have_body_text('funky fresh')
+            expect(@email_message).to have_from('from@example.org')
+            expect(@email_message).to have_reply_to('reply_to@example.org')
+            expect(@email_message).to have_body_text('funky fresh')
           end
           it "should use activation_proc for matching environment" do
-            @email_message.should have_to("to@sanitize_email.org")
-            @email_message.should have_cc("cc@sanitize_email.org")
-            @email_message.should have_bcc("bcc@sanitize_email.org")
+            expect(@email_message).to have_to("to@sanitize_email.org")
+            expect(@email_message).to have_cc("cc@sanitize_email.org")
+            expect(@email_message).to have_bcc("bcc@sanitize_email.org")
           end
         end
         context "non-matching" do
           before(:each) do
             sanitize_spec_dryer('production')
             configure_sanitize_email({:local_environments => ['development']}) # Won't match!
-            SanitizeEmail[:activation_proc].call.should == false
+            expect(SanitizeEmail[:activation_proc].call).to eq(false)
             mail_delivery
           end
           it "should not alter non-sanitized attributes" do
-            @email_message.should have_from('from@example.org')
-            @email_message.should have_reply_to('reply_to@example.org')
-            @email_message.should have_body_text('funky fresh')
+            expect(@email_message).to have_from('from@example.org')
+            expect(@email_message).to have_reply_to('reply_to@example.org')
+            expect(@email_message).to have_body_text('funky fresh')
           end
           it "should use activation_proc for non-matching environment" do
-            @email_message.should have_to("to@example.org")
-            @email_message.should have_cc("cc@example.org")
-            @email_message.should have_bcc("bcc@example.org")
+            expect(@email_message).to have_to("to@example.org")
+            expect(@email_message).to have_cc("cc@example.org")
+            expect(@email_message).to have_bcc("bcc@example.org")
           end
         end
       end
@@ -594,12 +594,12 @@ describe SanitizeEmail do
           sanitary_mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "used as sanitized_to" do
-          @email_message.should have_to("barney@sanitize_email.org")
+          expect(@email_message).to have_to("barney@sanitize_email.org")
         end
       end
 
@@ -611,12 +611,12 @@ describe SanitizeEmail do
           mail_delivery
         end
         it "should not alter non-sanitized attributes" do
-          @email_message.should have_from('from@example.org')
-          @email_message.should have_reply_to('reply_to@example.org')
-          @email_message.should have_body_text('funky fresh')
+          expect(@email_message).to have_from('from@example.org')
+          expect(@email_message).to have_reply_to('reply_to@example.org')
+          expect(@email_message).to have_body_text('funky fresh')
         end
         it "should not alter normally sanitized attributes" do
-          @email_message.should have_to("to@example.org")
+          expect(@email_message).to have_to("to@example.org")
         end
       end
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'mail'
 require 'rails'
 require 'letter_opener'
 require 'action_mailer'
+require 'pry'
 
 # For code coverage, must be required before all application / gem / library code.
 require 'coveralls'
@@ -19,10 +20,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
   config.include SanitizeEmail::RspecMatchers
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanitize_email
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Peter Boling
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -229,12 +243,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: 'Rails/Sinatra/Mail gem: Test email abilities without ever sending a message
-  to actual live addresses'
+summary: Email Condom for your Ruby Server
 test_files:
 - spec/sanitize_email_spec.rb
 - spec/spec_helper.rb
-has_rdoc: