From 8973fbcf08fcbfb7af8ad9fd9465ff3c2de06437 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Wed, 17 Oct 2018 10:38:51 -0400
Subject: Simplify incineration

---
 .../inbound_email/incineration_job.rb              | 11 -----------
 app/jobs/action_mailbox/incineration_job.rb        | 11 +++++++++++
 app/models/action_mailbox/inbound_email.rb         |  4 ++++
 .../action_mailbox/inbound_email/incineratable.rb  | 23 +++++-----------------
 .../inbound_email/incineratable/incineration.rb    |  4 ++--
 .../action_mailbox/inbound_email/routable.rb       |  2 +-
 6 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 app/jobs/action_mailbox/inbound_email/incineration_job.rb
 create mode 100644 app/jobs/action_mailbox/incineration_job.rb

(limited to 'app')

diff --git a/app/jobs/action_mailbox/inbound_email/incineration_job.rb b/app/jobs/action_mailbox/inbound_email/incineration_job.rb
deleted file mode 100644
index d9422a3fa8..0000000000
--- a/app/jobs/action_mailbox/inbound_email/incineration_job.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class ActionMailbox::InboundEmail::IncinerationJob < ApplicationJob
-  queue_as :action_mailbox_incineration
-
-  def self.schedule(inbound_email)
-    set(wait: ActionMailbox.incinerate_after).perform_later(inbound_email)
-  end
-
-  def perform(inbound_email)
-    inbound_email.incinerate
-  end
-end
diff --git a/app/jobs/action_mailbox/incineration_job.rb b/app/jobs/action_mailbox/incineration_job.rb
new file mode 100644
index 0000000000..e9f0c78e0f
--- /dev/null
+++ b/app/jobs/action_mailbox/incineration_job.rb
@@ -0,0 +1,11 @@
+class ActionMailbox::IncinerationJob < ApplicationJob
+  queue_as :action_mailbox_incineration
+
+  def self.schedule(inbound_email)
+    set(wait: ActionMailbox.incinerate_after).perform_later(inbound_email)
+  end
+
+  def perform(inbound_email)
+    inbound_email.incinerate
+  end
+end
diff --git a/app/models/action_mailbox/inbound_email.rb b/app/models/action_mailbox/inbound_email.rb
index f2589d7429..7d1a36b705 100644
--- a/app/models/action_mailbox/inbound_email.rb
+++ b/app/models/action_mailbox/inbound_email.rb
@@ -19,4 +19,8 @@ class ActionMailbox::InboundEmail < ActiveRecord::Base
   def source
     @source ||= raw_email.download
   end
+
+  def processed?
+    delivered? || failed? || bounced?
+  end
 end
diff --git a/app/models/action_mailbox/inbound_email/incineratable.rb b/app/models/action_mailbox/inbound_email/incineratable.rb
index 364231a443..198846422c 100644
--- a/app/models/action_mailbox/inbound_email/incineratable.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable.rb
@@ -2,27 +2,14 @@ module ActionMailbox::InboundEmail::Incineratable
   extend ActiveSupport::Concern
 
   included do
-    before_update :remember_to_incinerate_later
-    after_update_commit :incinerate_later, if: :incinerating_later?
+    after_update_commit :incinerate_later, if: -> { status_previously_changed? && processed? }
+  end
+
+  def incinerate_later
+    ActionMailbox::IncinerationJob.schedule self
   end
 
   def incinerate
     Incineration.new(self).run
   end
-
-  private
-    # TODO: Use enum change tracking once merged into Active Support
-    def remember_to_incinerate_later
-      if status_changed? && (delivered? || bounced? || failed?)
-        @incinerating_later = true
-      end
-    end
-
-    def incinerating_later?
-      @incinerating_later ||= false
-    end
-
-    def incinerate_later
-      ActionMailbox::InboundEmail::IncinerationJob.schedule(self)
-    end
 end
diff --git a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
index ab9311edfb..801cc0c8b9 100644
--- a/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
+++ b/app/models/action_mailbox/inbound_email/incineratable/incineration.rb
@@ -4,7 +4,7 @@ class ActionMailbox::InboundEmail::Incineratable::Incineration
   end
 
   def run
-    @inbound_email.destroy if due? && processed?
+    @inbound_email.destroy! if due? && processed?
   end
 
   private
@@ -13,6 +13,6 @@ class ActionMailbox::InboundEmail::Incineratable::Incineration
     end
 
     def processed?
-      @inbound_email.delivered? || @inbound_email.bounced? || @inbound_email.failed?
+      @inbound_email.processed?
     end
 end
diff --git a/app/models/action_mailbox/inbound_email/routable.rb b/app/models/action_mailbox/inbound_email/routable.rb
index 48b357af45..8f5b0ddd39 100644
--- a/app/models/action_mailbox/inbound_email/routable.rb
+++ b/app/models/action_mailbox/inbound_email/routable.rb
@@ -2,7 +2,7 @@ module ActionMailbox::InboundEmail::Routable
   extend ActiveSupport::Concern
 
   included do
-    after_create_commit :route_later, if: ->(inbound_email) { inbound_email.pending? }
+    after_create_commit :route_later, if: :pending?
   end
 
   def route_later
-- 
cgit v1.2.3


From 2b09cbbe4407ce84b23450b27b2c3b6f35e8ef1b Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Wed, 17 Oct 2018 12:42:54 -0400
Subject: Shush various interpreter warnings

---
 app/models/action_mailbox/inbound_email/message_id.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/models/action_mailbox/inbound_email/message_id.rb b/app/models/action_mailbox/inbound_email/message_id.rb
index 590dbfc4d7..a1ec5c0437 100644
--- a/app/models/action_mailbox/inbound_email/message_id.rb
+++ b/app/models/action_mailbox/inbound_email/message_id.rb
@@ -13,7 +13,7 @@ module ActionMailbox::InboundEmail::MessageId
     private
       def extract_message_id(raw_email)
         mail_from_source(raw_email.read).message_id
-      rescue => e
+      rescue
         # FIXME: Add logging with "Couldn't extract Message ID, so will generating a new random ID instead"
       end
   end
-- 
cgit v1.2.3