effective_messaging 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaebf1e8bccc037bfa5c5234f1c30ea60f454da39dded702004e8048fc440dfb
-  data.tar.gz: 95415065976237d4c6008351e79d11f5174ce9671d53b248862eee8b9d3ff190
+  metadata.gz: f51a06c64a043da3819c077710fe75189bf0c9de2480c8bc7229fff8c1c984b8
+  data.tar.gz: 9a271eff256b981894a89f6fca51ff4e6c0abe731d2b1d7177ef3dd31a77287e
 SHA512:
-  metadata.gz: 15919df42267f976f10ffbcf37f2e1314ee904825eb90d22273f10f02de0844b3c42e541827cbb6ca23da33ac961ebe069cbbbd25ac9153dfe7291beff7114a9
-  data.tar.gz: 4294c145b19e78868f0f5a000c8f84731093e4cc46f7ceb65c5237a3955f26ad9ab72b72fd8ccf4654d2651c15ab2259cb570572f6355d9e28f6ae021568dd1f
+  metadata.gz: 9d41b44b4829586760bdb2d177fab1aa2bf871f9250ed8679605f98a3704196560f8fc6489b90a78c264b66a9c400a91ae051388ccf379953c799d9fab04b3ef
+  data.tar.gz: 9c6fe1ace4437ac55f032a8834dab9156afa0c3290e5ecd9ec59e9567459af404298dc76cd3a6b98dc39115e05abb1b83cf8a79856cd2823bec64e9be6b75998

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/chat.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class Chat < ActiveRecord::Base
-    self.table_name = EffectiveMessaging.chats_table_name.to_s
+    self.table_name = (EffectiveMessaging.chats_table_name || :chats).to_s
 
     NOTIFY_AFTER = 2.minutes
 

data/app/models/effective/chat_message.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class ChatMessage < ActiveRecord::Base
-    self.table_name = EffectiveMessaging.chat_messages_table_name.to_s
+    self.table_name = (EffectiveMessaging.chat_messages_table_name || :chat_messages).to_s
 
     log_changes(to: :chat) if respond_to?(:log_changes)
 

data/app/models/effective/chat_user.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class ChatUser < ActiveRecord::Base
-    self.table_name = EffectiveMessaging.chat_users_table_name.to_s
+    self.table_name = (EffectiveMessaging.chat_users_table_name || :chat_users).to_s
 
     log_changes(to: :chat) if respond_to?(:log_changes)
 

data/app/models/effective/notification.rb

@@ -2,10 +2,11 @@
 
 module Effective
   class Notification < ActiveRecord::Base
-    self.table_name = EffectiveMessaging.notifications_table_name.to_s
+    self.table_name = (EffectiveMessaging.notifications_table_name || :notifications).to_s
 
     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/models/effective/notification_log.rb

@@ -2,7 +2,7 @@
 
 module Effective
   class NotificationLog < ActiveRecord::Base
-    self.table_name = EffectiveMessaging.notification_logs_table_name.to_s
+    self.table_name = (EffectiveMessaging.notification_logs_table_name || :notification_logs).to_s
 
     belongs_to :notification
 

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

@@ -59,7 +59,7 @@
 
   = 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/config/effective_messaging.rb

@@ -1,10 +1,4 @@
 EffectiveMessaging.setup do |config|
-  config.chats_table_name = :chats
-  config.chat_users_table_name = :chat_users
-  config.chat_messages_table_name = :chat_messages
-  config.notifications_table_name = :notifications
-  config.notification_logs_table_name = :notification_logs
-
   # Layout Settings
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }

data/db/migrate/{01_create_effective_messaging.rb.erb → 101_create_effective_messaging.rb}

@@ -1,6 +1,6 @@
 class CreateEffectiveMessaging < ActiveRecord::Migration[6.0]
   def change
-    create_table <%= @chats_table_name %> do |t|
+    create_table :chats do |t|
       t.integer :parent_id
       t.string :parent_type
 
@@ -13,7 +13,7 @@ class CreateEffectiveMessaging < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @chat_users_table_name %> do |t|
+    create_table :chat_users do |t|
       t.integer :chat_id
 
       t.integer :user_id
@@ -27,7 +27,7 @@ class CreateEffectiveMessaging < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @chat_messages_table_name %> do |t|
+    create_table :chat_messages do |t|
       t.integer :chat_id
       t.integer :chat_user_id
 
@@ -40,7 +40,7 @@ class CreateEffectiveMessaging < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @notifications_table_name %> do |t|
+    create_table :notifications do |t|
       t.integer :parent_id
       t.string :parent_type
 
@@ -76,7 +76,7 @@ class CreateEffectiveMessaging < ActiveRecord::Migration[6.0]
       t.timestamps
     end
 
-    create_table <%= @notification_logs_table_name %>  do |t|
+    create_table :notification_logs  do |t|
       t.integer :notification_id
       t.integer :report_id
 

data/lib/effective_messaging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMessaging
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/generators/effective_messaging/install_generator.rb

@@ -20,13 +20,7 @@ module EffectiveMessaging
       end
 
       def create_migration_file
-        @chats_table_name  = ':' + EffectiveMessaging.chats_table_name.to_s
-        @chat_users_table_name  = ':' + EffectiveMessaging.chat_users_table_name.to_s
-        @chat_messages_table_name  = ':' + EffectiveMessaging.chat_messages_table_name.to_s
-        @notifications_table_name  = ':' + EffectiveMessaging.notifications_table_name.to_s
-        @notification_logs_table_name  = ':' + EffectiveMessaging.notification_logs_table_name.to_s
-
-        migration_template ('../' * 3) + 'db/migrate/01_create_effective_messaging.rb.erb', 'db/migrate/create_effective_messaging.rb'
+        migration_template ('../' * 3) + 'db/migrate/101_create_effective_messaging.rb', 'db/migrate/create_effective_messaging.rb'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,7 +247,7 @@ files:
 - config/effective_messaging.rb
 - config/locales/effective_messaging.yml
 - config/routes.rb
-- db/migrate/01_create_effective_messaging.rb.erb
+- db/migrate/101_create_effective_messaging.rb
 - db/seeds.rb
 - lib/effective_messaging.rb
 - lib/effective_messaging/engine.rb