effective_messaging 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a668f509158897d567a7b1e84716778f689884dd508727012d40d8a8670a29a
-  data.tar.gz: 6c95fee8792b048e63eb0ad01345a8d1f8ee6dca3be2d1838f7b1775e21b0ac1
+  metadata.gz: fc984bf85e3e2cf47b5ceaae61d98dc2b336ea34d1ed802c439c7854beabc3b0
+  data.tar.gz: 2c695ed99c62e9b4d0d9a42f64d557fdabc8f151d0d5c32b28ed881c4de13385
 SHA512:
-  metadata.gz: c6bec69c0c21ce2dbfad2c58080a80ae16021797e73dc0bb5bc70e1fe4cdbf194674b13afd894ba0896e2c86dfc044132bb03245532ba295f0a2f51efbfbda47
-  data.tar.gz: 04046c99f01cb6a27841d456b32dc08f166af7fe425b73b369bf86a0cd8a237e05419242220faa06ff24fe7e83a79ab76008dc2df3af48b840acc08432650297
+  metadata.gz: 462f2e88796ea1a1b9e0af27abafe25c580f42ee8b75259ecde6af4a99c1044ba765f7f9c13c2764337f82e179fc2cf9e72e1e33420ff1a270fffef35b0df75d
+  data.tar.gz: 95c16f285e650a356c08c85b922385246912bb6c14fab53d406e722e9010bc123266bcc0941a94ca93ec98fb27d3e83fd3f7ccb4b1623bf90a3a7b66a2da73e4

data/app/datatables/admin/effective_notifications_datatable.rb

@@ -37,13 +37,13 @@ module Admin
       col :notifiable_tomorrow_rows_count, label: 'Tomorrow'
 
       col(:rows_count) do |notification|
-        notification.report.collection().count
+        notification.report&.collection()&.count.to_i
       end
 
       col :subject
       col :body, visible: false
 
-      col :from, visible: false, search: Array(EffectiveMessaging.froms).presence
+      col :from, visible: false, search: EffectiveMessaging.mailer_froms
       col :cc, visible: false
       col :bcc, visible: false
 

data/app/models/effective/notification.rb

@@ -83,7 +83,7 @@ module Effective
     scope :disabled, -> { where(enabled: false) }
 
     before_validation do
-      self.from ||= EffectiveMessaging.froms.first
+      self.from ||= EffectiveMessaging.mailer_froms.first
     end
 
     # Emails or Report

data/app/views/admin/notifications/_form_notification.html.haml

@@ -55,13 +55,8 @@
   %h2 Notification
   %p The following email notification will be sent
 
-  - froms = Array(EffectiveMessaging.froms) - [nil, '']
-
-  - if froms.present?
-    = f.radios :from, froms
-  - else
-    = f.email_field :from
-
+  - f.object.from ||= EffectiveMessaging.mailer_froms.first
+  = f.select :from, EffectiveMessaging.mailer_froms
   = f.email_field :bcc
   = f.text_field :subject
   = f.text_area :body, rows: 20

data/config/effective_messaging.rb

@@ -3,10 +3,6 @@ EffectiveMessaging.setup do |config|
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }
 
-  # From Settings
-  # For the Admin new notification form. Set to an array to use a select, or nil to use a freeform text entry
-  config.froms = ['noreply@example.com']
-
   # Mailer Settings
   # Please see config/initializers/effective_messaging.rb for default effective_* gem mailer settings
   #
@@ -19,6 +15,7 @@ EffectiveMessaging.setup do |config|
   # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
   # config.mailer_layout = nil      # Default mailer layout
   # config.mailer_sender = nil      # Default From value
+  # config.mailer_froms = nil       # Default Froms collection
   # config.mailer_admin = nil       # Default To value for Admin correspondence
   # config.mailer_subject = nil     # Proc.new method used to customize Subject
 

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/effective_messaging.rb

@@ -10,7 +10,7 @@ module EffectiveMessaging
       :chats_table_name, :chat_users_table_name, :chat_messages_table_name, :notifications_table_name, :notification_logs_table_name,
       :layout,
       :froms,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject
     ]
   end
 

data/lib/tasks/effective_messaging_tasks.rake

@@ -14,10 +14,10 @@ namespace :effective_messaging do
         begin
           notification.notify!
           Rails.logger.info "Sent notifications for #{notification} and #{notification.report}"
-        rescue => e
+        rescue StandardError => e
           data = { notification_id: notification.id, report_id: notification.report_id, resource_id: notification.current_resource&.id }
           ExceptionNotifier.notify_exception(e, data: data) if defined?(ExceptionNotifier)
-          puts "Error with effective_messaging #{notification.id} resource #{notification.current_resource&.id}: #{e.errors.inspect}"
+          puts "Error with effective_messaging #{notification.id} resource #{notification.current_resource&.id}: #{notification.errors.inspect}"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails