sanitize_email 1.1.4 → 1.1.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWFiN2NjNmYwNjk0YjNkNjkxZjg5ZDI1NDI0ZmMwY2M4MWI3MWZjZg==
-  data.tar.gz: !binary |-
-    MjljOGVmM2UxZTE3MjY4OTM5ODQ4ZTk5OGEzN2JkNTYyNTNkYmRkMQ==
+SHA1:
+  metadata.gz: 1fdeb24b19f1398c5541c1ac64d76181662ff475
+  data.tar.gz: 9f08881fb0027324fc4487f2f9cca2044df2a3bb
 SHA512:
-  metadata.gz: !binary |-
-    MGIxNjYyNzY4NGFkMDg3NTc0OGNlNjIxNDFhNjcyY2Q2YzM1YTM1MmFhYjM1
-    OGU2M2EyNzU3Njc3ZDdiZTczZDFkZmYxNjE1YTIwYjg1OWM5ZTI3MWQ2YzY3
-    YWIwZTk2MGU5ZmRiMTliNGUwMWZjM2NkOTc3OTEzYmI0OGIzNDU=
-  data.tar.gz: !binary |-
-    ODA0YTM4YzczMDY2ZjBkYTVkODY1N2U2ZDIwNjIyY2FlNGE1MzNmZTgyYjA3
-    NzdmODIzNTBmMTRmOWZlMmQ3ODkwMzVkYWZkMWFlYTQzNjgwMDE2MTU0NzA1
-    MjEzYjAxYzliMjgzMjcxNmQ3NDFhNTYxOGQ4ZWUyNjM4NzQzNGI=
+  metadata.gz: caf6b42229c732c67b5372cc2862e089e4abaa23f6fe25c8e46719ba4f1538a7ac67f220d637b28f235e25b6b38b18934a4dba6fe4e3e72d33acfad72e7caaf8
+  data.tar.gz: 450f79a5192e17f271f28adabca2cdac943cdddd5699bb380e3e3292294865c4a8eb21ba8021e4abf2e27b34c32f53c21f7f5ce92af6288b625039684917d4d9

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
+  - 2.1.5
   - jruby-19mode
 #  - rbx-19mode
 #  - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 1.1.5 - MAR.10.2015
+* Refactored `prepend_subject_array` by Scott Rocher
+* Specs for prepending to subject by Scott Rocher
+* Fix spec examples by Peter Boling
+* Update Readme by Theo Bittencourt
+
 Version 1.1.4 - JAN.06.2014
 * Another attempt at not breaking when subject is nil by Peter Boling
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Peter H. Boling of RailsBling.com
+Copyright (c) 2008-2014 Peter H. Boling of RailsBling.com
 
 MIT License
 

data/README.md

@@ -10,6 +10,7 @@ This gem allows you to override your mail delivery settings, globally or in a lo
 | version                 |  [![Gem Version](https://badge.fury.io/rb/sanitize_email.png)](http://badge.fury.io/rb/sanitize_email) |
 | dependencies            |  [![Dependency Status](https://gemnasium.com/pboling/sanitize_email.png)](https://gemnasium.com/pboling/sanitize_email) |
 | code quality            |  [![Code Climate](https://codeclimate.com/github/pboling/sanitize_email.png)](https://codeclimate.com/github/pboling/sanitize_email) |
+| inline documenation     |  [![Inline docs](http://inch-ci.org/github/pboling/sanitize_email.png)](http://inch-ci.org/github/pboling/sanitize_email) |
 | continuous integration  |  [![Build Status](https://secure.travis-ci.org/pboling/sanitize_email.png?branch=master)](https://travis-ci.org/pboling/sanitize_email) |
 | test coverage           |  [![Coverage Status](https://coveralls.io/repos/pboling/sanitize_email/badge.png)](https://coveralls.io/r/pboling/sanitize_email) |
 | homepage                |  [https://github.com/pboling/sanitize_email][homepage] |
@@ -57,7 +58,7 @@ SanitizeEmail comes with some lightweight RspecMatchers covering most of what em
 
 In Gemfile:
 
-    gem 'flag_shih_tzu'
+    gem 'sanitize_email'
 
 Then:
 
@@ -192,7 +193,7 @@ In your `spec_helper.rb`:
         end
 
         context "an email test" do
-          subject { Mail.new(@message_hash) }
+          subject { Mail.deliver(@message_hash) }
           it { should have_to "sanitize_email@example.org" }
         end
 
@@ -205,7 +206,7 @@ These will look for an email address in any of the following
 Example:
 
         context "the subject line must have the email address sanitize_email@example.org" do
-          subject { Mail.new(@message_hash) }
+          subject { Mail.deliver(@message_hash) }
           it { should have_subject "sanitize_email@example.org" }
         end
 
@@ -218,7 +219,7 @@ These will look for a matching string in any of the following
 Example:
 
         context "the subject line must have the string 'foobarbaz'" do
-          subject { Mail.new(@message_hash) }
+          subject { Mail.deliver(@message_hash) }
           it { should be_subject "foobarbaz" }
         end
 
@@ -231,7 +232,7 @@ The `username` in the `:to` field is when the `:to` field is formatted like this
 Example:
 
         context "the to field must have the username 'Peter Boling'" do
-          subject { Mail.new(@message_hash) }
+          subject { Mail.deliver(@message_hash) }
           it { should have_to_username "Peter Boling" }
         end
 
@@ -334,7 +335,7 @@ For example:
 ## Legal
 
 * MIT License - See LICENSE file in this project
-* Copyright (c) 2008-2013 [Peter H. Boling][peterboling] of [Rails Bling][railsbling]
+* Copyright (c) 2008-2014 [Peter H. Boling][peterboling] of [Rails Bling][railsbling]
 * Copyright (c) 2009 [John Trupiano](http://smartlogicsolutions.com/wiki/John_Trupiano) of [SmartLogic Solutions, LLC](http://www.smartlogicsolutions.com)
 
 [semver]: http://semver.org/

data/Rakefile

@@ -34,9 +34,10 @@ namespace :test do
   end
 end
 
-require 'rdoc/task'
 require File.expand_path('../lib/sanitize_email/version', __FILE__)
-Rake::RDocTask.new do |rdoc|
+require 'rdoc'
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = "SanitizeEmail #{SanitizeEmail::VERSION}"
   rdoc.options << '--line-numbers'

data/lib/sanitize_email.rb

@@ -29,7 +29,7 @@ module SanitizeEmail
     if mailer.respond_to?(:register_interceptor)
       mailer.register_interceptor(SanitizeEmail::Bleach.new)
     else
-      warn "SanitizeEmail was unable to detect a compatible Mail class to register and interceptor on."
+      warn "SanitizeEmail was unable to detect a compatible Mail class to register an interceptor on."
     end
   end
 

data/lib/sanitize_email/mail_header_tools.rb

@@ -7,9 +7,14 @@ module SanitizeEmail
       prepend = []
       prepend << SanitizeEmail::MailHeaderTools.prepend_email_to_subject(Array(message.to)) if SanitizeEmail.use_actual_email_prepended_to_subject
       prepend << SanitizeEmail::MailHeaderTools.prepend_environment_to_subject if SanitizeEmail.use_actual_environment_prepended_to_subject
+      prepend << "" unless prepend.empty? # this will force later joins to add an extra space
       prepend
     end
 
+    def self.custom_subject(message)
+      prepend_subject_array(message).join(" ")
+    end
+
     def self.prepend_environment_to_subject
       SanitizeEmail::Config.config[:environment]
     end
@@ -31,11 +36,8 @@ module SanitizeEmail
     end
 
     def self.prepend_custom_subject(message)
-      if message.subject
-        message.subject.insert(0, SanitizeEmail::MailHeaderTools.prepend_subject_array(message).join(' ') + ' ')
-      else
-        message.subject = SanitizeEmail::MailHeaderTools.prepend_subject_array(message).join(' ')
-      end
+      message.subject = "" unless message.subject
+      message.subject.prepend(SanitizeEmail::MailHeaderTools.custom_subject(message))
     end
 
     # According to https://github.com/mikel/mail this is the correct way to update headers.

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.4'
+  VERSION = '1.1.5'
 end

data/spec/sanitize_email_spec.rb

@@ -448,6 +448,7 @@ describe SanitizeEmail do
         end
         it "original to is not prepended" do
           @email_message.should_not have_subject("[test] original subject")
+          @email_message.subject.should eq("original subject")
         end
         it "should not alter non-sanitized attributes" do
           @email_message.should have_from('from@example.org')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanitize_email
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Peter Boling
@@ -10,163 +10,163 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: letter_opener
   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: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: mail
   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: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.8
 - !ruby/object:Gem::Dependency
   name: roodi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
-description: ! 'In Rails, Sinatra, or simply the mail gem: Aids in development, testing,
+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.'
 email: peter.boling@gmail.com
@@ -177,12 +177,12 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -219,21 +219,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: ! 'Rails/Sinatra/Mail gem: Test email abilities without ever sending a message
+summary: 'Rails/Sinatra/Mail gem: Test email abilities without ever sending a message
   to actual live addresses'
 test_files:
 - spec/sanitize_email_spec.rb
 - spec/spec_helper.rb
+has_rdoc: