effective_messaging 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5dec3f88c3675b7800df94393a54f315c3377d98456783bf8d0ff351b051f33
-  data.tar.gz: 4c5cc8aec73f2b1d1781cbaac4f2d4bc97a1485a703d19992b9a655378315e95
+  metadata.gz: e8f7b3818a8990fe5e7fcb8c6babf0e8e16496005adc802797a84d47909ed34d
+  data.tar.gz: 6026f09a4290bcd7e9dea0a0e894186587a33d4e86e46389369b8435a84fce3a
 SHA512:
-  metadata.gz: 416f802b1119a8df270817fa4424837e61c71d0c0b2ca9f7321b3920072c9d02f4cece3986420d5143a82e5b35544ae02d5e084bb7035553a963edf23d0586b2
-  data.tar.gz: 6453ba7211a7a052c246992fc056d920b13ce73b0a254b8f5ee442caed4297792e93d6e0c095a1f55f19c0459f3d896dc61daf20a993774473a9ca0e69e6b6b3
+  metadata.gz: e15970010165ba1a8ff458b0dc4799a351045f920e1ebb03e206f0b2ba733413e7d389d38acbd741358db30baff0d7b8fbdbb3df757f3fc7995017d9c2a5f791
+  data.tar.gz: 13eabe664412672eb12a698e26093b32c211a504b56d5f3778c8cf0d7831228ee66349fc3588e38bbbf7f48b10b7600287a3bd00904cff913f79949911796150

data/app/datatables/admin/effective_notifications_datatable.rb

@@ -43,7 +43,7 @@ module Admin
       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.6'.freeze
+  VERSION = '0.6.1'.freeze
 end

data/lib/effective_messaging.rb

@@ -9,8 +9,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.6
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails