anycable 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2589605d172fda191b1733259d1205e474754285
-  data.tar.gz: 444266a714ada061f08f699ffafd61f08edd6e59
+  metadata.gz: 26a8ddbb776d6aa172c87b764baaf5a50e99c4b8
+  data.tar.gz: '0139cc0a3fd8e545ec262262ec37451bb0e5403c'
 SHA512:
-  metadata.gz: cdcdca3db177557e4d144d0af7b8d8a643ad2dfe1c3728e7be95aaa84494e21f38e7bda57d61c3f617f62b1e7302be2c19a0b07b4e5795fb213b898bd8279280
-  data.tar.gz: 669cdc0c8b3d83114a1a0f5acf2e7a1686e70ba2a739a1acdcbdc01cdcbc5122e56eab907f26aefe49cf227a631a047f17a8d817c75acfa429d6654f9b9e00c8
+  metadata.gz: 55c331b5be0551543aeb12ad5332155b2301d72858b31dc03f3e87698538232f6427a69ca5e1c38c7ca1e054447da7526e648c27149b30d7ee81db130a6dc497
+  data.tar.gz: ef3dc2181c6f8fe1b4e73fcca29e177daf3fc16d00f22b6107be423410b1e0b574e307f5f96d530d11c46e0f3a286a6897b86dc08b24c2881e0df3c6b69baf2b

data/.rubocop.yml

@@ -46,6 +46,10 @@ Metrics/LineLength:
   Exclude:
     - 'spec/**/*.rb'
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
 Rails/Date:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change log
 
-## 0.4.0
+## 0.4.1 (2017-01-24)
+
+- Introduce _fake_ socket instance to handle transmissions and streams. ([@palkan][])
+
+- Make commands handling more abstract. ([@palkan][])
+
+We now do not explicitly call channels action but use the only one entrypoing for all commands:
+
+```ruby
+connection.handle_channel_command(identifier, command, data)
+```
+
+This method should return `true` if command was successful and `false` otherwise.
+
+## 0.4.0 (2017-01-22)
 
 - Refactor RPC API. ([@palkan][])
 

data/lib/anycable/rpc_handler.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+require 'anycable/socket'
 require 'anycable/rpc/rpc'
 require 'anycable/rpc/rpc_services'
 
-# rubocop:disable Metrics/ClassLength
+# rubocop:disable Metrics/AbcSize
 # rubocop:disable Metrics/MethodLength
 module Anycable
   # RPC service handler
@@ -11,17 +12,19 @@ module Anycable
     def connect(request, _unused_call)
       logger.debug("RPC Connect: #{request}")
 
-      connection = factory.create(env: rack_env(request))
+      socket = build_socket(env: rack_env(request))
+
+      connection = factory.create(socket)
 
       connection.handle_open
 
-      if connection.closed?
+      if socket.closed?
         Anycable::ConnectionResponse.new(status: Anycable::Status::ERROR)
       else
         Anycable::ConnectionResponse.new(
           status: Anycable::Status::SUCCESS,
           identifiers: connection.identifiers_json,
-          transmissions: connection.transmissions
+          transmissions: socket.transmissions
         )
       end
     end
@@ -29,8 +32,10 @@ module Anycable
     def disconnect(request, _unused_call)
       logger.debug("RPC Disonnect: #{request}")
 
+      socket = build_socket(env: rack_env(request))
+
       connection = factory.create(
-        env: rack_env(request),
+        socket,
         identifiers: request.identifiers,
         subscriptions: request.subscriptions
       )
@@ -45,68 +50,30 @@ module Anycable
     def command(message, _unused_call)
       logger.debug("RPC Command: #{message}")
 
-      run_command(message)
-    end
+      socket = build_socket
 
-    private
-
-    def run_command(message)
       connection = factory.create(
+        socket,
         identifiers: message.connection_identifiers
       )
 
-      channel = connection.channel_for(message.identifier)
-
-      if !channel.nil?
-        send("handle_#{message.command}", message, connection, channel)
-      else
-        Anycable::CommandResponse.new(
-          status: Anycable::Status::ERROR
-        )
-      end
-    end
-
-    def handle_subscribe(_msg, connection, channel)
-      channel.handle_subscribe
-      if channel.subscription_rejected?
-        Anycable::CommandResponse.new(
-          status: Anycable::Status::ERROR,
-          disconnect: connection.closed?,
-          transmissions: connection.transmissions
-        )
-      else
-        Anycable::CommandResponse.new(
-          status: Anycable::Status::SUCCESS,
-          disconnect: connection.closed?,
-          stop_streams: channel.stop_streams?,
-          streams: channel.streams,
-          transmissions: connection.transmissions
-        )
-      end
-    end
-
-    def handle_unsubscribe(_mgs, connection, channel)
-      channel.handle_unsubscribe
-
-      Anycable::CommandResponse.new(
-        status: Anycable::Status::SUCCESS,
-        disconnect: connection.closed?,
-        stop_streams: true,
-        transmissions: connection.transmissions
+      result = connection.handle_channel_command(
+        message.identifier,
+        message.command,
+        message.data
       )
-    end
 
-    def handle_message(msg, connection, channel)
-      channel.handle_action(msg.data)
       Anycable::CommandResponse.new(
-        status: Anycable::Status::SUCCESS,
-        disconnect: connection.closed?,
-        stop_streams: channel.stop_streams?,
-        streams: channel.streams,
-        transmissions: connection.transmissions
+        status: result ? Anycable::Status::SUCCESS : Anycable::Status::ERROR,
+        disconnect: socket.closed?,
+        stop_streams: socket.stop_streams?,
+        streams: socket.streams,
+        transmissions: socket.transmissions
       )
     end
 
+    private
+
     # Build env from path
     def rack_env(request)
       uri = URI.parse(request.path)
@@ -124,6 +91,10 @@ module Anycable
       }
     end
 
+    def build_socket(**options)
+      Anycable::Socket.new(**options)
+    end
+
     def logger
       Anycable.logger
     end

data/lib/anycable/socket.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+module Anycable
+  # Socket mock to be used with application connection
+  class Socket
+    attr_reader :transmissions, :env
+
+    def initialize(env: nil)
+      @transmissions = []
+      @env = env
+    end
+
+    def transmit(websocket_message)
+      transmissions << websocket_message
+    end
+
+    def stream(broadcasting)
+      streams << broadcasting
+    end
+
+    def streams
+      @streams ||= []
+    end
+
+    def close
+      @closed = true
+      @transmissions.clear
+      @streams&.clear
+      @stop_all_streams = true
+    end
+
+    def closed?
+      @closed == true
+    end
+
+    def stop_all_streams
+      @stop_all_streams = true
+    end
+
+    def stop_streams?
+      @stop_all_streams == true
+    end
+  end
+end

data/lib/anycable/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Anycable
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -175,6 +175,7 @@ files:
 - lib/anycable/rpc/rpc_services.rb
 - lib/anycable/rpc_handler.rb
 - lib/anycable/server.rb
+- lib/anycable/socket.rb
 - lib/anycable/version.rb
 - protos/rpc.proto
 homepage: http://github.com/anycable/anycable