whatup 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ee10c77cdfcc15570f256077d60c6de08b5422dfae92a4b59428048392e31b4
-  data.tar.gz: a2120cb662058bbbb724317970ac96a4d0c9803111f07f5f170df76e80fc0c22
+  metadata.gz: dbd1228a1c53e72f20c032f99bc292372d09f7729dadebf94c6c34afbb05c964
+  data.tar.gz: 60abdb1724b159d9935cbd7fafde1eb11d4a40ba43e097ffea02d8197c152032
 SHA512:
-  metadata.gz: 4db17ea037a2c494a7461d9676f56854b69688f57229fe076e0df48f0d51a66f3cad3a9802fc1804b516cb021a662cdb51c81c3ea78144bd5f341d006914ef78
-  data.tar.gz: e8bb59b0c2c77b86d37fd4d0908e0c44f08da41969df1525bdf1ea3da370595ec7ee9e4440ec5b7d048dd134e0f4f8448edee0247dcec26b7bca53e21b8938e4
+  metadata.gz: 3ba017ae1a1f88dfb073371dfc8232d9761f5f03eb25fb1a4787b3c01ab1a176946bd65f613cb0b9c705e2ad5625fab509645639e23e4ba3770ef784fb02fa31
+  data.tar.gz: 98e9464facabb23102ce667ef2e089585b77d399d8a1f5dfc40a2e81a28cfc7aeed65211ae1f86ea27bcf9cf7b762fba8e0372cac5ac6f35b7255515b8b02ed1

data/lib/whatup/cli/commands/interactive/interactive.rb

@@ -51,7 +51,7 @@ module Whatup
       end
 
       desc 'room [NAME]', 'Create and enter chatroom [NAME]'
-      def room name
+      def room name # rubocop:disable Metrics/AbcSize
         if room = Room.find_by(name: name)
           current_user.puts <<~MSG
             Entering #{room.name}... enjoy your stay!
@@ -65,8 +65,8 @@ module Whatup
           MSG
           current_user.update! room: room
 
-          room.broadcast except: current_user do
-            <<~MSG
+          server.clients.reject { |c| c.id == current_user.id }.each do |c|
+            c.puts <<~MSG
               #{current_user.name} has arrived! Play nice, kids.
             MSG
           end

data/lib/whatup/server/models/client.rb

@@ -46,7 +46,6 @@ module Whatup
       end
 
       def leave_room!
-        broadcast 'LEFT'
         room.drop_client! self
       end
 

data/lib/whatup/server/models/room.rb

@@ -5,21 +5,13 @@ require 'whatup/server/models/application_record'
 module Whatup
   module Server
     class Room < ApplicationRecord
-      has_many :clients
+      has_many :clients, foreign_key: 'room_id'
 
       validates :name, uniqueness: true
 
       def drop_client! client
         client.update! room_id: nil
       end
-
-      def broadcast except: nil
-        if except
-          clients.where.not id: except.id
-        else
-          clients
-        end.each { |c| c&.puts(yield) }
-      end
     end
   end
 end

data/lib/whatup/server/server.rb

@@ -159,16 +159,18 @@ module Whatup
       def handle_chatting client
         loop do
           input = client.input!
-          room = client.room
+          audience = @clients.reject { |c| c.id == client.id }
+                             .select do |c|
+                               client.room.clients.pluck(:id).include? c.id
+                             end
           puts "#{client.name}> #{input}"
           if input == '.exit'
+            client.puts "Exited `#{client.room.name}`."
+            audience.each { |c| c.puts "#{client.name}> LEFT" }
             client.leave_room!
-            client.puts "Exited `#{room.name}`."
             break
           end
-          room.broadcast except: client do
-            "#{client.name}> #{input}"
-          end
+          audience.each { |c| c.puts "#{client.name}> #{input}" }
         end
       end
 

data/lib/whatup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Whatup
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whatup
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Mark Delk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry