jstp 0.5.7 → 1.0.2

data/spec/jstp/engine_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe JSTP::Engine do 
+  describe '#dispatch' do 
+    context 'a valid Dispatch aimed at this host' do
+      context 'the target class and method exist' do  
+        before do 
+          JSTP.config do |c|
+            c.hostname = 'rspec.tests'
+            c.logger = Logger.new $stdout
+            c.logger.level = Logger::FATAL
+            c.environment :production
+          end
+
+          @dispatch = JSTP::Dispatch.new :get, "rspec.tests/User"
+        end
+        
+        it 'should call the method in the target class' do 
+          class Eng < JSTP::Engine
+            class User < JSTP::Controller
+              def get
+              end
+            end
+          end
+
+          Eng::User.any_instance.should_receive :get
+
+          eng = Eng.new :test
+          dummy_client = stub 'client'
+          eng.dispatch @dispatch, dummy_client
+        end
+      end
+    
+      context 'the target class does not exist' do
+        it 'should run the method in the engine'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1 @@
-# -*- encoding : utf-8 -*-
 require 'jstp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -94,14 +94,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -138,29 +154,30 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- features/map_a_la_rest.feature
-- features/step_definitions/map_a_la_rest_steps.rb
-- features/support/env.rb
 - jstp.gemspec
 - lib/jstp.rb
-- lib/jstp/api.rb
-- lib/jstp/base.rb
-- lib/jstp/connector.rb
+- lib/jstp/configuration.rb
 - lib/jstp/controller.rb
+- lib/jstp/dispatch.rb
 - lib/jstp/engine.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/base_spec.rb
-- spec/jstp/connector_spec.rb
-- spec/jstp/tcp_spec.rb
-- spec/jstp/web_socket_spec.rb
-- spec/reader/jstp/connector_spec.rb
+- lib/reader/jstp/dispatch.rb
+- lib/reader/jstp/engine.rb
+- lib/writer/jstp/dispatch.rb
+- samples/api-1.5/modular_style.rb
+- samples/api-1.5/references.rb
+- samples/api-1.5/sinatra_style.rb
+- samples/api-2.0/a_la_rack.rb
+- samples/api-2.0/clearer_sample.rb
+- samples/api-2.0/middleware.rb
+- samples/api-2.0/references.rb
+- samples/diff.rb
+- samples/hooks.rb
+- samples/micro.rb
+- samples/new_api.rb
+- samples/websocket.rb
+- spec/jstp/engine_spec.rb
 - spec/spec_helper.rb
-- spec/writer/jstp/connector_spec.rb
 homepage: https://github.com/Fetcher/jstp
 licenses: []
 post_install_message: 
@@ -181,19 +198,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Reference implementation for the sketch protocol JSTP
 test_files:
-- features/map_a_la_rest.feature
-- features/step_definitions/map_a_la_rest_steps.rb
-- features/support/env.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
-- spec/reader/jstp/connector_spec.rb
+- spec/jstp/engine_spec.rb
 - spec/spec_helper.rb
-- spec/writer/jstp/connector_spec.rb

data/features/map_a_la_rest.feature

@@ -1,148 +0,0 @@
-Feature: Map á la REST
-
-Scenario: Map a really simple dispatch to the correct class
-  Given the class:
-  """
-  class User < JSTP::Controller
-    def get
-      Testing.test_log << "hola"
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "resource":["localhost", "User"],
-    "method": "GET"
-  }
-  """
-  Then I should have 'hola' in the test log
-
-Scenario: A dispatch with a body
-  Given the class:
-  """
-  class Article < JSTP::Controller
-    def post params
-      Testing.test_log << params["body"]
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "resource": ["localhost", "Article"],
-    "method": "POST",
-    "body": "some text"
-  }
-  """
-  Then I should have 'some text' in the test log
-
-Scenario: A compliant dispatch
-  Given the class:
-  """
-  class ForDispatch < JSTP::Controller
-    def get params
-      Testing.test_log.concat [
-        params["body"],
-        @token,
-        @timestamp,
-        @referer,
-        @protocol,
-        @resource,
-        @method
-      ]
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "protocol": ["JSTP", "0.1"],
-    "method": "GET",
-    "resource": ["localhost", "ForDispatch"],
-    "token": "523asdf243",
-    "timestamp": 15453242542245,
-    "referer": ["localhost", "Test"],
-    "body": {
-      "data": "some data"
-    }
-  }
-  """
-  Then I should have '["JSTP", "0.1"]' in the test log
-  Then I should have 'GET' in the test log
-  Then I should have '["localhost", "Test"]' in the test log
-  Then I should have 15453242542245 in the test log
-  Then I should have '523asdf243' in the test log
-  Then I should have '{"data": "some data"}' in the test log
-  Then I should have '["localhost", "ForDispatch"]' in the test log
-
-Scenario: A dispatch with query arguments
-  Given the class:
-  """
-  class Argumented < JSTP::Controller
-    def put params
-      Testing.test_log << params["query"]
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "method": "PUT",
-    "resource": ["localhost", "Argumented", "querydata"]
-  }
-  """
-  Then I should have '["querydata"]' in the test log
-
-Scenario: Mixed arguments in the query
-  Given the class:
-  """
-  class Mixed
-    class Argument < JSTP::Controller
-      def delete params
-        Testing.test_log << params["query"]
-      end
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "method": "DELETE",
-    "resource": ["localhost", "Mixed", "54s3453", "Argument", "35asdf"]
-  }
-  """
-  Then I should have '["54s3453", "35asdf"]' in the test log
-
-Scenario: A complex example just for the fun
-  Given the class:
-  """
-  class Deeper
-    class Inside
-      class Klass < JSTP::Controller
-        def get params
-          Testing.test_log << params["query"]
-          Testing.test_log << params["body"]
-          Testing.test_log << @protocol
-          Testing.test_log << @token
-        end
-      end
-    end
-  end
-  """
-  When I send the dispatch:
-  """
-  {
-    "protocol": ["JSTP", "0.1"],
-    "resource": ["localhost", "Deeper", "52345", "Inside", "Klass", "53afas", "54234"],
-    "method": "GET",
-    "token": ["25353"],
-    "body": {
-      "id": 20
-    }
-  }
-  """
-  Then I should have '["JSTP", "0.1"]' in the test log
-  Then I should have '["52345", "53afas", "54234"]' in the test log
-  Then I should have '["25353"]' in the test log
-  Then I should have '{"id": 20}' in the test log

data/features/step_definitions/map_a_la_rest_steps.rb

@@ -1,19 +0,0 @@
-Given /^the class:$/ do |code|
-  eval code
-end
-
-When /^I send the dispatch:$/ do |dispatch|
-  JSTP::Engine.instance.dispatch JSON.parse dispatch
-end
-
-Then /^I should have '(.+?)' in the test log$/ do |text|
-  begin
-    Testing.test_log.should include JSON.parse text  
-  rescue JSON::ParserError => e
-    Testing.test_log.should include text  
-  end
-end
-
-Then /^I should have (\d+) in the test log$/ do |number|
-  Testing.test_log.should include number.to_i
-end

data/features/support/env.rb

@@ -1,11 +0,0 @@
-$LOAD_PATH << File.expand_path("../../../lib", __FILE__)
-
-require 'jstp'
-
-module Testing
-  def self.test_log
-    @test_log ||= []
-  end
-end
-
-World Testing

data/lib/jstp/api.rb

@@ -1,25 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-  module API
-    def dispatch *args, &block
-      if args.empty?
-        if block
-          Connector.instance.block = block
-          Connector.instance.from.send Connector.instance.strategy.inbound
-        else
-          Connector.instance
-        end
-      else
-        Connector.instance.to.send Connector.instance.strategy.outbound, args.first
-      end
-    end
-
-    def port data
-      Connector.instance.port = SymbolMatrix data
-    end
-
-    def strategy data
-      Connector.instance.strategy = SymbolMatrix data
-    end
-  end
-end

data/lib/jstp/base.rb

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

data/lib/jstp/connector.rb

@@ -1,17 +0,0 @@
-# -*- encoding : utf-8 -*-
-module JSTP
-
-  # Handles the connection functionality for this JSTP reference implementation
-  class Connector
-    include Singleton
-    include Discoverer::Writer
-    include Discoverer::Reader
-
-    attr_accessor :port, :strategy, :block
-
-    def initialize
-      @port = SymbolMatrix inbound: 33333, outbound: 33333
-      @strategy = SymbolMatrix inbound: :tcp, outbound: :tcp
-    end
-  end
-end

data/lib/jstp/tcp.rb

@@ -1,12 +0,0 @@
-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/web_socket.rb

@@ -1,45 +0,0 @@
-module JSTP
-  class WebSocket
-    include Singleton
-
-    def sockets
-      @sockets ||= {}
-    end
-
-    def server_setup
-      @server_setup ||= proc { |server|
-        server.onopen {
-          JSTP::WebSocket.instance.sockets[UUID.new.generate] = server
-        }
-
-        server.onmessage { |message|
-          message = JSON.parse message
-          JSTP::Engine.instance.dispatch(message, 
-            JSTP::WebSocket.instance.sockets.key(server))
-        }
-      }
-    end
-
-    def event_machine
-      @event_machine ||= proc {
-        ::EM::WebSocket.start host: "0.0.0.0", 
-                              port: Connector.instance.port.inbound, 
-                              &WebSocket.instance.server_setup
-      }
-    end
-
-    def event_on_message
-      @event_on_message ||= proc { |message|
-        
-      }
-    end
-
-    def event_on_open
-    end
-
-    def client resource
-      ::EM::WebSocketClient
-        .connect "ws://#{resource.first}:#{Connector.instance.port.outbound}/#{resource[1..-1].join('/')}"
-    end
-  end
-end