jstp 0.3.0 → 0.3.1

data/jstp.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'em-websocket-client'
   gem.add_dependency 'discoverer'
   gem.add_dependency 'symbolmatrix'
+  gem.add_dependency 'uuid'
 
   gem.add_development_dependency 'rspec'
 

data/lib/jstp.rb

@@ -5,6 +5,7 @@ require 'em-websocket-client'
 require 'json'
 require 'discoverer'
 require 'symbolmatrix'
+require 'uuid'
 
 require 'jstp/web_socket'
 require 'jstp/tcp'

data/lib/jstp/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module JSTP
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/jstp/web_socket.rb

@@ -2,9 +2,21 @@ module JSTP
   class WebSocket
     include Singleton
 
+    def sockets
+      @sockets ||= {}
+    end
+
     def server_setup
       @server_setup ||= proc { |server|
-        server.onmessage &WebSocket.instance.event_on_message
+        server.onopen {
+          JSTP::WebSocket.instance.sockets[UUID.new.generate] = server
+        }
+
+        server.onmessage { |message|
+          message = JSON.parse message
+          Connector.instance.block.call message, 
+            JSTP::WebSocket.instance.sockets.key(server)
+        }
       }
     end
 
@@ -18,10 +30,13 @@ module JSTP
 
     def event_on_message
       @event_on_message ||= proc { |message|
-        Connector.instance.block.call JSON.parse message
+        
       }
     end
 
+    def event_on_open
+    end
+
     def client resource
       ::EM::WebSocketClient
         .connect "ws://#{resource.first}:#{Connector.instance.port.outbound}/#{resource[1..-1].join('/')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -77,6 +77,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement