effective_messaging 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0eea64f40492ad73ee7e3228450bbafd9f5cfa0e199eb1c379c8df87dff49d3
-  data.tar.gz: 8a0155aec3dcae16dd827eab67247a2118a14dca98d710d7c612bb0db607994b
+  metadata.gz: 100add48efce4abb6b4604310d8adfc37df3edae84bd69f2dc350f2239488f65
+  data.tar.gz: fc5e27126372377ea850672ebb9db003698795a63b896773ffc992686e61ed5a
 SHA512:
-  metadata.gz: bb4dfb952155bf4bd84b6bd0c97b51e579bc5536e93bd81bf8bb77dfca8852cdcb76b65d8a1b17b4bf8db63d19ea0e5d38052baf0369d79b3e76088ad6ba966e
-  data.tar.gz: bbd5a31a860fa10313378f33a86cd0cfde1e7e86b166e7941a77fc8101df13e7feaf9d8c19bfb7ce06409a73ef06c0b568116238ceaa5a1f1317a82fed1c69d7
+  metadata.gz: 52e97742d99e634c3dbfb3c723c0767386fec0f63e52c3d78215b4fdcbb01863f34a6848aa9ff291141358d0fa075e0a95f3bb6221390220900796d907344e19
+  data.tar.gz: c980d9cc678826ae1f8ea2c94b5e603b3a13de884dac5159eca6f2481c8aa5377054f1d3be8b145a24978bc99762e27bb281bc40377aad147ed8c74e0a3da6d4

data/app/mailers/effective/messaging_mailer.rb

@@ -11,7 +11,7 @@ module Effective
       user = chat_user.user
       raise('expected user to have an email') unless user.try(:email).present?
 
-      @assigns = assigns_for(chat).merge(assigns_for(chat_user))
+      @assigns = chat_assigns(chat, user: user).merge(assigns_for(chat_user))
 
       subject = subject_for(__method__, "New Message - #{chat}", chat, opts)
       headers = headers_for(chat, opts)
@@ -33,13 +33,17 @@ module Effective
       raise('unexpected resource')
     end
 
-    def chat_assigns(chat)
+    def chat_assigns(chat, user:)
       raise('expected a chat') unless chat.kind_of?(Chat)
+      raise('expected a user') unless user.present?
+
+      url = chat.parent&.chat_url(chat: chat, user: user, root_url: root_url)
+      url ||= effective_messaging.chat_url(chat)
 
       values = {
         date: chat.created_at.strftime('%F'),
         title: chat.title,
-        url: effective_messaging.chat_url(chat)
+        url: url
       }.compact
 
       { chat: values }

data/app/models/concerns/effective_messaging_parent.rb

@@ -0,0 +1,43 @@
+# Mostly for the callbacks
+
+module EffectiveMessagingParent
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_messaging_parent
+      include ::EffectiveMessagingParent
+    end
+  end
+
+  module ClassMethods
+    def effective_messaging_parent?; true; end
+  end
+
+  included do
+    has_many :chats, -> { Effective::Chat.sorted }, as: :parent, class_name: 'Effective::Chat', dependent: :nullify
+    accepts_nested_attributes_for :chats
+  end
+
+  def chat
+    chats.first
+  end
+
+  def build_chat
+    raise('to be implemented by parent')
+
+    # chat = chats.first || chats.build()
+    # chat_user = chat.build_chat_user(user: user)
+    # reviewers.each { |reviewer| chat.build_chat_user(user: reviewer.user) }
+    # chat
+  end
+
+  def create_chat
+    build_chat.tap { |chat| chat.save! }
+  end
+
+  # Hook so the parent can specify the correct url for this user to visit to see the new chat message
+  def chat_url(chat:, user:, root_url:)
+    nil
+  end
+
+end

data/app/models/effective/chat.rb

@@ -86,8 +86,10 @@ module Effective
       chat_users.find { |cu| cu.user_id == user.id && cu.user_type == user.class.name }
     end
 
-    def build_chat_user(user:)
-      chat_user(user: user) || chat_users.build(user: user)
+    def build_chat_user(user:, anonymous_name: nil)
+      cu = chat_user(user: user) || chat_users.build(user: user)
+      cu.assign_attributes(anonymous_name: anonymous_name) if anonymous_name.present?
+      cu
     end
 
     # Always build

data/app/views/effective/chats/_chat.html.haml

@@ -1,4 +1,4 @@
-= render 'layout' do
+= render 'effective/chats/layout' do
   - chat_user = chat.chat_user(user: current_user)
 
   - # New message form

data/app/views/effective/chats/_chat_message.html.haml

@@ -1,5 +1,4 @@
-= render 'layout' do
-
+.effective-chat-message
   .card
     .card-header
       %strong= chat_message.name

data/app/views/effective/chats/_summary.html.haml

@@ -1,10 +1,18 @@
+- current_chat_user = chat.chat_user(user: current_user)
+- chat_users_count = chat.chat_users.count
+
 %p
   - if chat.anonymous?
     = badges('anonymous')
 
   = succeed('.') do
     A chat with
-    = pluralize(chat.chat_users.count, 'participants')
+
+    - if current_chat_user.present? && chat_users_count < 5
+      = (chat.chat_users - [current_chat_user]).map(&:name).to_sentence
+    - else
+      = pluralize(chat_users_count, 'participants')
+
     opened
     = time_ago_in_words(chat.created_at)
     ago

data/lib/effective_messaging/engine.rb

@@ -10,6 +10,7 @@ module EffectiveMessaging
     # Include acts_as_messaging concern and allow any ActiveRecord object to call it
     initializer 'effective_messaging.active_record' do |app|
       app.config.to_prepare do
+        ActiveRecord::Base.extend(EffectiveMessagingParent::Base)
         ActiveRecord::Base.extend(EffectiveMessagingUser::Base)
       end
     end

data/lib/effective_messaging/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 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: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,6 +229,7 @@ files:
 - app/datatables/effective_chats_datatable.rb
 - app/helpers/effective_messaging_helper.rb
 - app/mailers/effective/messaging_mailer.rb
+- app/models/concerns/effective_messaging_parent.rb
 - app/models/concerns/effective_messaging_user.rb
 - app/models/effective/chat.rb
 - app/models/effective/chat_message.rb