effective_postmark 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe7f11d545296d6955abe9f0c934d791f64ebfae9fa6c648715b8e9b27e836b
-  data.tar.gz: a33fd5b23fbcb58730245be5201a8c1d965219f0e7c75116e79b0bdde57398a4
+  metadata.gz: 3c865f268155269e90bfab82beaca405a2adfed8b20c7156214f5b95574986c3
+  data.tar.gz: 183783ce5068b9b1abfdba98551d1a812a070f414a56f0fe787826a0855dd680
 SHA512:
-  metadata.gz: 7a25ef0fe93ca7217e03370437f062254212db1f1eec2837b295e758ba045e4bc2c92429671646900d426d066c6c65e12d4ec029d7ef3433e8c3be21d7fa9259
-  data.tar.gz: '0768ffeb2fb7b3f6f41d981418ce3206c6dcc63e827ab2f5f4e825c784427f9ec5adac8fa6528aaa7bad2066cbb3e688a4f204244c80a54096d235dc234d0975'
+  metadata.gz: d927becf5cb36887f8a3093975e6b5cf543d9fe34d73fa11900372ec9807d484a5b40ae7e7d7e5ed30fb3e01f702f765b582a038526d8151309e965c674694db
+  data.tar.gz: bf2041254c685af6d7c2dbe5f64c2ba3ecf9ae62a5fbee7dd0fafe319992361a8842fbe2a19b2f2cf746d1691050f1b5feaaca92ec75ac1f036a9617575b7d65

data/README.md

@@ -38,8 +38,8 @@ And add two database fields to your user model:
 ```ruby
 class AddEffectivePostmarkFieldsToUsers < ActiveRecord::Migration[7.0]
   def change
-    add_column :users, :postmark_error, :string
-    add_column :users, :postmark_error_at, :datetime
+    add_column :users, :email_delivery_error, :string
+    add_column :users, :email_delivery_error_at, :datetime
   end
 end
 ```
@@ -73,9 +73,9 @@ If you want to include the inactive alert on the devise reset password page:
 ```ruby
 class Users::PasswordsController < Devise::PasswordsController
   after_action(only: :create) do
-    if resource.try(:postmark_invalid?)
+    if resource.email_delivery_error.present?
       flash.delete(:notice)
-      flash[:danger] = view_context.effective_postmark_alert(resource, from: 'MyARTA', html_class: '')
+      flash[:danger] = view_context.effective_postmark_alert(resource, from: 'My Site', html_class: '')
     end
   end
 end
@@ -86,7 +86,7 @@ end
 Add a link to the admin report:
 
 ```ruby
-= nav_link_to 'Inactive Recipients', effective_postmark.inactive_recipients_admin_postmark_reports_path
+= nav_link_to 'Email Delivery Errors', effective_postmark.email_delivery_errors_admin_postmark_reports_path
 ```
 
 ### Permissions
@@ -95,8 +95,8 @@ Give the following permissions to your admin user:
 
 ```ruby
 can :admin, :effective_postmark
-can(:postmark_reactivate, User) { |user| user.postmark_invalid? }
-can(:index, Admin::ReportInactiveRecipientsDatatable)
+can(:postmark_reactivate, User) { |user| user.email_delivery_error.present? }
+can(:index, Admin::ReportEmailDeliveryErrorsDatatable)
 ```
 
 ## License

data/app/controllers/admin/postmark_reports_controller.rb

@@ -5,8 +5,8 @@ module Admin
 
     include Effective::CrudController
 
-    def inactive_recipients
-      @datatable = Admin::ReportInactiveRecipientsDatatable.new
+    def email_delivery_errors
+      @datatable = Admin::ReportEmailDeliveryErrorsDatatable.new
       @page_title = @datatable.datatable_name
 
       authorize! :index, @datatable

data/app/datatables/admin/{report_inactive_recipients_datatable.rb → report_email_delivery_errors_datatable.rb}

@@ -1,7 +1,6 @@
 # Postmark: Inactive Recipients
-
 module Admin
-  class ReportInactiveRecipientsDatatable < Effective::Datatable
+  class ReportEmailDeliveryErrorsDatatable < Effective::Datatable
     datatable do
       col :id, visible: false
 
@@ -16,8 +15,8 @@ module Admin
       col :first_name, visible: false
       col :last_name, visible: false
 
-      col :postmark_error
-      col :postmark_error_at
+      col :email_delivery_error
+      col :email_delivery_error_at
 
       actions_col(actions: []) do |user|
         dropdown_link_to('Reactivate', effective_postmark.postmark_reactivate_admin_postmark_path(user), remote: true, method: :post)
@@ -26,7 +25,7 @@ module Admin
     end
 
     collection do
-      current_user.class.postmark_inactive_recipients
+      current_user.class.with_email_delivery_errors
     end
   end
 end

data/app/helpers/effective_postmark_helper.rb

@@ -3,7 +3,7 @@ module EffectivePostmarkHelper
   # For use on the regular user alerts and forgot password pages
   def effective_postmark_alert(user, from: nil, html_class: 'alert alert-danger mb-4')
     raise('expected an effective_postmark_user') unless user.class.try(:effective_postmark_user?)
-    return unless user.postmark_invalid?
+    return unless user.email_delivery_error.present?
 
     content_tag(:div, class: html_class) do
       [
@@ -21,7 +21,7 @@ module EffectivePostmarkHelper
   # For use on the admin/users#edit page
   def effective_postmark_admin_alert(user, from: nil, html_class: 'alert alert-danger mb-4')
     raise('expected an effective_postmark_user') unless user.class.try(:effective_postmark_user?)
-    return unless user.postmark_invalid?
+    return unless user.email_delivery_error.present?
 
     content_tag(:div, class: html_class) do
       [

data/app/models/concerns/effective_postmark_user.rb

@@ -15,15 +15,16 @@ module EffectivePostmarkUser
 
   included do
     effective_resource do
-      postmark_error      :string
-      postmark_error_at   :datetime
+      email_delivery_error      :string
+      email_delivery_error_at   :datetime
     end
 
-    before_validation(if: -> { email_changed? && postmark_invalid? }) do
-      assign_attributes(postmark_error: nil, postmark_error_at: nil)
+    # Clear any email errors if they change their email
+    before_validation(if: -> { email_changed? && email_delivery_error.present? }) do
+      assign_attributes(email_delivery_error: nil, email_delivery_error_at: nil)
     end
 
-    scope :postmark_inactive_recipients, -> { where.not(postmark_error_at: nil) }
+    scope :with_email_delivery_errors, -> { where.not(email_delivery_error: nil) }
   end
 
   module ClassMethods
@@ -32,9 +33,9 @@ module EffectivePostmarkUser
 
   # Triggered by the EffectivePostmarkMailer concern when a Postmark::InactiveRecipientError is raised
   def postmark_inactive_recipient!
-    return unless postmark_valid? # If we already marked invalid, don't mark again
+    return if email_delivery_error.present? # If we already marked invalid, don't mark again
 
-    update_columns(postmark_error: 'Inactive Recipient', postmark_error_at: Time.zone.now)
+    update_columns(email_delivery_error: 'Inactive Recipient', email_delivery_error_at: Time.zone.now)
   end
 
   # Triggered by an admin to reactivate the email address
@@ -48,15 +49,7 @@ module EffectivePostmarkUser
     return false if message.kind_of?(Exception)
 
     # This worked. We've been reactivated. Clear the error
-    update_columns(postmark_error: nil, postmark_error_at: nil)
-  end
-
-  def postmark_valid?
-    postmark_error.blank?
-  end
-
-  def postmark_invalid?
-    postmark_error.present?
+    update_columns(email_delivery_error: nil, email_delivery_error_at: nil)
   end
 
 end

data/config/locales/effective_postmark.en.yml

@@ -4,5 +4,5 @@ en:
     acronym: 'Postmark'
 
   datatables:
-    admin/report_inactive_recipients_datatable: 'Report: Inactive Recipients'
+    admin/report_email_delivery_errors_datatable: 'Report: Email Delivery Errors'
 

data/config/routes.rb

@@ -6,7 +6,7 @@ EffectivePostmark::Engine.routes.draw do
 
     resources :postmark_reports, only: [] do
       collection do
-        get :inactive_recipients
+        get :email_delivery_errors
       end
     end
   end

data/lib/effective_postmark/version.rb

@@ -1,3 +1,3 @@
 module EffectivePostmark
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_postmark
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Code and Effect
@@ -218,7 +218,7 @@ files:
 - README.md
 - app/controllers/admin/postmark_controller.rb
 - app/controllers/admin/postmark_reports_controller.rb
-- app/datatables/admin/report_inactive_recipients_datatable.rb
+- app/datatables/admin/report_email_delivery_errors_datatable.rb
 - app/helpers/effective_postmark_helper.rb
 - app/mailers/concerns/effective_postmark_mailer.rb
 - app/mailers/effective/postmark_mailer.rb