postmortem 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f42efab8900862f405e8f2d297dcc4b64880cfbfd354cacd829743b98d745bd
-  data.tar.gz: bee3ff5412d6998399a3139744f80b0c97afa497c0d3e837c743d559fef6da16
+  metadata.gz: e0231d0fd15050a1535451df10e0a700f2218345be118d911c495285c35548c3
+  data.tar.gz: 5427f04480ae4b3d59fc169949429ab17e8451cff4a7b008b84c5457766fde6b
 SHA512:
-  metadata.gz: 3e4152b134d8e9f5dcf6ef0eda380e89322135ca552b70ef8fea65970568b4116ebc1a97b709acd157fef68a0b9002d2cdb47a1f452b714da197af837beb75df
-  data.tar.gz: fa587024f07200df9d44eb9d457d19d57a500bab0f5ecd29f310af5ee700ffda888df069c322d6dd366fe072147d975d62b10d347d1798af0d423d68d12535b9
+  metadata.gz: e7568bba76a5439455684d7691216eb01e3e18165693ef649d85e981ed4cb88ab9fcfbb34abcc0d801e2080dcbd6ec4b6e10534221998c227a821e01c33d0593
+  data.tar.gz: 7f7467751d3d4975d908e322f58c2cf1c0948c213ef6a01e28c5071db52f682fcec41c515fe21067cae95cd4d4924e1dac5682e069a5d4f734d0abb9db0707d9

data/README.md

@@ -23,7 +23,7 @@ Add the gem to your application's Gemfile:
 
 ```ruby
 group :development, :test do
-  gem 'postmortem', '~> 0.2.1'
+  gem 'postmortem', '~> 0.2.3'
 end
 ```
 

data/layout/default.html.erb

@@ -62,7 +62,8 @@
         </div>
       </div>
     </div>
-    <iframe id="index-iframe" src="index.html"></iframe>
+    <iframe id="index-iframe" src="postmortem_index.html"></iframe>
+    <iframe id="identity-iframe" src="postmortem_identity.html"></iframe>
     <script type="text/javascript">
       <%= javascript_dependencies %>
     </script>

data/layout/layout.css

@@ -147,7 +147,7 @@
   height: 100%;
 }
 
-#index-iframe {
+#index-iframe, #identity-iframe {
   display: none;
 }
 

data/layout/layout.js

@@ -1,11 +1,14 @@
 (function () {
   let previousInbox;
   let currentView;
+  let reloadIdentityIframeTimeout;
+  let identityUuid;
   let indexUuid;
   let inboxInitialized = false;
 
   var htmlIframeDocument = document.querySelector("#html-iframe").contentDocument;
   var indexIframe = document.querySelector("#index-iframe");
+  var identityIframe = document.querySelector("#identity-iframe");
   var textIframeDocument = document.querySelector("#text-iframe").contentDocument;
   var sourceIframeDocument = document.querySelector("#source-iframe").contentDocument;
   var sourceHighlightBundle = [
@@ -22,16 +25,21 @@
   const initialize = () => {
     loadMail(initialData);
 
-    let reloadIframeTimeout = setTimeout(() => indexIframe.src += '', 3000);
+    reloadIdentityIframeTimeout = setTimeout(() => identityIframe.src += '', 3000);
 
     window.addEventListener('message', function (ev) {
-      clearTimeout(reloadIframeTimeout);
-      reloadIframeTimeout = setTimeout(() => indexIframe.src += '', 3000);
-      if (indexUuid !== ev.data.uuid) renderInbox(ev.data.mails);
-      indexUuid = ev.data.uuid;
+      switch (ev.data.type) {
+        case 'index':
+          renderInbox(ev.data.uuid, ev.data.mails);
+          break;
+        case 'identity':
+          compareIdentity(ev.data.uuid);
+          break;
+      };
     });
 
     setInterval(function () { indexIframe.contentWindow.postMessage('HELO', '*'); }, 1000);
+    setInterval(function () { identityIframe.contentWindow.postMessage('HELO', '*'); }, 1000);
 
     toolbar.html.onclick    = function (ev) { setView('html', ev); };
     toolbar.text.onclick    = function (ev) { setView('text', ev); };
@@ -215,25 +223,36 @@
     $("#download-link").attr('href', uri);
   };
 
-  const renderInbox = function (mails) {
-    const html = mails.map((mail, invertedIndex) => {
-      const index = (mails.length - 1) - invertedIndex;
+  const compareIdentity = (uuid) => {
+    clearTimeout(reloadIdentityIframeTimeout);
+    reloadIdentityIframeTimeout = setTimeout(() => identityIframe.src += '', 3000);
+    if (identityUuid !== uuid) indexIframe.src += '';
+    identityUuid = uuid;
+  };
+
+  const renderInbox = (uuid, mails) => {
+    if (uuid === indexUuid) {
+      return;
+    }
+    const mailsById = {};
+    const html = mails.map((mail, index) => {
       const parsedTimestamp = new Date(mail.timestamp);
       const timestampSpan = `<span class="timestamp">${parsedTimestamp.toLocaleString()}</span>`;
       const classes = ['list-group-item', 'inbox-item'];
-      if (window.location.hash === '#' + index) classes.push('active');
-      return `<li data-email-index="${index}" class="${classes.join(' ')}"><a title="${mail.subject}" href="javascript:void(0)">${mail.subject}</a>${timestampSpan}</li>`
+      if (window.location.hash === '#' + mail.id) classes.push('active');
+      mailsById[mail.id] = mail;
+      return `<li data-email-id="${mail.id}" class="${classes.join(' ')}"><a title="${mail.subject}" href="javascript:void(0)">${mail.subject}</a>${timestampSpan}</li>`
     });
     if (arrayIdentical(html, previousInbox)) return;
     previousInbox = html;
     $('#inbox').html('<ul class="list-group">' + html.join('\n') + '</ul>');
     $('.inbox-item').click((ev) => {
       const $target = $(ev.currentTarget);
-      const index = $target.data('email-index');
+      const id = $target.data('email-id');
       $('.inbox-item').removeClass('active');
       $target.addClass('active');
-      window.location.hash = index;
-      setTimeout(() => loadMail(mails[index].content), 0);
+      window.location.hash = id;
+      setTimeout(() => loadMail(mailsById[id].content), 0);
     });
 
     if (!inboxInitialized) {
@@ -242,6 +261,7 @@
       setVisible(inbox, true);
     }
     inboxInitialized = true;
+    indexUuid = uuid;
   };
 
   initialize();

data/layout/postmortem_identity.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<body>
+<div data-uuid="<%= uuid %>" id="identity">
+</div>
+<script>
+  window.addEventListener('message', function (ev) {
+    const identity = document.querySelector('#identity');
+    const uuid = identity.dataset.uuid;
+    const type = 'identity';
+    ev.source.postMessage({ uuid, type }, '*');
+  });
+
+  setInterval(function () {
+    window.location.reload();
+  }, 3000);
+
+</script>
+</body>
+</html>

data/layout/{index.html.erb → postmortem_index.html.erb}

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<div data-uuid="<%= SecureRandom.uuid %>" id="index">
+<div data-uuid="<%= uuid %>" id="index">
 ### INDEX START
 <% encoded_index.each do |encoded| -%>
 <%= encoded %>
@@ -13,16 +13,13 @@
     const filter = (line) => line !== '' && !line.startsWith('### INDEX');
     const index = document.querySelector('#index');
     const uuid = index.dataset.uuid;
+    const type = 'index';
     const mails = index.innerText
                        .split('\n')
                        .filter(filter)
                        .map(line => JSON.parse(atob(line)));
-    ev.source.postMessage({ uuid, mails }, '*');
+    ev.source.postMessage({ uuid, type, mails }, '*');
   });
-
-  setInterval(function () {
-    window.location.reload();
-  }, 3000);
 </script>
 </body>
 </html>

data/lib/postmortem.rb

@@ -8,12 +8,14 @@ require 'mail'
 require 'erb'
 require 'json'
 require 'cgi'
+require 'digest'
 
 require 'postmortem/version'
 require 'postmortem/adapters'
 require 'postmortem/delivery'
 require 'postmortem/layout'
 require 'postmortem/configuration'
+require 'postmortem/identity'
 require 'postmortem/index'
 
 # HTML email inspection tool.

data/lib/postmortem/adapters/mail.rb

@@ -10,7 +10,7 @@ module Postmortem
         %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 })
+          .merge({ text_body: @data.text_part&.decoded, html_body: @data.html_part&.decoded })
       end
 
       def mail

data/lib/postmortem/delivery.rb

@@ -7,8 +7,9 @@ module Postmortem
 
     def initialize(mail)
       @mail = mail
-      @path = Postmortem.config.preview_directory.join('emails.html')
-      @index_path = Postmortem.config.preview_directory.join('index.html')
+      @path = Postmortem.config.preview_directory.join('index.html')
+      @index_path = Postmortem.config.preview_directory.join('postmortem_index.html')
+      @identity_path = Postmortem.config.preview_directory.join('postmortem_identity.html')
     end
 
     def record
@@ -16,20 +17,17 @@ module Postmortem
       content = Layout.new(@mail).content
       path.write(content)
       index_path.write(index.content)
+      @identity_path.write(identity.content)
     end
 
     private
 
     def index
-      @index ||= Index.new(index_path, path, timestamp, @mail)
+      @index ||= Index.new(index_path, path, @mail)
     end
 
-    def timestamp
-      @timestamp ||= Time.now
-    end
-
-    def token
-      SecureRandom.hex(4)
+    def identity
+      @identity ||= Identity.new
     end
 
     def subject

data/lib/postmortem/identity.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Postmortem
+  # Provides an HTML document that announces a unique ID to a parent page via JS message events.
+  class Identity
+    def content
+      ERB.new(File.read(path), nil, '-').result(binding)
+    end
+
+    private
+
+    def uuid
+      @uuid ||= SecureRandom.uuid
+    end
+
+    def path
+      File.expand_path(File.join(__dir__, '..', '..', 'layout', 'postmortem_identity.html.erb'))
+    end
+  end
+end

data/lib/postmortem/index.rb

@@ -3,10 +3,9 @@
 module Postmortem
   # Generates and parses an index of previously-sent emails.
   class Index
-    def initialize(index_path, mail_path, timestamp, mail)
+    def initialize(index_path, mail_path, mail)
       @index_path = index_path
       @mail_path = mail_path
-      @timestamp = timestamp.iso8601
       @mail = mail
     end
 
@@ -21,6 +20,14 @@ module Postmortem
 
     private
 
+    def uuid
+      @uuid ||= SecureRandom.uuid
+    end
+
+    def timestamp
+      Time.now.iso8601
+    end
+
     def encoded_index
       return [encoded_mail] unless @index_path.file?
 
@@ -28,13 +35,13 @@ module Postmortem
     end
 
     def encoded_mail
-      Base64.encode64(mail_data.to_json).split("\n").join
+      Base64.encode64(mail_data.merge(id: Digest::MD5.hexdigest(mail_data.to_json)).to_json).split("\n").join
     end
 
     def mail_data
       {
         subject: @mail.subject || '(no subject)',
-        timestamp: @timestamp,
+        timestamp: timestamp,
         path: @mail_path,
         content: @mail.serializable
       }
@@ -54,7 +61,7 @@ module Postmortem
     end
 
     def template_path
-      File.expand_path(File.join(__dir__, '..', '..', 'layout', 'index.html.erb'))
+      File.expand_path(File.join(__dir__, '..', '..', 'layout', 'postmortem_index.html.erb'))
     end
   end
 end

data/lib/postmortem/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postmortem
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Bob Farrell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -145,9 +145,10 @@ files:
 - layout/dependencies.css
 - layout/dependencies.js
 - layout/headers_template.html
-- layout/index.html.erb
 - 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
@@ -156,6 +157,7 @@ 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