action_channels 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a86a68b94af2eef6fcb59c71974a5906905c130
-  data.tar.gz: f24eb7b22f1eeafe33183e2686f591a427bf0801
+  metadata.gz: abc49cf79165358c0e9c7a33ffa290008db25120
+  data.tar.gz: 8b04ebc3ca9d28b34adb03f6d1929cc6174935a9
 SHA512:
-  metadata.gz: 65665230caaa80943f0d94cd0e561403fb71cbec5b9aae2bfb8bf3446109595c2e91e07bae8c59300eb1eacb557cad59a8c1ac180ee34ff6a637919c042d4dfb
-  data.tar.gz: 3f74d7b19fe79a651d50cfb57e8f437f7bf1f140dbadf0e605dddb9def7eec3ff19342cd711331d5d4a842d54797f0b7501f4e42da3ce1f86fbd66edb30e29f0
+  metadata.gz: d8d168a249090a17d7da12df4c6c48bbf6c644fb0ddc9da87dc10924af91b692f6b4281b3f9bdc934401bcd583613dccbe0199ab2b47ed3f5d72e652931a7ab1
+  data.tar.gz: 0131f3b388a7e0da7a1f118a523fc860471611ca551f99dc643f3570750f93e63a7090d226230d6286ecb14714ad379072f7dab454d93ea754a39ccdf3b9b12b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    action_channels (0.0.1)
+    action_channels (0.1.1)
       nio4r-websocket
 
 GEM

data/lib/action_channels/message_senders/base.rb

@@ -3,6 +3,10 @@ module ActionChannels
     class Base
       def do_send(receiver, message)
       end
+
+      def send_error_400(receiver)
+        do_send receiver, Message.new(channel: '', type: 'bad_request')
+      end
     end
   end
 end

data/lib/action_channels/server.rb

@@ -10,20 +10,7 @@ module ActionChannels
 
     def run
       NIO::WebSocket.listen port: port do |client|
-        on_message = lambda do |event|
-          ActionChannels.logger.info "Received new message: #{event.data}"
-
-          message = Message.parse_and_setup_author event.data, client
-          process_message message
-        end
-
-        on_close = lambda do |event|
-          ActionChannels.logger.info "Client closed connection."
-          channel_repository.all.each { |channel| channel.remove_client(client) }
-        end
-
-        client.on :message, on_message
-        client.on :close, on_close
+        process_client client
       end
 
       ActionChannels.logger.info "Server started on port: #{port}"
@@ -33,8 +20,40 @@ module ActionChannels
       @channel_repository ||= ChannelRepository.new
     end
 
+    def process_client(client)
+      client.on :message, callback_on_message(client)
+      client.on :close, callback_on_close(client)
+
+      client
+    end
+
     private
 
+    def callback_on_message(client)
+      lambda do |event|
+        begin
+          ActionChannels.logger.info "Received new message: #{event.data}"
+
+          message = Message.parse_and_setup_author event.data, client
+          process_message message
+        rescue Errors::NotParseMessage => exp
+          ActionChannels.logger.error exp.message
+          message_sender.send_error_400 client
+        end
+      end
+    end
+
+    def message_sender
+      @message_sender ||= MessageSenders::WebSocket.new
+    end
+
+    def callback_on_close(client)
+      lambda do |event|
+        ActionChannels.logger.info "Client closed connection."
+        channel_repository.all.each { |channel| channel.remove_client(client) }
+      end
+    end
+
     def process_message(message)
       channel = channel_repository.find_by_name_or_create message.channel
       channel.process_message message

data/lib/action_channels/version.rb

@@ -1,3 +1,3 @@
 module ActionChannels
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_channels
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - German Antsiferov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r-websocket