sanitize_email 1.1.0 → 1.1.1

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+Version 1.1.1 - DEC.30.2013
+* Cribbed have_body_text from email_spec gem by Peter Boling
+* Cribbed have_header from email_spec gem by Peter Boling
+* Cribbed MailExt from email_spec gem by Peter Boling
+* All Rspec Matchers now working by Peter Boling
+* All Test Helpers now working by Peter Boling
+* All internal tests now use the matchers and helpers of sanitize_email by Peter Boling
+* Development dependency on email_spec gem removed by Peter Boling
+* Travis is getting barfy on my 1.8.7 build (passes locally) by Peter Boling
+
 Version 1.1.0 - DEC.30.2013
 * Add documentation for non-Rails setup by Peter Boling
 * Add documentation for using sanitize_email's bundled Rspec Matchers by Peter Boling

data/lib/sanitize_email/mail_ext.rb

@@ -0,0 +1,12 @@
+# Cribbed from email_spec gem
+module SanitizeEmail::MailExt
+  def default_part
+    @default_part ||= html_part || text_part || self
+  end
+
+  def default_part_body
+    default_part.body
+  end
+end
+
+Mail::Message.send(:include, SanitizeEmail::MailExt)

data/lib/sanitize_email/rspec_matchers.rb

@@ -1,11 +1,12 @@
 # Copyright (c) 2008-13 Peter H. Boling of RailsBling.com
 # Released under the MIT license
 require 'sanitize_email/test_helpers'
+require 'sanitize_email/mail_ext'
 
 module SanitizeEmail
   module RspecMatchers
     include SanitizeEmail::TestHelpers
-    [:from, :to, :cc, :bcc, :subject, :reply_to].each do |attribute|
+    [:from, :to, :cc, :bcc, :reply_to].each do |attribute|
       RSpec::Matchers.define "have_#{attribute}" do |matcher|
         match do |actual|
           email_matching(matcher, attribute, actual)
@@ -13,6 +14,14 @@ module SanitizeEmail
       end
     end
 
+    [:subject].each do |attribute|
+      RSpec::Matchers.define "have_#{attribute}" do |matcher|
+        match do |actual|
+          string_matching_attribute(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|
@@ -29,5 +38,35 @@ module SanitizeEmail
         string_matching(matcher, :to_username, get_username(actual))
       end
     end
+
+    # Cribbed from email_spec gem
+    RSpec::Matchers.define "have_body_text" do |matcher|
+      match do |actual|
+        # Normalize all the whitespace, to improve match fuzz
+        if matcher.is_a?(String)
+          actual_text =  actual.default_part_body.to_s.gsub(/\s+/, " ")
+          matcher_text = matcher.gsub(/\s+/, " ")
+          raise SanitizeEmail::TestHelpers::UnexpectedMailType, "Cannot find #{matcher} in body" unless actual_text.respond_to?(:include?)
+          actual_text.include?(matcher_text)
+        else
+          actual_text =  actual.default_part_body.to_s
+          raise SanitizeEmail::TestHelpers::UnexpectedMailType, "Cannot find #{matcher} in body" unless actual_text.respond_to?(:=~)
+          !!(actual_text =~ matcher)
+        end
+      end
+    end
+
+    # Cribbed from email_spec gem
+    RSpec::Matchers.define "have_header" do |name, matcher|
+      match do |actual|
+        header = actual.header
+        if matcher.is_a?(String)
+          header[name].to_s == matcher
+        else
+          header[name].to_s =~ matcher
+        end
+      end
+    end
+
   end
 end

data/lib/sanitize_email/test_helpers.rb

@@ -4,9 +4,17 @@ module SanitizeEmail
   module TestHelpers
     class UnexpectedMailType < StandardError; end
 
+    def string_matching_attribute(matcher, part, mail_or_part)
+      string_matching(matcher, part, mail_or_part.send(part))
+    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))
+        if matcher.is_a?(Regexp)
+          mail_or_part =~ matcher
+        else
+          mail_or_part =~ Regexp.new(Regexp.escape(matcher))
+        end
       else
         raise UnexpectedMailType, "Cannot match #{matcher} for #{part}"
       end

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.0'
+  VERSION = '1.1.1'
 end

data/sanitize_email.gemspec

@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
   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(%q<email_spec>, [">= 0"])
   s.add_development_dependency "coveralls"
 end
 

data/spec/sanitize_email_spec.rb

@@ -98,6 +98,7 @@ describe SanitizeEmail do
       bcc       'same@example.org'
       reply_to  'same@example.org'
       subject   'original subject'
+      body      'funky fresh'
     end
   end
 
@@ -109,6 +110,7 @@ describe SanitizeEmail do
       bcc       'bcc@example.org'
       reply_to  'reply_to@example.org'
       subject   'original subject'
+      body      'funky fresh'
     end
   end
 
@@ -120,6 +122,7 @@ describe SanitizeEmail do
       bcc       %w( bcc1@example.org bcc2@example.org bcc3@example.org )
       reply_to  'reply_to@example.org'
       subject   'original subject'
+      body      'funky fresh'
     end
   end
 
@@ -136,6 +139,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
       end
       it "should not prepend overrides" do
         @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -150,6 +154,7 @@ describe SanitizeEmail do
         @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')
       end
     end
 
@@ -161,6 +166,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
       end
       it "should not prepend overrides" do
         @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -190,6 +196,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
       end
       it "should not prepend overrides" do
         @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -242,6 +249,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
       end
       it "should not prepend overrides" do
         @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -288,6 +296,7 @@ describe SanitizeEmail do
       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')
       end
       it "should not prepend overrides" do
         @email_message.should_not have_to_username("same at example.org")
@@ -327,6 +336,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should override" do
           @email_message.should have_to("to@sanitize_email.org")
@@ -349,6 +359,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not alter normally sanitized attributes" do
           @email_message.should have_to("to@example.org")
@@ -371,6 +382,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
           end
           it "should override" do
             @email_message.should have_to("to@sanitize_email.org")
@@ -392,6 +404,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
           end
           it "should not alter normally sanitized attributes" do
             @email_message.should have_to("to@example.org")
@@ -420,6 +433,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -438,6 +452,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -459,6 +474,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -477,6 +493,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -498,6 +515,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -516,6 +534,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not prepend overrides" do
           @email_message.should_not have_to_username("to at sanitize_email.org")
@@ -539,6 +558,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
           end
           it "should use activation_proc for matching environment" do
             @email_message.should have_to("to@sanitize_email.org")
@@ -556,6 +576,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
           end
           it "should use activation_proc for non-matching environment" do
             @email_message.should have_to("to@example.org")
@@ -574,6 +595,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "used as sanitized_to" do
           @email_message.should have_to("barney@sanitize_email.org")
@@ -590,6 +612,7 @@ describe SanitizeEmail 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_body_text('funky fresh')
         end
         it "should not alter normally sanitized attributes" do
           @email_message.should have_to("to@example.org")

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'mail'
 require 'rails'
 require 'letter_opener'
 require 'action_mailer'
-require 'email_spec'
 
 # For code coverage, must be required before all application / gem / library code.
 require 'coveralls'
@@ -20,9 +19,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.include(EmailSpec::Helpers)
-  config.include(EmailSpec::Matchers)
-
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanitize_email
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -173,22 +173,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: email_spec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +222,7 @@ files:
 - lib/sanitize_email/config.rb
 - lib/sanitize_email/deprecation.rb
 - lib/sanitize_email/engine.rb
+- lib/sanitize_email/mail_ext.rb
 - lib/sanitize_email/mail_header_tools.rb
 - lib/sanitize_email/overridden_addresses.rb
 - lib/sanitize_email/railtie.rb