jstp 0.2.0 → 0.3.0

data/jstp.gemspec

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

data/lib/jstp.rb

@@ -4,11 +4,13 @@ require 'em-websocket'
 require 'em-websocket-client'
 require 'json'
 require 'discoverer'
+require 'symbolmatrix'
 
 require 'jstp/web_socket'
 require 'jstp/tcp'
 
 require 'jstp/api'
+require 'jstp/base'
 require 'jstp/connector'
 
 require 'writer/jstp/connector'

data/lib/jstp/api.rb

@@ -4,18 +4,18 @@ module JSTP
     def dispatch *args, &block
       if args.empty? and block
         Connector.instance.block = block
-        Connector.instance.from.send Connector.instance.strategy 
+        Connector.instance.from.send Connector.instance.strategy.inbound
       else
-        Connector.instance.to.send Connector.instance.strategy, args.first
+        Connector.instance.to.send Connector.instance.strategy.outbound, args.first
       end
     end
 
-    def port number
-      Connector.instance.port = number
+    def port data
+      Connector.instance.port = SymbolMatrix data
     end
 
-    def strategy symbol
-      Connector.instance.strategy = symbol
+    def strategy data
+      Connector.instance.strategy = SymbolMatrix data
     end
   end
 end

data/lib/jstp/base.rb

@@ -0,0 +1,7 @@
+module JSTP
+  class Base
+    class << self
+      include ::JSTP::API
+    end
+  end
+end

data/lib/jstp/connector.rb

@@ -10,8 +10,8 @@ module JSTP
     attr_accessor :port, :strategy, :block
 
     def initialize
-      @port = 33333
-      @strategy = :tcp
+      @port = SymbolMatrix inbound: 33333, outbound: 33333
+      @strategy = SymbolMatrix inbound: :tcp, outbound: :tcp
     end
   end
 end

data/lib/jstp/tcp.rb

@@ -1,5 +1,12 @@
 module JSTP
   class TCP
     include Singleton
+    def initialize 
+      @client_pool = {}
+    end
+
+    def client hostname, port
+      @client_pool["#{hostname}:#{port}"] ||= TCPSocket.open hostname, port
+    end
   end
 end

data/lib/jstp/version.rb

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

data/lib/jstp/web_socket.rb

@@ -11,7 +11,7 @@ module JSTP
     def event_machine
       @event_machine ||= proc {
         ::EM::WebSocket.start host: "0.0.0.0", 
-                              port: Connector.instance.port, 
+                              port: Connector.instance.port.inbound, 
                               &WebSocket.instance.server_setup
       }
     end
@@ -24,7 +24,7 @@ module JSTP
 
     def client resource
       ::EM::WebSocketClient
-        .connect "ws://#{resource.first}:33333/#{resource[1..-1].join('/')}"
+        .connect "ws://#{resource.first}:#{Connector.instance.port.outbound}/#{resource[1..-1].join('/')}"
     end
   end
 end

data/lib/reader/jstp/connector.rb

@@ -14,7 +14,7 @@ module Reader
 
       # Start the server with the TCP strategy
       def tcp
-        @server = TCPServer.open @source.port
+        @server = TCPServer.open @source.port.inbound
         loop {
           Thread.start(@server.accept) { |client|
             @source.block.call JSON.parse client.gets

data/lib/writer/jstp/connector.rb

@@ -19,8 +19,9 @@ module Writer
 
       # Dispatch thid applying the TCP strategy
       def tcp message
-        client = TCPSocket.open message["resource"].first, @source.port
+        client = TCPSocket.open message["resource"].first, @source.port.outbound
         client.puts message.to_json
+        client.close
       end
     end
   end

data/spec/jstp/api_spec.rb

@@ -7,92 +7,50 @@ describe JSTP::API do
       o = Object.new
       o.extend JSTP::API
 
-      o.strategy :websocket
+      o.strategy inbound: :websocket, outbound: :tcp
 
-      JSTP::Connector.instance.strategy.should == :websocket
+      JSTP::Connector.instance.strategy.inbound.should == :websocket
+      JSTP::Connector.instance.strategy.outbound.should == :tcp
     end
   end
 
   describe '#dispatch' do 
-    context 'websocket strategy' do 
-      before do 
-        JSTP::Connector.instance.strategy = :websocket
-      end
-
-      context 'a block is passed' do 
-        it 'should register the block and send JSTP::Server to the EventMachine reactor' do
-          block = proc { "lalal" }
-          reader = stub 'reader'
-
-          JSTP::Connector.instance.should_receive(:block=)
-            .with block
-
-          JSTP::Connector.instance.should_receive(:from)
-            .and_return reader
-          reader.should_receive :websocket
-
-          o = Object.new
-          o.extend JSTP::API
-          o.dispatch &block
-        end
-      end
-
-      context 'an argument is passed' do 
-        it 'should dispatch the message via the Connector' do
-          message = stub 'message'
-          writer = stub 'writer'
-
-          JSTP::Connector.instance.should_receive(:to)
-            .and_return writer
-
-          writer.should_receive(:websocket)
-            .with message
-
-          o = Object.new
-          o.extend JSTP::API
-          o.dispatch message 
-        end
-      end
+    before do 
+      JSTP::Connector.instance.strategy = SymbolMatrix inbound: :tcp, outbound: :websocket
     end
 
-    context 'tcp strategy' do 
-      before do 
-        JSTP::Connector.instance.strategy = :tcp
-      end
-
-      context 'a block is passed' do 
-        it 'should register the block and send JSTP::Server to the EventMachine reactor' do
-          block = proc { "lalal" }
-          reader = stub 'reader'
+    context 'a block is passed' do 
+      it 'should register the block and send JSTP::Server to the EventMachine reactor' do
+        block = proc { "lalal" }
+        reader = stub 'reader'
 
-          JSTP::Connector.instance.should_receive(:block=)
-            .with block
+        JSTP::Connector.instance.should_receive(:block=)
+          .with block
 
-          JSTP::Connector.instance.should_receive(:from)
-            .and_return reader
-          reader.should_receive :tcp
+        JSTP::Connector.instance.should_receive(:from)
+          .and_return reader
+        reader.should_receive :tcp
 
-          o = Object.new
-          o.extend JSTP::API
-          o.dispatch &block
-        end
+        o = Object.new
+        o.extend JSTP::API
+        o.dispatch &block
       end
+    end
 
-      context 'an argument is passed' do 
-        it 'should dispatch the message via the Connector' do
-          message = stub 'message'
-          writer = stub 'writer'
+    context 'an argument is passed' do 
+      it 'should dispatch the message via the Connector' do
+        message = stub 'message'
+        writer = stub 'writer'
 
-          JSTP::Connector.instance.should_receive(:to)
-            .and_return writer
+        JSTP::Connector.instance.should_receive(:to)
+          .and_return writer
 
-          writer.should_receive(:tcp)
-            .with message
+        writer.should_receive(:websocket)
+          .with message
 
-          o = Object.new
-          o.extend JSTP::API
-          o.dispatch message 
-        end
+        o = Object.new
+        o.extend JSTP::API
+        o.dispatch message 
       end
     end
   end
@@ -104,9 +62,10 @@ describe JSTP::API do
       }
       o = Object.new
       o.extend JSTP::API
-      o.port 3000
+      o.port inbound: 3000, outbound: 4000
 
-      JSTP::Connector.instance.port.should == 3000
+      JSTP::Connector.instance.port.inbound.should == 3000
+      JSTP::Connector.instance.port.outbound.should == 4000
     end
   end
 end

data/spec/jstp/base_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe JSTP::Base do 
+
+end

data/spec/jstp/web_socket_spec.rb

@@ -7,7 +7,7 @@ describe JSTP::WebSocket do
 
   describe '#event_machine' do 
     before do 
-      JSTP::Connector.instance.port = 33333
+      JSTP::Connector.instance.port = SymbolMatrix inbound: 33333, outbound: 44444 
     end
 
     it 'should start a websocket server in 33333' do 
@@ -15,7 +15,8 @@ describe JSTP::WebSocket do
         .should_receive :call
 
       EventMachine::WebSocket.should_receive(:start)
-        .with({ host: '0.0.0.0', port: 33333 }, &JSTP::WebSocket.instance.server_setup)
+        .with({ host: '0.0.0.0', port: JSTP::Connector.instance.port.inbound }, 
+          &JSTP::WebSocket.instance.server_setup)
 
       JSTP::WebSocket.instance.event_machine.call
     end
@@ -61,7 +62,7 @@ describe JSTP::WebSocket do
 
       it 'should initialize the websocket client' do 
         EventMachine::WebSocketClient.should_receive(:connect)
-          .with("ws://#{@resource.first}:33333/#{@resource[1..-1].join('/')}")
+          .with("ws://#{@resource.first}:#{JSTP::Connector.instance.port.outbound}/#{@resource[1..-1].join('/')}")
           .and_return @web_socket_client
 
         JSTP::WebSocket.instance

data/spec/reader/jstp/connector_spec.rb

@@ -20,7 +20,7 @@ describe Reader::JSTP::Connector do
       tcp_server = stub 'tcp server'
 
       TCPServer.should_receive(:open)
-        .with(JSTP::Connector.instance.port)
+        .with(JSTP::Connector.instance.port.inbound)
         .and_return tcp_server
 
       tcp_server.should_receive(:accept)

data/spec/writer/jstp/connector_spec.rb

@@ -54,15 +54,15 @@ describe Writer::JSTP::Connector do
 
       resource.should_receive(:first).and_return hostname
 
-      JSTP::Connector.instance.should_receive(:port).
-        and_return 4444
+      JSTP::Connector.instance.port = SymbolMatrix inbound: 4444, outbound: 3333
 
-      TCPSocket.should_receive(:open).with(hostname, 4444)
+      TCPSocket.should_receive(:open).with(hostname, JSTP::Connector.instance.port.outbound)
         .and_return socket
 
       message.should_receive(:to_json).and_return message_json
 
       socket.should_receive(:puts).with message_json
+      socket.should_receive(:close)
 
       writer = Writer::JSTP::Connector.new ::JSTP::Connector.instance
       writer.tcp message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -61,6 +61,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: symbolmatrix
+  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
@@ -93,6 +109,7 @@ files:
 - jstp.gemspec
 - lib/jstp.rb
 - lib/jstp/api.rb
+- lib/jstp/base.rb
 - lib/jstp/connector.rb
 - lib/jstp/tcp.rb
 - lib/jstp/version.rb
@@ -100,6 +117,7 @@ files:
 - lib/reader/jstp/connector.rb
 - lib/writer/jstp/connector.rb
 - spec/jstp/api_spec.rb
+- spec/jstp/base_spec.rb
 - spec/jstp/connector_spec.rb
 - spec/jstp/tcp_spec.rb
 - spec/jstp/web_socket_spec.rb
@@ -132,6 +150,7 @@ specification_version: 3
 summary: Reference implementation for the sketch protocol JSTP
 test_files:
 - spec/jstp/api_spec.rb
+- spec/jstp/base_spec.rb
 - spec/jstp/connector_spec.rb
 - spec/jstp/tcp_spec.rb
 - spec/jstp/web_socket_spec.rb