effective_postmark 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad38ac05cb679e7d6a873dd77335e375509d348dd70bfa0dd036aec597b1d53
-  data.tar.gz: f736b293bede989795735bd97d1196bd66278173962b7f2d95a7d50d77d083a2
+  metadata.gz: fa5fb599ef1e178681b95d7853d6215ea51446851e6ea2fed4087b3927a6832f
+  data.tar.gz: 804b2ffcd11bc5f6a20df339b0ab4aa4bb5d3370eff443fbf807e71262846a6e
 SHA512:
-  metadata.gz: aa71507970666deeac958d1779bcf59d37a61d66df4cd5f4c002bacf4cfdfd47372e4c4235b1f14e7b01198ed8ffd1e3cacbe1f236cb170afdc774113de3b98d
-  data.tar.gz: dc70db2d2c8db52d8df1953d426af34029850089234da0e4bdc6e4d9e7f01eefa39a63b09492bad0789531bad71a86c855310fba538970a5160f59be16f92439
+  metadata.gz: dbe67ada0c62f056d6b1c8c5a373cee8470f7ad811409b4c25c5026a37ef66e0c879b1b9efd3386191f1ed8b565bb380228ea2e1feee9c5dd5f69ce37c5d4d68
+  data.tar.gz: 68f60078392756c29eefe54e43ecdd8e437d7b885b1ec3c3f101c641228d73a9cddd091a0c158537a7bec4797d676e0c876b5299e90e1c25ea26d46517863857

data/app/mailers/concerns/effective_postmark_mailer.rb

@@ -9,7 +9,23 @@ module EffectivePostmarkMailer
       end
     end
 
-    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)
@@ -39,4 +55,11 @@ module EffectivePostmarkMailer
     true
   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
+
 end

data/config/effective_postmark.rb

@@ -4,7 +4,7 @@ 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

data/lib/effective_postmark/version.rb

@@ -1,3 +1,3 @@
 module EffectivePostmark
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_postmark
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,7 +219,6 @@ 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

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