jstp 0.4.0 → 0.5.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.DS_Store

data/features/map_a_la_rest.feature

@@ -0,0 +1,148 @@
+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

@@ -0,0 +1,19 @@
+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

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

data/jstp.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'uuid'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'cucumber'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/jstp.rb

@@ -14,6 +14,9 @@ require 'jstp/api'
 require 'jstp/base'
 require 'jstp/connector'
 
+require 'jstp/engine'
+require 'jstp/controller'
+
 require 'writer/jstp/connector'
 require 'reader/jstp/connector'
 

data/lib/jstp/controller.rb

@@ -0,0 +1,14 @@
+module JSTP
+  class Controller
+    include JSTP::API
+    
+    def initialize message
+      @protocol = message["protocol"]
+      @method = message["method"]
+      @referer = message["referer"]
+      @timestamp = message["timestamp"]
+      @token = message["token"]
+      @resource = message["resource"]
+    end
+  end
+end

data/lib/jstp/engine.rb

@@ -0,0 +1,40 @@
+module JSTP
+  class Engine
+    include Singleton
+    
+    # Processes the dispatch in the new REST engine way
+    def dispatch message
+      host, the_class, query = discover_resource message["resource"].clone
+      resource = the_class.new message
+      if query.empty? && (message["body"].nil? || message["body"].empty?)
+        resource.send message["method"].downcase.to_sym
+      else
+        resource.send(
+          message["method"].downcase.to_sym, 
+          {
+            "body" => message["body"],
+            "query" => query
+          }
+        )
+      end
+    end
+
+    def discover_resource resource_stack
+      response = []
+      response << resource_stack.shift
+      class_stack = "::"
+      query = []
+      resource_stack.each do |item|
+        begin
+          eval(class_stack + item)
+          class_stack += "#{item}::"
+        rescue NameError, SyntaxError
+          query << item
+        end
+      end
+      response << eval(class_stack[0..-3])
+      response << query
+      return response
+    end
+  end
+end

data/lib/jstp/version.rb

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

data/lib/jstp/web_socket.rb

@@ -14,7 +14,7 @@ module JSTP
 
         server.onmessage { |message|
           message = JSON.parse message
-          Connector.instance.block.call(message, 
+          JSTP::Engine.instance.dispatch(message, 
             JSTP::WebSocket.instance.sockets.key(server))
         }
       }

data/lib/reader/jstp/connector.rb

@@ -17,7 +17,8 @@ module Reader
         @server = TCPServer.open @source.port.inbound
         loop {
           Thread.start(@server.accept) { |client|
-            @source.block.call JSON.parse client.gets
+            binding.pry
+            ::JSTP::Engine.instance.dispatch JSON.parse client.gets
           }
         }
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Reference implementation for the sketch protocol JSTP
 email:
 - xavierviacanel@gmail.com
@@ -122,11 +138,16 @@ 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/controller.rb
+- lib/jstp/engine.rb
 - lib/jstp/tcp.rb
 - lib/jstp/version.rb
 - lib/jstp/web_socket.rb
@@ -165,6 +186,9 @@ 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