recipient_interceptor 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9323d5071c9779a7a36eb152e29fe573e7537a13
-  data.tar.gz: 1f8674fb114b64869aab280326203f3e8f8e7bde
+SHA256:
+  metadata.gz: 9f74cc3d2d3870b44de76ddd8a972a7b4d004e6accb48e59f678913964fc34e7
+  data.tar.gz: 693e37753d4dfd1decf906bdc4f5130eef84d5d42c5042425f2e952421cd4262
 SHA512:
-  metadata.gz: d134b8d957c2ee6f65f4a6ecedff78769564a3b13104046f23424f802959f18d209fbf21ac38ac161ca7beb8cee84004a8998d3dc3a01e1229b4acf3e15ad19a
-  data.tar.gz: 3b9d406d84946a0d50d9eba1811d4b698f71c186d07697729650986224b6320c323abc802ee6610686b1b429249577dff28b01242c37a109c61f7dbd35f16da0
+  metadata.gz: df47fd1c7e1637c8ebad24f7199f979796b6c94cfc305b76cd5f10e2fd1c2e3691136ae97098f1d918ee31e9574d43eb721624babfea363619c7bc91303ace70
+  data.tar.gz: 74bda5ffcdb7027fed64065ebee0a9013ad3c4fa0c2b796689069a5c2228400adbc8cdcdd8abc2f41a68150a53423139e3ee60d169ce9056b54436207cf601e2

data/lib/recipient_interceptor.rb

@@ -10,8 +10,8 @@ class RecipientInterceptor
     add_custom_headers message
     add_subject_prefix message
     message.to = @recipients
-    message.cc = []
-    message.bcc = []
+    message.cc = nil if message.cc
+    message.bcc = nil if message.bcc
   end
 
   private
@@ -31,14 +31,8 @@ class RecipientInterceptor
   end
 
   def add_custom_headers(message)
-    {
-      'X-Intercepted-To' => message.to || [],
-      'X-Intercepted-Cc' => message.cc || [],
-      'X-Intercepted-Bcc' => message.bcc || []
-    }.each do |header, addresses|
-      addresses.each do |address|
-        message.header = "#{message.header}#{header}: #{address}"
-      end
-    end
+    message.header['X-Intercepted-To'] = message.to || []
+    message.header['X-Intercepted-Cc' ] = message.cc || []
+    message.header['X-Intercepted-Bcc' ] = message.bcc || []
   end
 end

data/spec/recipient_interceptor_spec.rb

@@ -1,14 +1,37 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'recipient_interceptor')
 
 describe RecipientInterceptor do
+  before do
+    Mail.defaults do
+      delivery_method :test
+    end
+
+    module Mail
+      @@delivery_interceptors = []
+    end
+  end
+
   it 'overrides to/cc/bcc fields' do
     Mail.register_interceptor RecipientInterceptor.new(recipient_string)
 
     response = deliver_mail
 
     expect(response.to).to eq [recipient_string]
-    expect(response.cc).to eq []
-    expect(response.bcc).to eq []
+    expect(response.cc).to eq nil
+    expect(response.bcc).to eq nil
+  end
+
+  it 'overrides to/cc/bcc correctly even if they were already missing' do
+    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
+
+    response = Mail.deliver do
+      from 'original.from@example.com'
+      to 'original.to@example.com'
+    end
+
+    expect(response.to).to eq [recipient_string]
+    expect(response.cc).to eq nil
+    expect(response.bcc).to eq nil
   end
 
   it 'copies original to/cc/bcc fields to custom headers' do
@@ -16,12 +39,12 @@ describe RecipientInterceptor do
 
     response = deliver_mail
 
-    expect(custom_header(response, 'X-Intercepted-To')).
-      to eq 'original.to@example.com'
-    expect(custom_header(response, 'X-Intercepted-Cc')).
-      to eq 'original.cc@example.com'
-    expect(custom_header(response, 'X-Intercepted-Bcc')).
-      to eq 'original.bcc@example.com'
+    expect(custom_header(response, 'X-Intercepted-To'))
+      .to eq 'original.to@example.com'
+    expect(custom_header(response, 'X-Intercepted-Cc'))
+      .to eq 'original.cc@example.com'
+    expect(custom_header(response, 'X-Intercepted-Bcc'))
+      .to eq 'original.bcc@example.com'
   end
 
   it 'accepts an array of recipients' do
@@ -68,10 +91,6 @@ describe RecipientInterceptor do
   end
 
   def deliver_mail
-    Mail.defaults do
-      delivery_method :test
-    end
-
     Mail.deliver do
       from 'original.from@example.com'
       to 'original.to@example.com'
@@ -90,10 +109,4 @@ describe RecipientInterceptor do
       header.to_s
     end
   end
-
-  after do
-    module Mail
-      @@delivery_interceptors = []
-    end
-  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: recipient_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dan Croak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '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: rspec
   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: |2
@@ -57,7 +57,7 @@ description: |2
       accidentally send emails to addresses other than those on a whitelist
       which you configure. For example, you could use it in your web app's
       staging environment.
-email: dan@thoughtbot.com
+email: dan@statusok.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -65,8 +65,7 @@ files:
 - lib/recipient_interceptor.rb
 - spec/recipient_interceptor_spec.rb
 homepage: http://github.com/croaky/recipient_interceptor
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -74,17 +73,17 @@ 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.0.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Intercept recipients when delivering email with the Mail gem.