sanitize_email 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,4 +1,12 @@
-Version 1.0.0.rc4 - AUG.11.2012
+Version 1.0.3 - AUG.12.2012
+- Accidentally broke spec suite with 1.0.2 - fixed
+- Expanded spec suite
+- Split test_helpers from rspec_matchers (test_helpers may be useful in TestUnit
+- Moving Examples from README to wiki
+- Document and implement working deprecation of version 0's SanitizeEmail::Config.config[:force_sanitize] behavior
+  - Now use SanitizeEmail.force_sanitize = true # or false or nil
+
+Version 1.0.2 - AUG.11.2012
 - Massive improvement to spec suite, and found bleeding
   - needed to unregister the interceptors:
     - Mail.class_variable_get(:@@delivery_interceptors).pop
@@ -8,9 +16,11 @@ Version 1.0.0.rc4 - AUG.11.2012
   - Force Sanitization On for a block
 - Added SanitizeEmail.unsanitary &block
   - Force Sanitization Off for a block
-- Added SanitizeEmail.force_sanitize = true # or false
+- Added SanitizeEmail.force_sanitize = true # or false or nil
   - Force Sanitization On or Off
 
+Version 1.0.1 - Unintentional, unexpected bump behavior from gem-release gem (Issues #24 & #25)
+
 Version 1.0.0.rc3 - AUG.08.2012
 - Forgot to switch from jeweler to gem-release, so making appropriate changes and bumping again
 - Aligning closer to bundler gem defaults

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sanitize_email (1.0.0.rc3)
+    sanitize_email (1.0.2)
       facets (> 0)
 
 GEM

data/lib/sanitize_email/bleach.rb

@@ -171,6 +171,7 @@ module SanitizeEmail
       return sanitized_addresses unless SanitizeEmail.use_actual_email_as_sanitized_user_name
 
       with_user_names = self.inject_user_names(real_addresses, sanitized_addresses)
+#puts "real_addresses 2: #{real_addresses}"
 #puts "override_email 5: #{type} - #{with_user_names}"
       # Otherwise inject the email as the 'user name'
       return with_user_names

data/lib/sanitize_email/config.rb

@@ -3,10 +3,9 @@ require 'facets/module/mattr' # gives cattr
 module SanitizeEmail
   class Config
 
-    cattr_reader :config
-    cattr_writer :config
+    extend SanitizeEmail::Deprecation
 
-    self.config ||= {
+    DEFAULTS = {
       # Specify the BCC addresses for the messages that go out in 'local' environments
       :sanitized_bcc => nil,
 
@@ -33,6 +32,11 @@ module SanitizeEmail
 
       :activation_proc => Proc.new { false }
     }
+
+    cattr_reader :config
+    cattr_writer :config
+
+    self.config ||= DEFAULTS
     def self.configure &block
       yield @@config
 
@@ -47,6 +51,13 @@ module SanitizeEmail
                                            # because we are still inside the configure block.
         @@config[:sanitized_to] = @@config[:sanitized_recipients]
       end
+      if !@@config[:force_sanitize].nil?
+        replacement = "
+  Please use SanitizeEmail.force_sanitize or SanitizeEmail.sanitary instead.
+  Refer to https://github.com/pboling/sanitize_email/wiki for examples."
+        deprecation("SanitizeEmail::Config.config[:force_sanitize]", replacement)
+        SanitizeEmail.force_sanitize = @@config[:force_sanitize]
+      end
     end
 
   end

data/lib/sanitize_email/deprecation.rb

@@ -28,16 +28,20 @@ module SanitizeEmail
       alias_method old_name, name
       # And replace it with a wrapped version
       define_method(name) do |*args, &block|
-        unless @@deprecate_in_silence
-          if replacement
-            warn "SanitizeEmail: ##{name} deprecated (please use ##{replacement})"
-          else
-            warn "SanitizeEmail: ##{name} deprecated"
-          end
-        end
+        self.deprecation(name, " (please use ##{replacement})")
         send old_name, *args, &block
       end
     end
 
+    def deprecation(name, replacement = nil)
+      unless @@deprecate_in_silence
+        if replacement
+          warn "SanitizeEmail: ##{name} deprecated#{replacement}"
+        else
+          warn "SanitizeEmail: ##{name} deprecated"
+        end
+      end
+    end
+
   end
 end

data/lib/sanitize_email/rspec_matchers.rb

@@ -0,0 +1,31 @@
+require 'sanitize_email/test_helpers'
+
+module SanitizeEmail
+  module RspecMatchers
+    include SanitizeEmail::TestHelpers
+    [:from, :to, :cc, :bcc, :subject, :reply_to].each do |attribute|
+      RSpec::Matchers.define "have_#{attribute}" do |matcher|
+        match do |actual|
+          email_matching(matcher, attribute, actual)
+        end
+      end
+    end
+
+    [:from, :to, :cc, :bcc, :subject, :reply_to].each do |attribute|
+      RSpec::Matchers.define "be_#{attribute}" do |matcher|
+        match do |actual|
+          string_matching(matcher, attribute, actual)
+        end
+      end
+    end
+
+    RSpec::Matchers.define "have_to_username" do |matcher|
+      def get_username(email_message)
+        email_message.header.fields[3].value
+      end
+      match do |actual|
+        string_matching(matcher, :to_username, get_username(actual))
+      end
+    end
+  end
+end

data/lib/sanitize_email/test_helpers.rb

@@ -0,0 +1,24 @@
+module SanitizeEmail
+  module TestHelpers
+    class UnexpectedMailType < StandardError; end
+
+    def string_matching(matcher, part, mail_or_part)
+      if mail_or_part.respond_to?(:=~) # Can we match a regex against it?
+        mail_or_part =~ Regexp.new(Regexp.escape(matcher))
+      else
+        raise UnexpectedMailType, "Cannot match #{matcher} for #{part}"
+      end
+    end
+
+    # Normalize arrays to strings
+    def array_matching(matcher, part, mail_or_part)
+      mail_or_part = mail_or_part.join(', ') if mail_or_part.respond_to?(:join)
+      string_matching(matcher, part, mail_or_part)
+    end
+
+    def email_matching(matcher, part, mail_or_part)
+      array_matching(matcher, part, mail_or_part.send(part))
+    end
+
+  end
+end

data/lib/sanitize_email/version.rb

@@ -1,5 +1,5 @@
 #Copyright (c) 2008-12 Peter H. Boling of 9thBit LLC
 #Released under the MIT license
 module SanitizeEmail
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/sanitize_email.rb

@@ -3,10 +3,9 @@
 
 module SanitizeEmail
   require 'sanitize_email/version'
+  require 'sanitize_email/deprecation'
   require 'sanitize_email/config'
   require 'sanitize_email/bleach'
-  require 'sanitize_email/email_matchers'
-  require 'sanitize_email/deprecation'
 
   # Allow non-rails implementations to use this gem
   if defined?(Rails) && ::Rails::VERSION::MAJOR >= 3

data/spec/sanitize_email_spec.rb

@@ -18,14 +18,13 @@ describe SanitizeEmail do
 
   # Cleanup, so tests don't bleed
   after(:each) do
-    SanitizeEmail::Config.config = {}
+    SanitizeEmail::Config.config = SanitizeEmail::Config::DEFAULTS
     SanitizeEmail.force_sanitize = nil
     Mail.class_variable_get(:@@delivery_interceptors).pop
   end
 
   def sanitize_spec_dryer(rails_env = 'test')
     Launchy.stub(:open)
-    Launchy.should_receive(:open)
     location = File.expand_path('../tmp/mail_dump', __FILE__)
     FileUtils.rm_rf(location)
     Mail.defaults do
@@ -35,17 +34,20 @@ describe SanitizeEmail do
   end
 
   def configure_sanitize_email(sanitize_hash = {})
-    options = DEFAULT_TEST_CONFIG.merge(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[:use_actual_email_prepended_to_subject] = options[:use_actual_email_prepended_to_subject]
       config[:use_actual_email_as_sanitized_user_name] = options[:use_actual_email_as_sanitized_user_name]
-      # For testing deprecated configuration options:
+
+      # For testing *deprecated* configuration options:
       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
     Mail.register_interceptor(SanitizeEmail::Bleach.new)
   end
@@ -73,41 +75,147 @@ describe SanitizeEmail do
     end
   end
 
-  context "en email" do
-    context "engaged" do
+  context "module methods" do
+    before(:each) do
+      sanitize_spec_dryer
+    end
+
+    context "unsanitary" do
       before(:each) do
-        sanitize_spec_dryer
         configure_sanitize_email
+        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')
+      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)")
       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")
+      end
+    end
 
-      context "false" do
+    context "sanitary" do
+      before(:each) do
+        configure_sanitize_email
+        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')
+      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)")
+      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")
+      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")
+      end
+    end
+
+    context "force_sanitize" do
+      context "true" do
         before(:each) do
-          unsanitary_mail_delivery
+          # Should turn off sanitization using the force_sanitize
+          configure_sanitize_email({:activation_proc => Proc.new {true}})
+          SanitizeEmail.force_sanitize = 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')
         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)")
+        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")
+        end
+      end
+      context "false" do
+        before(:each) do
+          # Should turn off sanitization using the force_sanitize
+          configure_sanitize_email({:activation_proc => Proc.new {true}})
+          SanitizeEmail.force_sanitize = false
+          mail_delivery
         end
-        it "alters nothing" do
+        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_from("from@example.org")
+        end
+        it "should not alter normally sanitized attributes" do
           @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")
         end
       end
+      context "nil" do
+        context "activation proc enables" do
+          before(:each) do
+            sanitize_spec_dryer
+            # Should ignore force_sanitize setting
+            configure_sanitize_email({:activation_proc => Proc.new {true}})
+            SanitizeEmail.force_sanitize = nil
+            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')
+          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")
+          end
+        end
+        context "activation proc disables" do
+          before(:each) do
+            sanitize_spec_dryer
+            # Should ignore force_sanitize setting
+            configure_sanitize_email({:activation_proc => Proc.new {false}})
+            SanitizeEmail.force_sanitize = nil
+            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')
+          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")
+          end
+        end
+      end
+    end
+  end
 
+  context "config options" do
+    context ":use_actual_email_prepended_to_subject" do
       context "true" do
         before(:each) do
+          sanitize_spec_dryer
+          configure_sanitize_email({:use_actual_email_prepended_to_subject => true})
           sanitary_mail_delivery
         end
+        it "original to is prepended" do
+          @email_message.should 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')
@@ -116,153 +224,138 @@ describe SanitizeEmail do
           @email_message.should_not have_to_username("to at sanitize_email.org")
           @email_message.should_not 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")
+      end
+      context "false" do
+        before(:each) do
+          sanitize_spec_dryer
+          configure_sanitize_email({:use_actual_email_prepended_to_subject => false})
+          sanitary_mail_delivery
         end
-        it "should not prepend originals by default" do
-          @email_message.should_not have_to_username("to at example.org <to@sanitize_email.org>")
+        it "original to is not prepended" do
           @email_message.should_not 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')
+        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)")
+        end
       end
     end
 
-    context "config options" do
-      context ":use_actual_email_prepended_to_subject" do
-        context "true" do
-          before(:each) do
-            sanitize_spec_dryer
-            configure_sanitize_email({:use_actual_email_prepended_to_subject => true})
-            sanitary_mail_delivery
-          end
-          it "original to is prepended" do
-            @email_message.should 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')
-          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)")
-          end
+    context ":use_actual_email_as_sanitized_user_name" do
+      context "true" do
+        before(:each) do
+          sanitize_spec_dryer
+          configure_sanitize_email({:use_actual_email_as_sanitized_user_name => true})
+          sanitary_mail_delivery
         end
-        context "false" do
-          before(:each) do
-            sanitize_spec_dryer
-            configure_sanitize_email({:use_actual_email_prepended_to_subject => false})
-            sanitary_mail_delivery
-          end
-          it "original to is not prepended" do
-            @email_message.should_not 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')
-          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)")
-          end
+        it "original to is munged and prepended" do
+          @email_message.should 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')
+        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)")
+        end
+      end
+      context "false" do
+        before(:each) do
+          sanitize_spec_dryer
+          configure_sanitize_email({:use_actual_email_as_sanitized_user_name => false})
+          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>")
+        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')
+        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)")
         end
       end
+    end
 
-      context ":use_actual_email_as_sanitized_user_name" do
-        context "true" do
+    context "deprecated" do
+      #before(:each) do
+      #  SanitizeEmail::Deprecation.deprecate_in_silence = false
+      #end
+      context ":local_environments" do
+        context "matching" do
           before(:each) do
-            sanitize_spec_dryer
-            configure_sanitize_email({:use_actual_email_as_sanitized_user_name => true})
-            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>")
+            sanitize_spec_dryer('test')
+            configure_sanitize_email({:local_environments => ['test']})
+            SanitizeEmail[:activation_proc].call.should == 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')
           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)")
+          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")
           end
         end
-        context "false" do
+        context "non-matching" do
           before(:each) do
-            sanitize_spec_dryer
-            configure_sanitize_email({:use_actual_email_as_sanitized_user_name => false})
-            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>")
+            sanitize_spec_dryer('production')
+            configure_sanitize_email({:local_environments => ['development']}) # Won't match!
+            SanitizeEmail[:activation_proc].call.should == 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')
           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)")
+          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")
           end
         end
       end
 
-      context "deprecated" do
-        #before(:each) do
-        #  SanitizeEmail::Deprecation.deprecate_in_silence = false
-        #end
-        context ":local_environments" do
-          context "matching" do
-            before(:each) do
-              sanitize_spec_dryer('test')
-              configure_sanitize_email({:local_environments => ['test']})
-              SanitizeEmail[:activation_proc].call.should == 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')
-            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")
-            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
-              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')
-            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")
-            end
-          end
+      context ":sanitized_recipients" do
+        before(:each) do
+          sanitize_spec_dryer
+          configure_sanitize_email({:sanitized_recipients => 'barney@sanitize_email.org'})
+          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')
         end
+        it "used as sanitized_to" do
+          @email_message.should have_to("barney@sanitize_email.org")
+        end
+      end
 
-        context ":sanitized_recipients" do
-          before(:each) do
-            sanitize_spec_dryer
-            configure_sanitize_email({:sanitized_recipients => 'barney@sanitize_email.org'})
-            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')
-          end
-          it "used as sanitized_to" do
-            @email_message.should have_to("barney@sanitize_email.org")
-          end
+      context ":force_sanitize" do
+        before(:each) do
+          sanitize_spec_dryer
+          # Should turn off sanitization using the force_sanitize
+          configure_sanitize_email({:activation_proc => Proc.new {true}, :force_sanitize => 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')
+        end
+        it "should not alter normally sanitized attributes" do
+          @email_message.should have_to("to@example.org")
         end
       end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'sanitize_email'
+require 'sanitize_email/rspec_matchers'
 require 'launchy'
 require 'mail'
 require 'rails'
@@ -14,6 +15,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   #config.filter_run :focus
 
-  config.include SanitizeEmail::EmailMatchers
+  config.include SanitizeEmail::RspecMatchers
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanitize_email
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -217,9 +217,10 @@ files:
 - lib/sanitize_email/bleach.rb
 - lib/sanitize_email/config.rb
 - lib/sanitize_email/deprecation.rb
-- lib/sanitize_email/email_matchers.rb
 - lib/sanitize_email/engine.rb
 - lib/sanitize_email/railtie.rb
+- lib/sanitize_email/rspec_matchers.rb
+- lib/sanitize_email/test_helpers.rb
 - lib/sanitize_email/version.rb
 - sanitize_email.gemspec
 - spec/sanitize_email_spec.rb

data/lib/sanitize_email/email_matchers.rb

@@ -1,51 +0,0 @@
-module SanitizeEmail
-  module EmailMatchers
-    class UnexpectedMailType < StandardError; end
-
-    def string_matching(matcher, part, mail_or_part)
-      if mail_or_part.respond_to?(:=~) # Can we match a regex against it?
-        mail_or_part =~ Regexp.new(Regexp.escape(matcher))
-      else
-        raise UnexpectedMailType, "Cannot match #{matcher} for #{part}"
-      end
-    end
-
-    # Normalize arrays to strings
-    def array_matching(matcher, part, mail_or_part)
-      mail_or_part = mail_or_part.join(', ') if mail_or_part.respond_to?(:join)
-      string_matching(matcher, part, mail_or_part)
-    end
-
-    def email_matching(matcher, part, mail_or_part)
-      array_matching(matcher, part, mail_or_part.send(part))
-    end
-
-    if defined?(Rspec)
-      [:from, :to, :cc, :bcc, :subject, :reply_to].each do |attribute|
-        RSpec::Matchers.define "have_#{attribute}" do |matcher|
-          match do |actual|
-            email_matching(matcher, attribute, actual)
-          end
-        end
-      end
-
-      [:from, :to, :cc, :bcc, :subject, :reply_to].each do |attribute|
-        RSpec::Matchers.define "be_#{attribute}" do |matcher|
-          match do |actual|
-            string_matching(matcher, attribute, actual)
-          end
-        end
-      end
-
-      RSpec::Matchers.define "have_to_username" do |matcher|
-        def get_username(email_message)
-          email_message.header.fields[3].value
-        end
-        match do |actual|
-          string_matching(matcher, :to_username, get_username(actual))
-        end
-      end
-    end
-
-  end
-end