effective_messaging 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be48cb89363c5dd4146206380ab6c0debf9a846d92d617237d9efd38ab7ea77c
-  data.tar.gz: '014369c2395911329879c116344837106cb6722ceb70f6e7413e71bff527fe52'
+  metadata.gz: 3aec5e478f15d3fb2fbc704273ebd3b0b9b8c7da1c604f53dca646b9458c7851
+  data.tar.gz: 144b0067e81f347f90fae2b6568b0fe2f138058a809080a68ac67598d2a17ce6
 SHA512:
-  metadata.gz: f60c2115c09f7237c2a9d1ddcf0109e2f728d615d0ac364344692c0fea0872c3ce53a1960f8d801223d9deebc5f6d8e8f6037e92bab11bfcedc39ef9c7b6f4ce
-  data.tar.gz: c68ce9e88599ad0267615e43f860d13cce6c0f65f3ef799277923b100211648923abecedfd7496402101581b1c3749a168a3364e3bc32f41143eb615a60e1904
+  metadata.gz: b765eab3df759ffe21ccd8f80d36a8b0f68e233dcfcc8dd79e69a04234a566def85bfaf1b58213af2ee3ca12a12d73da8e4a6d015ef192a4722ef602c6364f4a
+  data.tar.gz: 9b509ff5f1efa7497479fab6910985da6c4a9441529839a16ce887e354191123470e5d9579fa6183c05ee99e34b463325d1dbaf3391137c963d0a4051224962d

data/app/datatables/admin/effective_notifications_datatable.rb

@@ -34,6 +34,10 @@ module Admin
 
       col :report, search: Effective::Report.notifiable.sorted
 
+      col(:rows_count) do |notification|
+        notification.report.collection().count
+      end
+
       col :subject
       col :body, visible: false
 

data/app/mailers/effective/notifications_mailer.rb

@@ -6,8 +6,8 @@ module Effective
       raise('expected an Effective::Notification') unless notification.kind_of?(Effective::Notification)
 
       # Returns a Hash of params to pass to mail()
-      # Includes a :to, :from, etc
-      rendered = notification.render_email
+      # Includes a :to, :from, :subject and :body, etc
+      rendered = notification.assign_renderer(view_context).render_email
 
       # Attach report
       attach_report!(notification)
@@ -31,8 +31,8 @@ module Effective
       raise('expected an acts_as_reportable resource') unless resource.class.try(:acts_as_reportable?)
 
       # Returns a Hash of params to pass to mail()
-      # Includes a :to, :from, etc
-      rendered = notification.render_email(resource)
+      # Includes a :to, :from, :subject and :body
+      rendered = notification.assign_renderer(view_context).render_email(resource)
 
       # Works with effective_logging to associate this email with the notification
       headers = headers_for(notification, opts)

data/app/models/effective/notification.rb

@@ -6,6 +6,7 @@ module Effective
 
     attr_accessor :current_user
     attr_accessor :current_resource
+    attr_accessor :view_context
 
     log_changes if respond_to?(:log_changes)
 
@@ -192,7 +193,17 @@ module Effective
     end
 
     def report_variables
-      Array(report&.report_columns).map(&:name)
+      assigns_for().keys
+    end
+
+    def assign_renderer(view_context)
+      raise('expected renderer to respond to') unless view_context.respond_to?(:root_url)
+      assign_attributes(view_context: view_context)
+      self
+    end
+
+    def renderer
+      view_context || ApplicationController.renderer
     end
 
     def rows_count
@@ -316,13 +327,25 @@ module Effective
       }.compact
     end
 
-    def assigns_for(resource)
-      return {} unless resource.present?
+    # We pull the Assigns from 3 places:
+    # 1. The report.report_columns
+    # 2. The class's def reportable_view_assigns(view) method
+    def assigns_for(resource = nil)
+      return {} unless report.present? 
 
-      Array(report&.report_columns).inject({}) do |h, column|
+      resource ||= report.reportable.new
+      raise('expected an acts_as_reportable resource') unless resource.class.try(:acts_as_reportable?)
+      
+      report_assigns = Array(report.report_columns).inject({}) do |h, column|
         value = resource.send(column.name)
         h[column.name] = column.format(value); h
       end
+
+      reportable_view_assigns = resource.reportable_view_assigns(renderer).deep_stringify_keys
+      raise('expected notification assigns to return a Hash') unless reportable_view_assigns.kind_of?(Hash)
+
+      # Merge all 3
+      report_assigns.merge(reportable_view_assigns)
     end
 
     def build_notification_log(resource: nil)

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

@@ -3,7 +3,7 @@
     = render 'admin/notifications/form_notification', notification: notification
 
   - if notification.persisted? && notification.respond_to?(:logs_datatable)
-    = tab 'Notification Logs' do
+    = tab 'Email Logs' do
       - datatable = Admin::EffectiveNotificationLogsDatatable.new(notification: notification)
       = render_inline_datatable(datatable)
 

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

@@ -53,13 +53,13 @@
   - froms = Array(EffectiveMessaging.froms) - [nil, '']
 
   - if froms.present?
-    = f.select :from, Array(froms).map { |from| [from, from] }
+    = f.radios :from, froms
   - else
     = f.email_field :from
 
   = f.email_field :bcc
   = f.text_field :subject
-  = f.text_area :body
+  = f.text_area :body, rows: 20
 
   #effective-messaging-ajax
     - if f.object.report.present?

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

@@ -13,7 +13,7 @@
 
   = card('Preview of Notification') do
     - resource = notification.report.collection.order('RANDOM()').first
-    - rendered = notification.render_email(resource)
+    - rendered = notification.assign_renderer(self).render_email(resource)
 
     %table.table
       %tbody

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

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