sanitize_email 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289e6af15ea68e8b10617cc2803055254cca058a
-  data.tar.gz: 4404c4335975e05532e2ada1a12f447687aef097
+  metadata.gz: 3ad6096e8d943e52cbd727fe7d196d7be384d180
+  data.tar.gz: ce38ce644ed4e2eba4ceff0ad8cdfdc4ac3c7aa3
 SHA512:
-  metadata.gz: 2c38011a2de7fb6317130462b6ab153b041e46eee7fc2eab19250899dd260ab49b4d962d648cfa529d5df24f003632098bbfd5078956c5b496c1b0f778990c49
-  data.tar.gz: 15a4766d74108c6ab0e076a328fe0a359972b550281038d260ad87488e5d2f56e1dc5f1e9cd027ffeb10a88a926f535c10df84940fa8b1e3042d6b60fed9b8ca
+  metadata.gz: 42032fa9bfa53dfc99739daf9671eb967688deae6f719d51dd005e0f5e5b273efc74607859b33f8ebf40cc61f9bd063a017e06a80d00489a6a11082555902d20
+  data.tar.gz: 11bd4dbcc7f931849ec121fe1cb799696102c997ed9288ad1f22d0cfdafd0de278f1d85f205413fcc67188839fa35ba99724e5a436c013681e2ed8e3cf295042

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.3.3

data/.travis.yml

@@ -6,7 +6,8 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
 #  - ruby-head
 gemfile:
   - gemfiles/rails_3_0.gemfile
@@ -53,10 +54,16 @@ matrix:
       gemfile: gemfiles/rails_3_1.gemfile
     - rvm: 2.2
       gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       gemfile: gemfiles/rails_3_0.gemfile
-    - rvm: 2.3.1
+    - rvm: 2.3.3
       gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_0.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_3_2.gemfile
 #    - rvm: ruby-head
 #      gemfile: gemfiles/rails_5_0.gemfile
 #  include:
@@ -64,5 +71,8 @@ matrix:
 #      gemfile: gemfiles/rails_3_0.gemfile
 #    - rvm: 1.9
 #      gemfile: gemfiles/rails_3_1.gemfile
+before_install:
+  - gem update --system
+  - gem install bundler
 install:
   - bundle install

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 HEAD
 
+Version 1.2.2 - FEB.17.2017
+* Improve handling of frozen strings, which are becoming more common by @milgner
+
+Version 1.2.1 - NOV.03.2016
+* Fix bug where non-array to address would not get prepended to subject when that feature is turned on
+* SanitizeEmail::TestHelpers::UnexpectedMailType no longer raised by SanitizeEmail::RspecMatchers (a breaking change if you were depending on that for your specs to pass)
+* SanitizeEmail::RspecMatchers are now fully composed Rspec Matchers with much improved spec failure output
+* Many linting improvements
+* Added Rails 5.0 to test matrix
+  - but is only tested on travis against 2.0, 2.1, 2.2, and 2.3
+  - Rails versions tested are now 3.2, 4.0, 4.1, 4.2, 5.0
+  - Runtime code might still be compatible with ruby 1.8.7, should be compatible with 1.9.3
+  - Specs suite should still run 1.9.3 if you want to run them manually
+
 Version 1.2.0 - JUL.24.2016
 * No longer registers instance of SanitizeEmail::Bleach to avoid the dev env reloading problem (fixes #12)
 * Instead registers SanitizeEmail::Bleach class.

data/lib/sanitize_email/mail_header_tools.rb

@@ -55,9 +55,12 @@ module SanitizeEmail
 
     def self.prepend_custom_subject(message)
       message.subject = "" unless message.subject
-      message.subject.prepend(
-        SanitizeEmail::MailHeaderTools.custom_subject(message)
-      )
+      custom_subject = SanitizeEmail::MailHeaderTools.custom_subject(message)
+      if message.subject.frozen?
+        message.subject = "#{custom_subject}#{message.subject}"
+      else
+        message.subject.prepend(custom_subject)
+      end
     end
 
     # According to https://github.com/mikel/mail

data/lib/sanitize_email/version.rb

@@ -2,5 +2,5 @@
 # Released under the MIT license
 
 module SanitizeEmail
-  VERSION = "1.2.1".freeze
+  VERSION = "1.2.2".freeze
 end

data/spec/sanitize_email_spec.rb

@@ -106,12 +106,27 @@ describe SanitizeEmail do
     end
   end
 
+  def sanitary_mail_delivery_frozen_strings(config_options = {})
+    SanitizeEmail.sanitary(config_options) do
+      mail_delivery_frozen_strings
+    end
+  end
+
   def unsanitary_mail_delivery
     SanitizeEmail.unsanitary do
       mail_delivery
     end
   end
 
+  def mail_delivery_frozen_strings
+    @email_message = Mail.deliver do
+      from      "from@example.org".freeze
+      to        "to@example.org".freeze
+      subject   "original subject".freeze
+      body      "funky fresh".freeze
+    end
+  end
+
   def mail_delivery_hot_mess
     @email_message = Mail.deliver do
       from      "same@example.org"
@@ -470,6 +485,16 @@ describe SanitizeEmail do
       end
     end
 
+    context "with frozen string (literals)" do
+      it "prepends strings without exception" do
+        configure_sanitize_email(
+          environment: "{{serverABC}}",
+          use_actual_environment_prepended_to_subject: true
+        )
+        expect { sanitary_mail_delivery_frozen_strings }.to_not raise_exception
+      end
+    end
+
     context "force_sanitize" do
       context "true" do
         before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanitize_email
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Peter Boling
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-03 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Email Condom for your Ruby Server