recipient_interceptor 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjA2MjNlYmZjOGEyNzJiYzdlMDk5YjQ1OWVjM2ZhMWQyM2YzOGM0ZA==
-  data.tar.gz: !binary |-
-    YTk3ZTI0NTM4MGQyNjRmMzZlN2QxZjgzOTAyOGQzZmEyODBmY2U3OQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWQ4YzI3MTIyNDFhZTNkNTM4ODJkNzQ2NmM5ZTM3NzRmMTJlZmI4MWM3NDQ5
-    ODQ3Y2JlN2ZlMDlhYjgwMTQwMzY5ODdkMWQ1YzkyNjdhYzU2YTdmYTliNjQz
-    OTg3ZWNlMjc0ODM3ZTJkYzBkZGU1NWQyNDZmOTgxNDkxNWY4NmE=
-  data.tar.gz: !binary |-
-    MDVlNTc1ZTQ3M2IzMTA4NWE1MmUwODk4NjNjODNlZDYwZjE3N2VjMDkyMzg4
-    OTQ0MzljNmNkYTNlYWJkNDE5NmE5MjFlYWFjZTZhYzAwOGUzMjA0ZmVmYWUw
-    MzE0NWZkZjViZDhlZGQ4NTAxNWMyNTM1ZTgyM2YzYzQ1ODI4MWI=
+SHA1:
+  metadata.gz: 9323d5071c9779a7a36eb152e29fe573e7537a13
+  data.tar.gz: 1f8674fb114b64869aab280326203f3e8f8e7bde
+SHA512:
+  metadata.gz: d134b8d957c2ee6f65f4a6ecedff78769564a3b13104046f23424f802959f18d209fbf21ac38ac161ca7beb8cee84004a8998d3dc3a01e1229b4acf3e15ad19a
+  data.tar.gz: 3b9d406d84946a0d50d9eba1811d4b698f71c186d07697729650986224b6320c323abc802ee6610686b1b429249577dff28b01242c37a109c61f7dbd35f16da0

data/lib/recipient_interceptor.rb

@@ -1,15 +1,17 @@
 require 'mail'
 
 class RecipientInterceptor
-  def initialize(recipients)
+  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
-    message.bcc = nil
+    message.cc = []
+    message.bcc = []
   end
 
   private
@@ -22,16 +24,20 @@ class RecipientInterceptor
     end
   end
 
+  def add_subject_prefix(message)
+    if @subject_prefix
+      message.subject = "#{@subject_prefix} #{message.subject}"
+    end
+  end
+
   def add_custom_headers(message)
     {
-      'X-Intercepted-To' => message.to,
-      'X-Intercepted-Cc' => message.cc,
-      'X-Intercepted-Bcc' => message.bcc
+      'X-Intercepted-To' => message.to || [],
+      'X-Intercepted-Cc' => message.cc || [],
+      'X-Intercepted-Bcc' => message.bcc || []
     }.each do |header, addresses|
-      if addresses
-        addresses.each do |address|
-          message.header = "#{message.header}\n#{header}: #{address}"
-        end
+      addresses.each do |address|
+        message.header = "#{message.header}#{header}: #{address}"
       end
     end
   end

data/spec/recipient_interceptor_spec.rb

@@ -1,20 +1,26 @@
 require File.join(File.dirname(__FILE__), '..', 'lib', 'recipient_interceptor')
 
 describe RecipientInterceptor do
-  it 'overrides to/cc/bcc fields, copies original fields to custom headers' do
-    Mail.register_interceptor RecipientInterceptor.new('staging@example.com')
+  it 'overrides to/cc/bcc fields' do
+    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
 
     response = deliver_mail
 
-    expect(response.to).to eq ['staging@example.com']
+    expect(response.to).to eq [recipient_string]
     expect(response.cc).to eq []
     expect(response.bcc).to eq []
+  end
+
+  it 'copies original to/cc/bcc fields to custom headers' do
+    Mail.register_interceptor RecipientInterceptor.new(recipient_string)
+
+    response = deliver_mail
 
-    expect(response.header['X-Intercepted-To'].to_s).
-      to eq "[original.to@example.com, staging@example.com]"
-    expect(response.header['X-Intercepted-Cc'].to_s).
+    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(response.header['X-Intercepted-Bcc'].to_s).
+    expect(custom_header(response, 'X-Intercepted-Bcc')).
       to eq 'original.bcc@example.com'
   end
 
@@ -26,22 +32,68 @@ describe RecipientInterceptor do
     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.defaults do
       delivery_method :test
     end
 
-    mail = Mail.deliver do
+    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
 
-    mail.deliver!
+  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
 
-  def recipient_array
-    ['one@example.com', 'two@example.com']
+  after do
+    module Mail
+      @@delivery_interceptors = []
+    end
   end
 end

metadata

@@ -1,47 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: recipient_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dan Croak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-08-01 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: ! "    Use RecipientInterceptor when you don't want your Ruby program
-  to\n    accidentally send emails to addresses other than those on a whitelist\n
-  \   which you configure. For example, you could use it in your web app's\n    staging
-  environment.\n"
+description: |2
+      Use RecipientInterceptor when you don't want your Ruby program to
+      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
 executables: []
 extensions: []
@@ -50,7 +65,8 @@ files:
 - lib/recipient_interceptor.rb
 - spec/recipient_interceptor_spec.rb
 homepage: http://github.com/croaky/recipient_interceptor
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -58,17 +74,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.0
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Intercept recipients when delivering email with the Mail gem.