postmortem 0.1.3 → 0.2.5

data/lib/postmortem/layout.rb

@@ -3,8 +3,8 @@
 module Postmortem
   # Wraps provided body in an enclosing layout for presentation purposes.
   class Layout
-    def initialize(adapter)
-      @adapter = adapter
+    def initialize(mail)
+      @mail = mail
     end
 
     def format_email_array(array)
@@ -12,8 +12,91 @@ module Postmortem
     end
 
     def content
-      mail = @adapter
+      mail = @mail
+      mail.html_body = with_inlined_images(mail.html_body) if defined?(Nokogiri)
       ERB.new(Postmortem.config.layout.read).result(binding)
     end
+
+    def styles
+      default_layout_directory.join('layout.css').read
+    end
+
+    def javascript
+      default_layout_directory.join('layout.js').read
+    end
+
+    def css_dependencies
+      default_layout_directory.join('dependencies.css').read
+    end
+
+    def javascript_dependencies
+      default_layout_directory.join('dependencies.js').read
+    end
+
+    def headers_template
+      default_layout_directory.join('headers_template.html').read
+    end
+
+    def favicon_b64
+      default_layout_directory.join('favicon.b64').read
+    end
+
+    private
+
+    def default_layout_directory
+      Postmortem.root.join('layout')
+    end
+
+    def with_inlined_images(body)
+      parsed = Nokogiri::HTML.parse(body)
+      parsed.css('img').each do |img|
+        uri = try_uri(img['src'])
+        next unless local_file?(uri)
+
+        path = located_image(uri)
+        img['src'] = encoded_image(path) unless path.nil?
+      end
+      parsed.to_s
+    end
+
+    def local_file?(uri)
+      return false if uri.nil?
+      return true if uri.host.nil?
+      return true if /^www\.example\.[a-z]+$/.match(uri.host)
+      return true if %w[127.0.0.1 localhost].include?(uri.host)
+
+      false
+    end
+
+    def try_uri(uri)
+      URI(uri)
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    def located_image(uri)
+      path = uri.path.partition('/').last
+      common_locations.each do |location|
+        full_path = location.join(path)
+        next unless full_path.file?
+
+        return full_path
+      end
+
+      nil
+    end
+
+    def encoded_image(path)
+      "data:#{mime_type(path)};base64,#{Base64.encode64(path.read)}"
+    end
+
+    def common_locations
+      ['public/assets', 'app/assets/images'].map { |path| Pathname.new(path) }
+    end
+
+    def mime_type(path)
+      extension = path.extname.partition('.').last
+      extension == 'jpg' ? 'jpeg' : extension
+    end
   end
 end

data/lib/postmortem/plugins/action_mailer.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
 ActiveSupport::Notifications.subscribe 'deliver.action_mailer' do |*args|
+  delivery_method = Rails.try(:application)
+                         &.try(:config)
+                         &.try(:action_mailer)
+                         &.try(:delivery_method)
+  next if delivery_method.nil?
+  next if %i[sendmail smtp].include?(delivery_method&.to_sym) # Delegate to Mail plugin.
+
   Postmortem.record_delivery(Postmortem::Adapters::ActionMailer.new(args.extract_options!))
 end

data/lib/postmortem/version.rb

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

data/postmortem.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Preview HTML emails in your browser during development'
   spec.homepage      = 'https://github.com/bobf/postmortem'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -28,10 +28,12 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mail', '~> 2.7'
 
   spec.add_development_dependency 'actionmailer', '~> 6.0'
+  spec.add_development_dependency 'devpack', '~> 0.3.2'
   spec.add_development_dependency 'pony', '~> 1.13'
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'rspec-its', '~> 1.3'
-  spec.add_development_dependency 'rubocop', '~> 0.88.0'
+  spec.add_development_dependency 'rubocop', '~> 1.10'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
   spec.add_development_dependency 'strong_versions', '~> 0.4.5'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postmortem
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: devpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: pony
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: '1.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: strong_versions
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +160,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -141,6 +170,14 @@ files:
 - bin/setup
 - doc/screenshot.png
 - layout/default.html.erb
+- layout/dependencies.css
+- layout/dependencies.js
+- layout/favicon.b64
+- layout/headers_template.html
+- layout/layout.css
+- layout/layout.js
+- layout/postmortem_identity.html.erb
+- layout/postmortem_index.html.erb
 - lib/postmortem.rb
 - lib/postmortem/adapters.rb
 - lib/postmortem/adapters/action_mailer.rb
@@ -149,6 +186,8 @@ files:
 - lib/postmortem/adapters/pony.rb
 - lib/postmortem/configuration.rb
 - lib/postmortem/delivery.rb
+- lib/postmortem/identity.rb
+- lib/postmortem/index.rb
 - lib/postmortem/layout.rb
 - lib/postmortem/plugins/action_mailer.rb
 - lib/postmortem/plugins/mail.rb
@@ -170,14 +209,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project:
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: Development HTML Email Inspection Tool