effective_messaging 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6193093b822303bfc098d13ddaa7fe17787571ba0f65a5531ac0978272381320
-  data.tar.gz: b305d1836ab2a6f37b1236a986f36753d9194b969cc1105431733720a4d68535
+  metadata.gz: 84f3cb325386b6c35c631c57ab15eaa3775e892ace9128e082e57a258203008b
+  data.tar.gz: 3ccdcaf09dc41afd32fcd46a365ee4582fe8d06dac3efecbbd91b0e1f921982d
 SHA512:
-  metadata.gz: b9b841f95b963670a6471bc6f28ae379ca99e43c7ee686f6d368c9853e4db1aaa2cd50dd7c1fdf15f20fefdb5f43a2d062e103074fbe01a9a9335b88bb465b20
-  data.tar.gz: e9e6c2cd7a336d3bf1fb547bceca70c49a2089728e4927b806ae77d78c9ec04836b8217b6a854be56f8e8af3cc96a01d2ee44a1973c104bef5642a8e5a2030cd
+  metadata.gz: 5cb621f111776ff55f8eb354b8d86006b77bc5bed042571b66b0f51e93df0bf10ccb47c35a6da8cd5af916128d69c943f0162e62c0e926eb63689fa316eda247
+  data.tar.gz: daae9d060cedaeb9895d808c281069ffcb565d9268c8c64ed346a6b68f30b24b45cd5524b76015a7cb25923708ae2b55205bf03293377e271253b7b5a28f58dd

data/app/models/concerns/effective_messaging_parent.rb

@@ -0,0 +1,38 @@
+# 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
+
+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,10 +1,9 @@
-= render 'layout' do
-
-  - label = content_tag(:strong, chat_message.name) + ' commented ' + time_ago_in_words(chat_message.created_at) + ' ago'
-
+.effective-chat-message
   .card
     .card-header
-      = label
-      Yea
+      %strong= chat_message.name
+      commented
+      = time_ago_in_words(chat_message.created_at)
+      ago
     .card-body
-      = simple_format chat_message.body
+      = simple_format(chat_message.body)

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

@@ -18,7 +18,7 @@
     .card-header.bg-secondary
       Send message
     .card-body
-      %p Your name is displayed as <strong>#{chat_user.name}</strong>.
+      %p Your name is displayed as <strong>#{chat_user.name}</strong>
 
       = f.fields_for :chat_messages, chat_message do |fcm|
         - # The user and name are set by controller's current_user

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.0'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_messaging
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-01-20 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