recipient_interceptor 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f74cc3d2d3870b44de76ddd8a972a7b4d004e6accb48e59f678913964fc34e7
-  data.tar.gz: 693e37753d4dfd1decf906bdc4f5130eef84d5d42c5042425f2e952421cd4262
+  metadata.gz: 05054e20e0636b7e0ed92dc0af1ac23b884d70f210d2e214b6ced72845f934db
+  data.tar.gz: 98abb521569ecf525863342081b2c682133d99c35f659b564c9d8c1ab56798fd
 SHA512:
-  metadata.gz: df47fd1c7e1637c8ebad24f7199f979796b6c94cfc305b76cd5f10e2fd1c2e3691136ae97098f1d918ee31e9574d43eb721624babfea363619c7bc91303ace70
-  data.tar.gz: 74bda5ffcdb7027fed64065ebee0a9013ad3c4fa0c2b796689069a5c2228400adbc8cdcdd8abc2f41a68150a53423139e3ee60d169ce9056b54436207cf601e2
+  metadata.gz: 8251947adbc962c24d78941ea8dcdb54cfad7e0b68ef42d2a8039d897575ad77a2d16b644b62064cb553ba022abe860c9d49861fa60243c146ee7ff8427d0681
+  data.tar.gz: cabe6aec5167615c43a947f855a6fd478be28fba3d1fd13fbcd084d5c462a972dbf9dd72fb723d67b998235921102f09de33b80636112ca2aaecef459ed174d4

data/lib/recipient_interceptor.rb

@@ -1,38 +1,29 @@
-require 'mail'
+require "mail"
 
 class RecipientInterceptor
-  def initialize(recipients, options = {})
-    @recipients = normalize_to_array(recipients)
-    @subject_prefix = options[:subject_prefix]
-  end
-
-  def delivering_email(message)
-    add_custom_headers message
-    add_subject_prefix message
-    message.to = @recipients
-    message.cc = nil if message.cc
-    message.bcc = nil if message.bcc
-  end
-
-  private
-
-  def normalize_to_array(recipients)
-    if recipients.respond_to? :split
-      recipients.split ','
+  def initialize(recipients, opts = {})
+    @recipients = if recipients.respond_to?(:split)
+      recipients.split(",")
     else
       recipients
     end
+
+    @subject_prefix = opts[:subject_prefix]
   end
 
-  def add_subject_prefix(message)
-    if @subject_prefix
-      message.subject = "#{@subject_prefix} #{message.subject}"
+  def delivering_email(msg)
+    if @subject_prefix.respond_to?(:call)
+      msg.subject = "#{@subject_prefix.call(msg)} #{msg.subject}"
+    elsif @subject_prefix
+      msg.subject = "#{@subject_prefix} #{msg.subject}"
     end
-  end
 
-  def add_custom_headers(message)
-    message.header['X-Intercepted-To'] = message.to || []
-    message.header['X-Intercepted-Cc' ] = message.cc || []
-    message.header['X-Intercepted-Bcc' ] = message.bcc || []
+    msg.header["X-Intercepted-To"] = msg.to || []
+    msg.header["X-Intercepted-Cc"] = msg.cc || []
+    msg.header["X-Intercepted-Bcc"] = msg.bcc || []
+
+    msg.to = @recipients
+    msg.cc = nil if msg.cc
+    msg.bcc = nil if msg.bcc
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recipient_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dan Croak
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !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
       Use RecipientInterceptor when you don't want your Ruby program to
       accidentally send emails to addresses other than those on a whitelist
@@ -63,11 +35,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/recipient_interceptor.rb
-- spec/recipient_interceptor_spec.rb
 homepage: http://github.com/croaky/recipient_interceptor
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,10 +53,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: Intercept recipients when delivering email with the Mail gem.
-test_files:
-- spec/recipient_interceptor_spec.rb
+test_files: []

data/spec/recipient_interceptor_spec.rb

@@ -1,112 +0,0 @@
-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 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
-    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
-
-    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'
-  end
-
-  it 'accepts an array of recipients' do
-    Mail.register_interceptor RecipientInterceptor.new(recipient_array)
-
-    response = deliver_mail
-
-    expect(response.to).to eq recipient_array
-  end
-
-  it 'accepts a string of recipients' do
-    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
-
-    response = deliver_mail
-
-    expect(response.to).to eq [recipient_string]
-  end
-
-  it 'does not prefix subject by default' do
-    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
-
-    response = deliver_mail
-
-    expect(response.subject).to eq 'some subject'
-  end
-
-  it 'prefixes subject when given' do
-    Mail.register_interceptor RecipientInterceptor.new(
-      recipient_string,
-      subject_prefix: '[STAGING]'
-    )
-
-    response = deliver_mail
-
-    expect(response.subject).to eq '[STAGING] some subject'
-  end
-
-  def recipient_string
-    'staging@example.com'
-  end
-
-  def recipient_array
-    ['one@example.com', 'two@example.com']
-  end
-
-  def deliver_mail
-    Mail.deliver do
-      from 'original.from@example.com'
-      to 'original.to@example.com'
-      cc 'original.cc@example.com'
-      bcc 'original.bcc@example.com'
-      subject 'some subject'
-    end
-  end
-
-  def custom_header(response, name)
-    header = response.header[name]
-
-    if header.respond_to?(:map)
-      header.map { |h| h.value.wrapped_string }
-    else
-      header.to_s
-    end
-  end
-end