jstp 0.1.0 → 0.2.0

data/jstp.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'em-websocket'
   gem.add_dependency 'em-websocket-client'
+  gem.add_dependency 'discoverer'
 
   gem.add_development_dependency 'rspec'
 
@@ -18,5 +19,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "jstp"
   gem.require_paths = ["lib"]
-  gem.version       = Jstp::VERSION
+  gem.version       = JSTP::VERSION
 end

data/lib/jstp.rb

@@ -3,13 +3,16 @@ require 'singleton'
 require 'em-websocket'
 require 'em-websocket-client'
 require 'json'
+require 'discoverer'
+
+require 'jstp/web_socket'
+require 'jstp/tcp'
 
-require 'jstp/event/on_message'
-require 'jstp/connector'
 require 'jstp/api'
-require 'jstp/registry'
-require 'jstp/server'
-require 'jstp/event_machine'
+require 'jstp/connector'
+
+require 'writer/jstp/connector'
+require 'reader/jstp/connector'
 
 class << self
   include JSTP::API

data/lib/jstp/api.rb

@@ -3,16 +3,19 @@ module JSTP
   module API
     def dispatch *args, &block
       if args.empty? and block
-        JSTP::Registry.instance.set block
-
-        ::EventMachine.run &JSTP::EventMachine
+        Connector.instance.block = block
+        Connector.instance.from.send Connector.instance.strategy 
       else
-        Connector.instance.dispatch args.first
+        Connector.instance.to.send Connector.instance.strategy, args.first
       end
     end
 
     def port number
       Connector.instance.port = number
     end
+
+    def strategy symbol
+      Connector.instance.strategy = symbol
+    end
   end
 end

data/lib/jstp/connector.rb

@@ -4,32 +4,14 @@ module JSTP
   # Handles the connection functionality for this JSTP reference implementation
   class Connector
     include Singleton
+    include Discoverer::Writer
+    include Discoverer::Reader
 
-    attr_accessor :port
+    attr_accessor :port, :strategy, :block
 
     def initialize
       @port = 33333
-    end
-
-    # Discovers the server and sends the message
-    # @param [Hash/Array] message
-    def dispatch message
-      this_client = client(message["resource"])
-      this_client.callback do 
-        this_client.send_msg message.to_json
-      end
-    end
-
-    # Access to the client pool
-    # @param [Array] the resource data
-    # @return [EventMachine::WebSocketClient] the client for the address
-    def client resource
-      ::EventMachine::WebSocketClient.connect "ws://#{resource.first}:33333/#{resource[1..-1].join('/')}"
-    end
-
-    # Sets up the server to be executed within an EventMachine reactor
-    def server
-      ::EventMachine::WebSocket.start host: "0.0.0.0", port: @port, &JSTP::Server
+      @strategy = :tcp
     end
   end
 end

data/lib/jstp/tcp.rb

@@ -0,0 +1,5 @@
+module JSTP
+  class TCP
+    include Singleton
+  end
+end

data/lib/jstp/version.rb

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

data/lib/jstp/web_socket.rb

@@ -0,0 +1,30 @@
+module JSTP
+  class WebSocket
+    include Singleton
+
+    def server_setup
+      @server_setup ||= proc { |server|
+        server.onmessage &WebSocket.instance.event_on_message
+      }
+    end
+
+    def event_machine
+      @event_machine ||= proc {
+        ::EM::WebSocket.start host: "0.0.0.0", 
+                              port: Connector.instance.port, 
+                              &WebSocket.instance.server_setup
+      }
+    end
+
+    def event_on_message
+      @event_on_message ||= proc { |message|
+        Connector.instance.block.call JSON.parse message
+      }
+    end
+
+    def client resource
+      ::EM::WebSocketClient
+        .connect "ws://#{resource.first}:33333/#{resource[1..-1].join('/')}"
+    end
+  end
+end

data/lib/reader/jstp/connector.rb

@@ -0,0 +1,26 @@
+module Reader
+  module JSTP
+    class Connector
+      attr_accessor :source
+
+      def initialize the_source
+        @source = the_source
+      end
+
+      # Start the server with the websocket strategy
+      def websocket
+        ::EventMachine.run &::JSTP::WebSocket.instance.event_machine
+      end
+
+      # Start the server with the TCP strategy
+      def tcp
+        @server = TCPServer.open @source.port
+        loop {
+          Thread.start(@server.accept) { |client|
+            @source.block.call JSON.parse client.gets
+          }
+        }
+      end
+    end
+  end
+end

data/lib/writer/jstp/connector.rb

@@ -0,0 +1,27 @@
+module Writer
+  module JSTP
+    class Connector
+      attr_accessor :source
+
+      def initialize source
+        @source = source
+      end
+
+      # Dispatch this applying the websocket strategy
+      def websocket message
+        this_client = ::JSTP::WebSocket.instance
+          .client message["resource"]
+        json = message.to_json
+        this_client.callback do 
+          this_client.send_msg json
+        end
+      end
+
+      # Dispatch thid applying the TCP strategy
+      def tcp message
+        client = TCPSocket.open message["resource"].first, @source.port
+        client.puts message.to_json
+      end
+    end
+  end
+end

data/spec/jstp/api_spec.rb

@@ -2,42 +2,103 @@
 require 'spec_helper'
 
 describe JSTP::API do 
+  describe '#strategy' do 
+    it 'should set the strategy' do 
+      o = Object.new
+      o.extend JSTP::API
+
+      o.strategy :websocket
+
+      JSTP::Connector.instance.strategy.should == :websocket
+    end
+  end
+
   describe '#dispatch' do 
-    context 'a block is passed' do 
-      it 'should register the block and send JSTP::Server to the EventMachine reactor' do
-        block = proc {
-          "lalal"
-        }
-
-        JSTP::Registry.instance.should_receive(:set)
-          .with block
-
-        JSTP::EventMachine.should_receive :call
-        EventMachine.should_receive(:run)
-          .with &JSTP::EventMachine
-
-        o = Object.new
-        o.extend JSTP::API
-        o.dispatch &block
+    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
     end
 
-    context 'an argument is passed' do 
-      it 'should dispatch the message via the Connector' do
-        message = stub 'message'
-        JSTP::Connector.instance.should_receive(:dispatch)
-          .with message
+    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'
+
+          JSTP::Connector.instance.should_receive(:block=)
+            .with block
+
+          JSTP::Connector.instance.should_receive(:from)
+            .and_return reader
+          reader.should_receive :tcp
 
-        o = Object.new
-        o.extend JSTP::API
-        o.dispatch message 
+          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(:tcp)
+            .with message
+
+          o = Object.new
+          o.extend JSTP::API
+          o.dispatch message 
+        end
       end
     end
   end
 
   describe '#port' do 
     it 'should configure the port number' do 
-      pending "This is working, but it's untesteable because of Reactor pattern"
       message = {
         "resource" => ["localhost"]
       }
@@ -45,12 +106,7 @@ describe JSTP::API do
       o.extend JSTP::API
       o.port 3000
 
-      ::EventMachine::WebSocket.should_receive(:start)
-        .with(host: "0.0.0.0", port: 3000)
-
-      o.dispatch do 
-        "lala"
-      end
+      JSTP::Connector.instance.port.should == 3000
     end
   end
 end

data/spec/jstp/connector_spec.rb

@@ -6,84 +6,11 @@ describe JSTP::Connector do
     JSTP::Connector.ancestors.should include Singleton
   end
 
-  describe '#dispatch' do 
-    before do 
-      @message = {
-        "protocol" => ["JSTP", "0.1"],
-        "method" => "POST", 
-        "resource" => [
-          "session.manager",
-          "User"
-        ],
-        "timestamp" => 1357334118,
-        "token" => 3523902859084057289594,
-        "referer" => [
-          "browser",
-          "Registerer"
-        ],
-        "body" => {
-          "login" => "xavier",
-          "email" => "xavier@fetcher.com",
-          "password" => "secret"
-        }
-      }
-
-      @web_socket_client = stub 'web socket client'
-      @message_json = stub 'message json'
-    end
-
-    it 'should open a websocket to the correct resource in the standard port 33333 and set the callback' do 
-      pending "I'm unable to test this properly since providing a Proc will make me lose scope for the client"
-      JSTP::Connector.instance.should_receive(:client)
-        .with(@message["resource"])
-        .and_return @web_socket_client
-
-      @web_socket_client.should_receive(:callback)
-
-      @web_socket_client.should_receive(:send_msg)
-        .with(@message_json)
-      @message.should_receive(:to_json).and_return @message_json
-
-      JSTP::Connector.instance.dispatch @message
-    end
-
-    it 'should attach the callback to the client so the message is actually delivered!'
+  it 'should include a discoverer for Writer' do
+    JSTP::Connector.ancestors.should include Discoverer::Writer 
   end
 
-  describe '#client' do 
-    context 'there is no connection for that address' do 
-      before do
-        @web_socket_client = stub 'web socket client'
-        @resource = ["localhost", "hola", "quetal"]
-      end
-
-      it 'should initialize the websocket client' do 
-        EventMachine::WebSocketClient.should_receive(:connect)
-          .with("ws://#{@resource.first}:33333/#{@resource[1..-1].join('/')}")
-          .and_return @web_socket_client
-
-        JSTP::Connector.instance
-          .client(@resource)
-          .should == @web_socket_client
-      end
-    end
-  end
-
-  describe '#server' do 
-    before do 
-      JSTP::Connector.instance.port = 33333
-    end
-
-    it 'should start a websocket server in 33333' do 
-      JSTP::Server.should_receive :call
-      EventMachine::WebSocket.should_receive(:start)
-        .with({ host: '0.0.0.0', port: 33333 }, &JSTP::Server)
-
-      JSTP::Connector.instance.server
-    end
-
-    it 'should pass the proc JSTP::Server' do
-      pending "Warning, this isn't actually testing the JSTP::Server, I don't know why"
-    end
+  it 'should include a discoverer for Reader' do 
+    JSTP::Connector.ancestors.should include Discoverer::Reader
   end
 end

data/spec/jstp/tcp_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe JSTP::TCP do 
+  it 'should be a singleton' do 
+    JSTP::TCP.ancestors.should include Singleton
+  end
+end

data/spec/jstp/web_socket_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe JSTP::WebSocket do 
+  it 'should be a singleton' do 
+    JSTP::WebSocket.ancestors.should include Singleton
+  end
+
+  describe '#event_machine' do 
+    before do 
+      JSTP::Connector.instance.port = 33333
+    end
+
+    it 'should start a websocket server in 33333' do 
+      JSTP::WebSocket.instance.server_setup
+        .should_receive :call
+
+      EventMachine::WebSocket.should_receive(:start)
+        .with({ host: '0.0.0.0', port: 33333 }, &JSTP::WebSocket.instance.server_setup)
+
+      JSTP::WebSocket.instance.event_machine.call
+    end
+  end
+
+  describe '#server_setup' do 
+    it 'should set #event_on_message to onmessage' do
+      server = stub 'server'
+      JSTP::WebSocket.instance.event_on_message.should_receive :call
+
+      server.should_receive(:onmessage)
+        .with &JSTP::WebSocket.instance.event_on_message
+
+      JSTP::WebSocket.instance.server_setup.call server
+    end
+  end
+
+  describe '#event_on_message' do 
+    it 'should call the registered block with the parsed message' do 
+      @the_proc = stub 'the proc'
+      @message = stub 'message'
+      @parsed_message = stub 'parsed message'
+
+      JSON.should_receive(:parse).with(@message)
+        .and_return @parsed_message
+
+      JSTP::Connector.instance.should_receive(:block)
+        .and_return @the_proc
+
+      @the_proc.should_receive(:call)
+        .with @parsed_message
+
+      JSTP::WebSocket.instance.event_on_message.call @message
+    end
+  end
+
+  describe '#client' do 
+    context 'there is no connection for that address' do 
+      before do
+        @web_socket_client = stub 'web socket client'
+        @resource = ["localhost", "hola", "quetal"]
+      end
+
+      it 'should initialize the websocket client' do 
+        EventMachine::WebSocketClient.should_receive(:connect)
+          .with("ws://#{@resource.first}:33333/#{@resource[1..-1].join('/')}")
+          .and_return @web_socket_client
+
+        JSTP::WebSocket.instance
+          .client(@resource)
+          .should == @web_socket_client
+      end
+    end
+  end
+end

data/spec/reader/jstp/connector_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Reader::JSTP::Connector do 
+  describe '#websocket' do 
+    it 'should run EventMachine with the JSTP::EventMachine proc' do 
+      JSTP::WebSocket.instance.event_machine.should_receive :call
+
+      EventMachine.should_receive(:run)
+        .with &JSTP::WebSocket.instance.event_machine
+
+      reader = Reader::JSTP::Connector.new stub 'connector'
+      reader.websocket
+    end    
+  end
+
+  describe '#tcp' do 
+    it 'should create the server and start it' do 
+      pending 'I still can test infinite loops'
+      
+      tcp_server = stub 'tcp server'
+
+      TCPServer.should_receive(:open)
+        .with(JSTP::Connector.instance.port)
+        .and_return tcp_server
+
+      tcp_server.should_receive(:accept)
+
+      reader = Reader::JSTP::Connector.new stub 'connector'
+      reader.tcp
+    end
+  end
+end

data/spec/writer/jstp/connector_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+
+describe Writer::JSTP::Connector do 
+  describe '#websocket' do 
+    before do 
+      @connector = stub 'connector'
+      @message = { "resource" => ["lala"] }
+      @message_json = stub 'message_json'
+      @web_socket_client = stub 'web socket client'
+    end
+
+    it 'should get the client from the pool and set the callback' do
+      @writer = Writer::JSTP::Connector.new @connector
+
+      JSTP::WebSocket.instance.should_receive(:client)
+        .with(@message["resource"])
+        .and_return @web_socket_client
+
+      @web_socket_client.should_receive(:callback)
+
+      @message.should_receive(:to_json).and_return @message_json
+
+      @writer.websocket @message      
+    end
+
+    it 'should send the message from the callback' do 
+      pending "I'm unable to test this properly since providing a Proc will make me lose scope for the client"
+      @writer = Writer::JSTP::Connector.new @connector
+
+      JSTP::WebSocket.should_receive(:client)
+        .with(@message["resource"])
+        .and_return @web_socket_client
+
+      @web_socket_client.should_receive(:callback)
+
+      @message.should_receive(:to_json).and_return @message_json
+      @web_socket_client.should_receive(:send_msg)
+        .with(@message_json)
+
+      @writer.websocket @message      
+    end
+  end
+
+  describe '#tcp' do 
+    it 'should get the resource and use it as host, then send the dispatch in JSON' do
+      message = stub 'message'
+      message_json = stub 'message json'
+      resource = stub 'resource'
+      hostname = stub 'hostname'
+      socket = stub 'socket'
+
+      message.should_receive(:[]).with("resource")
+        .and_return resource
+
+      resource.should_receive(:first).and_return hostname
+
+      JSTP::Connector.instance.should_receive(:port).
+        and_return 4444
+
+      TCPSocket.should_receive(:open).with(hostname, 4444)
+        .and_return socket
+
+      message.should_receive(:to_json).and_return message_json
+
+      socket.should_receive(:puts).with message_json
+
+      writer = Writer::JSTP::Connector.new ::JSTP::Connector.instance
+      writer.tcp message
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -45,6 +45,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: discoverer
+  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
@@ -78,18 +94,18 @@ files:
 - lib/jstp.rb
 - lib/jstp/api.rb
 - lib/jstp/connector.rb
-- lib/jstp/event/on_message.rb
-- lib/jstp/event_machine.rb
-- lib/jstp/registry.rb
-- lib/jstp/server.rb
+- lib/jstp/tcp.rb
 - lib/jstp/version.rb
+- lib/jstp/web_socket.rb
+- lib/reader/jstp/connector.rb
+- lib/writer/jstp/connector.rb
 - spec/jstp/api_spec.rb
 - spec/jstp/connector_spec.rb
-- spec/jstp/event/on_message_spec.rb
-- spec/jstp/event_machine_spec.rb
-- spec/jstp/registry_spec.rb
-- spec/jstp/server_spec.rb
+- spec/jstp/tcp_spec.rb
+- spec/jstp/web_socket_spec.rb
+- spec/reader/jstp/connector_spec.rb
 - spec/spec_helper.rb
+- spec/writer/jstp/connector_spec.rb
 homepage: https://github.com/Fetcher/jstp
 licenses: []
 post_install_message: 
@@ -117,9 +133,9 @@ summary: Reference implementation for the sketch protocol JSTP
 test_files:
 - spec/jstp/api_spec.rb
 - spec/jstp/connector_spec.rb
-- spec/jstp/event/on_message_spec.rb
-- spec/jstp/event_machine_spec.rb
-- spec/jstp/registry_spec.rb
-- spec/jstp/server_spec.rb
+- spec/jstp/tcp_spec.rb
+- spec/jstp/web_socket_spec.rb
+- spec/reader/jstp/connector_spec.rb
 - spec/spec_helper.rb
+- spec/writer/jstp/connector_spec.rb
 has_rdoc: 

data/lib/jstp/event/on_message.rb

@@ -1,8 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-  module Event
-    OnMessage = proc { |message|
-      JSTP::Registry.instance.get.call JSON.parse message
-    }
-  end
-end

data/lib/jstp/event_machine.rb

@@ -1,6 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-  EventMachine = proc {
-    JSTP::Connector.instance.server
-  }
-end

data/lib/jstp/registry.rb

@@ -1,14 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-  class Registry
-    include Singleton
-
-    def set block
-      @block = block
-    end
-
-    def get
-      @block
-    end
-  end
-end

data/lib/jstp/server.rb

@@ -1,6 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-  Server = proc { |websocket|
-    websocket.onmessage &Event::OnMessage
-  }
-end

data/spec/jstp/event/on_message_spec.rb

@@ -1,21 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe 'JSTP::Event::OnMessage' do 
-  it 'should call the registered block with the parsed message' do 
-    @the_proc = stub 'the proc'
-    @message = stub 'message'
-    @parsed_message = stub 'parsed message'
-
-    JSON.should_receive(:parse).with(@message)
-      .and_return @parsed_message
-
-    JSTP::Registry.instance.should_receive(:get)
-      .and_return @the_proc
-
-    @the_proc.should_receive(:call)
-      .with @parsed_message
-
-    JSTP::Event::OnMessage.call @message
-  end
-end

data/spec/jstp/event_machine_spec.rb

@@ -1,10 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe 'JSTP::EventMachine' do 
-  it 'should ask the connector to initialize the server' do 
-    JSTP::Connector.instance.should_receive(:server)
-
-    JSTP::EventMachine.call
-  end
-end

data/spec/jstp/registry_spec.rb

@@ -1,24 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe JSTP::Registry do 
-  it 'should be a Singleton' do 
-    JSTP::Registry.ancestors.should include Singleton
-  end
-
-  describe '#get' do 
-    it 'should return the registered block' do 
-      @data = stub 'data'
-      JSTP::Registry.instance.set @data
-      JSTP::Registry.instance.get.should == @data
-    end
-  end
-
-  describe '#set' do 
-    it 'should set the block in the registry' do 
-      @data = stub 'data'
-      JSTP::Registry.instance.set @data
-      JSTP::Registry.instance.get.should == @data
-    end
-  end
-end

data/spec/jstp/server_spec.rb

@@ -1,14 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe 'JSTP::Server' do 
-  it 'should set JSTP::Event::OnMessage to onmessage' do
-    server = stub 'server'
-    JSTP::Event::OnMessage.stub :call
-
-    server.should_receive(:onmessage)
-      .with(&JSTP::Event::OnMessage)
-
-    JSTP::Server.call server
-  end
-end