postmortem 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d675b984abb71e212b6c7f3e190c9bf8d17282ed0741b260cf06891cff5b70d
-  data.tar.gz: 408e888943fe644d76b686d3693588378c513138ea88d82da633bf0c2367f19e
+  metadata.gz: 3e05359d9e039f6e44c0e89decaac3c5c72fe3447f7a96fdb8ac1667fe93d537
+  data.tar.gz: 651d2b986f6b9b07e8fe311cd163865490005da3376c95c4ce05a4110a313e62
 SHA512:
-  metadata.gz: c6cddb8f06e21fd028b7531d79efabf8320e86a22670cfed45901b189d563249cd1a420859ff8cbf1a7a542a15d8c908018a6fb8477ec023407997e7d51338e9
-  data.tar.gz: cfda5e45b5302a36cbd7503b418142c13f5c0e458ca0ba1e705503513b9549e5c41d440af485bade2db280a1890fffef5df33bfd487250e38762ee7a811b4992
+  metadata.gz: 66a929b9cfa7043ebce54eda09c4168e4adfd485d24e32720dc68238c6ea578030c89ad90181d770b22b33d358c2945bae12cc5df9a8f3d3019989b6a72cc8ca
+  data.tar.gz: 82478c5ef6a04531776023947b39b3c1c04a003185a602199a4460e2ba4b6759a87493475666f4056d0bcc759b7de3a5765db8b3356d28e863e71ed445ca7e2a

data/README.md

@@ -10,7 +10,8 @@ _Postmortem_ should only be enabled in test or development environments.
 
 ## Features
 
-* Seamless integration with [_ActionMailer_](https://guides.rubyonrails.org/action_mailer_basics.html) and [_Pony_](https://github.com/benprew/pony) (with automatic delivery skipping when using _Pony_).
+* Seamless integration with [_ActionMailer_](https://guides.rubyonrails.org/action_mailer_basics.html), [_Pony_](https://github.com/benprew/pony), [_Mail_](https://github.com/mikel/mail), etc.
+* Email deliveries are always intercepted (can be configured to pass through).
 * Preview email content as well as typical email headers (recipients, subject, etc.).
 * View rendered _HTML_, plaintext, or _HTML_ source with syntax highlighting (courtesy of [highlight.js](https://highlightjs.org/)).
 * Dual or single column view to suit your requirements.
@@ -22,7 +23,7 @@ Add the gem to your application's Gemfile:
 
 ```ruby
 group :development, :test do
-  gem 'postmortem', '~> 0.1.1'
+  gem 'postmortem', '~> 0.1.2'
 end
 ```
 
@@ -80,8 +81,8 @@ Postmortem.configure do |config|
   # See `layout/default.html.erb` for implementation reference.
   config.layout = '/path/to/layout'
 
-  # Skip delivery of emails when using Pony (default: true).
-  config.pony_skip_delivery = true
+  # Skip delivery of emails when using Pony, Mail, etc. (default: true).
+  config.mail_skip_delivery = true
 end
 ```
 

data/lib/postmortem.rb

@@ -66,3 +66,4 @@ end
 Postmortem.configure
 Postmortem.try_load('action_mailer', 'active_support', plugin: 'action_mailer')
 Postmortem.try_load('pony', plugin: 'pony')
+Postmortem.try_load('mail', plugin: 'mail')

data/lib/postmortem/adapters.rb

@@ -2,6 +2,7 @@
 
 require 'postmortem/adapters/base'
 require 'postmortem/adapters/action_mailer'
+require 'postmortem/adapters/mail'
 require 'postmortem/adapters/pony'
 
 module Postmortem

data/lib/postmortem/adapters/action_mailer.rb

@@ -34,11 +34,11 @@ module Postmortem
       end
 
       def mail
-        @mail ||= Mail.new(@data[:mail])
+        @mail ||= ::Mail.new(@data[:mail])
       end
 
       def normalized_bcc
-        Mail.new(to: @data[:bcc]).to
+        ::Mail.new(to: @data[:bcc]).to
       end
 
       def text?

data/lib/postmortem/adapters/mail.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Postmortem
+  module Adapters
+    # Mail adapter.
+    class Mail < Base
+      private
+
+      def adapted
+        %i[from reply_to to cc bcc subject]
+          .map { |field| [field, @data.public_send(field)] }
+          .to_h
+          .merge({ text_body: @data.text_part, html_body: @data.html_part })
+      end
+
+      def mail
+        @mail ||= @data
+      end
+    end
+  end
+end

data/lib/postmortem/adapters/pony.rb

@@ -20,7 +20,7 @@ module Postmortem
       end
 
       def mail
-        @mail ||= Mail.new(@data.select { |key| keys.include?(key) })
+        @mail ||= ::Mail.new(@data.select { |key| keys.include?(key) })
       end
 
       def keys

data/lib/postmortem/configuration.rb

@@ -3,7 +3,7 @@
 module Postmortem
   # Provides interface for configuring Postmortem and implements sensible defaults.
   class Configuration
-    attr_writer :colorize, :timestamp, :pony_skip_delivery
+    attr_writer :colorize, :timestamp, :mail_skip_delivery
     attr_accessor :log_path
 
     def timestamp
@@ -32,8 +32,8 @@ module Postmortem
       @preview_directory ||= Pathname.new(File.join(Dir.tmpdir, 'postmortem'))
     end
 
-    def pony_skip_delivery
-      defined?(@pony_skip_delivery) ? @pony_skip_delivery : true
+    def mail_skip_delivery
+      defined?(@mail_skip_delivery) ? @mail_skip_delivery : true
     end
   end
 end

data/lib/postmortem/plugins/mail.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+Mail::SMTP.class_eval do
+  alias_method :_original_deliver!, :deliver!
+
+  def deliver!(mail)
+    result = _original_deliver!(mail) unless Postmortem.config.mail_skip_delivery
+    Postmortem.record_delivery(Postmortem::Adapters::Mail.new(mail))
+    result
+  end
+end

data/lib/postmortem/plugins/pony.rb

@@ -3,10 +3,13 @@
 # Pony monkey-patch.
 module Pony
   class << self
-    alias _pony_mail mail
+    alias _original_mail mail
 
     def mail(options)
-      result = _pony_mail(options) unless Postmortem.config.pony_skip_delivery
+      # SMTP delivery is handled by Mail plugin further down the stack
+      return _original_mail(options) if options[:via].to_s == 'smtp'
+
+      result = _original_mail(options) unless Postmortem.config.mail_skip_delivery
       Postmortem.record_delivery(Postmortem::Adapters::Pony.new(options))
       result
     end

data/lib/postmortem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Postmortem
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postmortem
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Bob Farrell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2021-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -145,11 +145,13 @@ files:
 - lib/postmortem/adapters.rb
 - lib/postmortem/adapters/action_mailer.rb
 - lib/postmortem/adapters/base.rb
+- lib/postmortem/adapters/mail.rb
 - lib/postmortem/adapters/pony.rb
 - lib/postmortem/configuration.rb
 - lib/postmortem/delivery.rb
 - lib/postmortem/layout.rb
 - lib/postmortem/plugins/action_mailer.rb
+- lib/postmortem/plugins/mail.rb
 - lib/postmortem/plugins/pony.rb
 - lib/postmortem/version.rb
 - postmortem.gemspec
@@ -160,7 +162,7 @@ metadata:
   homepage_uri: https://github.com/bobf/postmortem
   source_code_uri: https://github.com/bobf/postmortem
   changelog_uri: https://github.com/bobf/postmortem/blob/master/README.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Development HTML Email Inspection Tool
 test_files: []