effective_postmark 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50d0871b03f629a03dff786e0cddbfb4a84f05714e24e4d4a5391ae373735be
-  data.tar.gz: e7453a8ce3aedbde5c5585710fe08a59097b80bdbda9855df0cb2eb981ee665f
+  metadata.gz: 4fe7f11d545296d6955abe9f0c934d791f64ebfae9fa6c648715b8e9b27e836b
+  data.tar.gz: a33fd5b23fbcb58730245be5201a8c1d965219f0e7c75116e79b0bdde57398a4
 SHA512:
-  metadata.gz: 18875557e8e5ebe42f2e6df162ccf46035a39523878533a5c5fee6f3d04465dfb9a134f4dbd5dfd40525b4c3e7bde378aa09f059dc038cc8244b7a3e3e549a13
-  data.tar.gz: a30e6ebfc8fbc396126e36deda1296e07dd4a222671ac4ec452cfef9efea6dce9875b3c796c8287dc2ab55071e6034fdcfdfdde2a982047070b6146ce8588637
+  metadata.gz: 7a25ef0fe93ca7217e03370437f062254212db1f1eec2837b295e758ba045e4bc2c92429671646900d426d066c6c65e12d4ec029d7ef3433e8c3be21d7fa9259
+  data.tar.gz: '0768ffeb2fb7b3f6f41d981418ce3206c6dcc63e827ab2f5f4e825c784427f9ec5adac8fa6528aaa7bad2066cbb3e688a4f204244c80a54096d235dc234d0975'

data/app/controllers/admin/postmark_reports_controller.rb

@@ -3,6 +3,8 @@ module Admin
     before_action(:authenticate_user!) if defined?(Devise)
     before_action { EffectiveResources.authorize!(self, :admin, :effective_postmark) }
 
+    include Effective::CrudController
+
     def inactive_recipients
       @datatable = Admin::ReportInactiveRecipientsDatatable.new
       @page_title = @datatable.datatable_name

data/app/helpers/effective_postmark_helper.rb

@@ -1,7 +1,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')
+  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?
 
@@ -19,7 +19,7 @@ module EffectivePostmarkHelper
   end
 
   # For use on the admin/users#edit page
-  def effective_postmark_admin_alert(user, from: nil, html_class: 'alert alert-danger')
+  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?
 
@@ -29,7 +29,7 @@ module EffectivePostmarkHelper
         "They will not receive any emails",
         ("from #{from}" if from),
         "while inactive.",
-        "Please update their email address, or" +
+        "Please update their email address, or " +
         link_to('reactivate their email', effective_postmark.postmark_reactivate_admin_postmark_path(user), 'data-method': :post),
         "and automatically attempt an email delivery."
       ].compact.join(' ').html_safe

data/app/mailers/concerns/effective_postmark_mailer.rb

@@ -9,8 +9,23 @@ module EffectivePostmarkMailer
       end
     end
 
-    rescue_from ::StandardError, with: :effective_postmark_error
-    rescue_from ::Postmark::InactiveRecipientError, with: :effective_postmark_inactive_recipient_error
+    rescue_from(::StandardError, with: :effective_postmark_error) unless Rails.env.test? || Rails.env.development?
+    rescue_from(::Postmark::InactiveRecipientError, with: :effective_postmark_inactive_recipient_error)
+  end
+
+  module ClassMethods
+    def postmark_settings
+      tenant = if defined?(Tenant)
+        Tenant.current || raise("Missing tenant in effective_postmark postmark_settings")
+      end
+
+      api_token = EffectivePostmark.api_token.presence || begin
+        raise("Missing effective_postmark api_token for tenant :#{tenant}. Please see config/initializers/effective_postmark.rb") if tenant.present?
+        raise("Missing effective_postmark api_token. Please see config/initializers/effective_postmark.rb")
+      end
+
+      { api_token: api_token }
+    end
   end
 
   def effective_postmark_inactive_recipient_error(exception)
@@ -41,6 +56,9 @@ module EffectivePostmarkMailer
   end
 
   def effective_postmark_error(exception)
+    Rails.logger.info "\e[31m\e[1mEMAIL FAILED\e[0m\e[22m" # bold red
+    Rails.logger.info "#{exception.inspect}"
+
     true
   end
 

data/app/views/admin/postmark_reports/index.html.haml

@@ -0,0 +1,4 @@
+%h1.effective-admin-heading= @page_title
+
+= card do
+  = render_datatable(@datatable)

data/config/effective_postmark.rb

@@ -4,13 +4,13 @@ EffectivePostmark.setup do |config|
   # config.layout = { application: 'application', admin: 'admin' }
 
   # API Key
-  config.api_token = ENV.fetch('POSTMARK_API_TOKEN')
+  # config.api_token = ENV.fetch('POSTMARK_API_TOKEN')
 
   # Mailer Settings
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
   #
   # Configure the class responsible to send e-mails.
-  # config.mailer = 'Effective::ClassifiedsMailer'
+  # config.mailer = 'Effective::PostmarkMailer'
   #
   # Override effective_resource mailer defaults
   #

data/config/locales/effective_postmark.en.yml

@@ -0,0 +1,8 @@
+en:
+  effective_postmark:
+    name: 'Effective Postmark'
+    acronym: 'Postmark'
+
+  datatables:
+    admin/report_inactive_recipients_datatable: 'Report: Inactive Recipients'
+

data/lib/effective_postmark/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_postmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,14 +219,15 @@ files:
 - app/controllers/admin/postmark_controller.rb
 - app/controllers/admin/postmark_reports_controller.rb
 - app/datatables/admin/report_inactive_recipients_datatable.rb
-- app/datatables/effective_postmark_datatable.rb
 - app/helpers/effective_postmark_helper.rb
 - app/mailers/concerns/effective_postmark_mailer.rb
 - app/mailers/effective/postmark_mailer.rb
 - app/models/concerns/effective_postmark_user.rb
 - app/models/effective/postmark_api.rb
+- app/views/admin/postmark_reports/index.html.haml
 - app/views/effective/postmark_mailer/reactivated.html.haml
 - config/effective_postmark.rb
+- config/locales/effective_postmark.en.yml
 - config/routes.rb
 - db/migrate/101_create_effective_postmark.rb
 - db/seeds.rb

data/app/datatables/effective_postmark_datatable.rb

@@ -1,29 +0,0 @@
-class EffectivePostmarkDatatable < Effective::Datatable
-  datatable do
-    order :subject, :asc
-    length :all
-
-    col :updated_at, visible: false
-    col :created_at, visible: false
-    col :id, visible: false
-
-    col :template_name, label: 'Name'
-
-    col :from, search: EffectivePostmark.mailer_froms do |email_template|
-      ERB::Util.html_escape_once(email_template.from)
-    end
-
-    col :cc
-    col :bcc
-    col :subject
-    col :body
-
-    col :content_type, visible: false
-
-    actions_col
-  end
-
-  collection do
-    Effective::EmailTemplate.all
-  end
-end