From 66c27289983bf48e8f8a8290706565312b46fff6 Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Wed, 31 Mar 2021 21:22:28 -0700
Subject: [PATCH] Fix Rubocop linting issues

---
 app/models/concerns/track_saved_changes.rb | 22 ++++++++++------------
 app/models/user.rb                         |  2 +-
 app/services/mailbluster_manager.rb        |  2 +-
 spec/services/mailbluster_manager_spec.rb  |  8 ++++----
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/models/concerns/track_saved_changes.rb b/app/models/concerns/track_saved_changes.rb
index 03596050..660e347d 100644
--- a/app/models/concerns/track_saved_changes.rb
+++ b/app/models/concerns/track_saved_changes.rb
@@ -17,7 +17,7 @@ module TrackSavedChanges
 
   # filter out any changes that result in the original value
   def saved_changes
-    @saved_changes_unfiltered.reject { |k,v| v[0] == v[1] }
+    @saved_changes_unfiltered.reject { |_k, v| v[0] == v[1] }
   end
 
   private
@@ -31,20 +31,18 @@ module TrackSavedChanges
   end
 
   # v is an an array of [prev, current]
-  def track_saved_change(k, v)
-    if @saved_changes_unfiltered.key? k
-      @saved_changes_unfiltered[k][1] = track_saved_value v[1]
+  def track_saved_change(key, value)
+    if @saved_changes_unfiltered.key? key
+      @saved_changes_unfiltered[key][1] = track_saved_value value[1]
     else
-      @saved_changes_unfiltered[k] = v.dup
+      @saved_changes_unfiltered[key] = value.dup
     end
   end
 
   # type safe dup inspred by http://stackoverflow.com/a/20955038
-  def track_saved_value(v)
-    begin
-      v.dup
-    rescue TypeError
-      v
-    end
+  def track_saved_value(value)
+    value.dup
+  rescue TypeError
+    value
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index c3efd46d..331ce805 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -391,7 +391,7 @@ class User < ApplicationRecord
 
   def mailbluster_update_email
     # FIXME: May fail if multiple saves occur in one commit
-    MailblusterEditLeadJob.perform_later(self, old_email: self.saved_changes['email'][0])
+    MailblusterEditLeadJob.perform_later(self, old_email: saved_changes['email'][0])
   end
 
   def touch_events
diff --git a/app/services/mailbluster_manager.rb b/app/services/mailbluster_manager.rb
index 6360413d..cb623d4a 100644
--- a/app/services/mailbluster_manager.rb
+++ b/app/services/mailbluster_manager.rb
@@ -46,4 +46,4 @@ class MailblusterManager
     }
     delete("/#{email_hash}", options).parsed_response
   end
-end
\ No newline at end of file
+end
diff --git a/spec/services/mailbluster_manager_spec.rb b/spec/services/mailbluster_manager_spec.rb
index 8c031df0..9f3d1be8 100644
--- a/spec/services/mailbluster_manager_spec.rb
+++ b/spec/services/mailbluster_manager_spec.rb
@@ -30,7 +30,7 @@ describe MailblusterManager, type: :model do
       }"
       stub_request(:post, url)
         .to_return(body: response_body, status: 200)
-      response = MailblusterManager.create_lead(user)
+      response = described_class.create_lead(user)
 
       expect(WebMock).to have_requested(:post, url).with(body: {
         'email':            user.email,
@@ -64,7 +64,7 @@ describe MailblusterManager, type: :model do
       user.save
       stub_request(:put, url + Digest::MD5.hexdigest(old_email))
         .to_return(body: response_body, status: 200)
-      response = MailblusterManager.edit_lead(user, old_email: old_email)
+      response = described_class.edit_lead(user, old_email: old_email)
 
       expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(old_email)).with(body: {
         'email':      user.email,
@@ -93,7 +93,7 @@ describe MailblusterManager, type: :model do
       stub_request(:put, url + Digest::MD5.hexdigest(user.email))
         .to_return(body: response_body, status: 200)
       add_tags = ['2021']
-      response = MailblusterManager.edit_lead(user, add_tags: add_tags)
+      response = described_class.edit_lead(user, add_tags: add_tags)
 
       expect(WebMock).to have_requested(:put, url + Digest::MD5.hexdigest(user.email)).with(body: {
         'email':      user.email,
@@ -115,7 +115,7 @@ describe MailblusterManager, type: :model do
       lead_url = url + email_hash.to_s
       stub_request(:delete, lead_url)
         .to_return(body: response_body)
-      response = MailblusterManager.delete_lead(user)
+      response = described_class.delete_lead(user)
 
       expect(WebMock).to have_requested(:delete, lead_url)
       expect(response).to eq(response_body)