jstp 1.1.0 → 1.2.0

data/lib/jstp/configuration.rb

@@ -8,7 +8,7 @@ module JSTP
       @logger = Logger.new $stdout
       @hostname = (`hostname`)[0..-2]
       @environment = :development
-      @gateway = true
+      @gateway = SymbolMatrix :reverse => true, :forward => true, :local => true
     end
 
     def port argument = nil
@@ -48,7 +48,7 @@ module JSTP
     end
 
     def gateway argument = nil
-      @gateway = argument unless argument.nil?
+      @gateway = SymbolMatrix argument unless argument.nil?
       @gateway
     end
 

data/lib/jstp/dispatch.rb

@@ -102,5 +102,13 @@ module JSTP
     def body= the_body
       self["body"] = the_body
     end
+
+    def gateway
+      self["gateway"]
+    end
+
+    def gateway= the_gateway
+      self["gateway"] = the_gateway
+    end
   end
 end

data/lib/jstp/engine.rb

@@ -10,18 +10,28 @@ module JSTP
     # Processes the dispatch in the new REST engine way
     def dispatch message, client
       host, the_class, query = discover_resource message["resource"].clone
-      if @config.gateway && host != @config.hostname && host != 'localhost'
+      if @config.gateway.forward && host != @config.hostname && host != 'localhost'
         # May be we should gateway this message, if this wasn't aimed at us
         message.to.send @config.strategy.outbound
       else
-        if the_class.ancestors.include? JSTP::Controller
-          resource = the_class.new message, query, self, client
-          resource.send message["method"].downcase.to_sym
+        # Is there a reverse gateway token there?
+        if @config.gateway.reverse && message.gateway == 'reverse'
+          if clients.has_key? message.token.first
+            clients[message.token.first].send message.to.json
+            @config.logger.debug message.to.string
+          else
+            raise ClientNotFoundError, "Client #{message.token.first} is not registered in this server"
+          end
         else
-          if @config.environment == :development
-            raise NotAControllerError, "The resource class #{the_class} for #{message["resource"].join("/")} was found, but is not a JSTP::Controller"
+          if the_class.ancestors.include? JSTP::Controller
+            resource = the_class.new message, query, self, client
+            resource.send message["method"].downcase.to_sym
           else
-            raise NotPermittedError, "The selected resource is forbidden for this type of request"
+            if @config.environment == :development
+              raise NotAControllerError, "The resource class #{the_class} for #{message["resource"].join("/")} was found, but is not a JSTP::Controller"
+            else
+              raise NotPermittedError, "The selected resource is forbidden for this type of request"
+            end
           end
         end
       end
@@ -52,6 +62,7 @@ module JSTP
 
     class NotPermittedError < RuntimeError; end
     class NotAControllerError < RuntimeError; end
+    class ClientNotFoundError < RuntimeError; end
 
     # DSL for configuration
     def self.port argument = nil

data/lib/jstp/version.rb

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

data/lib/reader/jstp/engine.rb

@@ -59,7 +59,7 @@ module Reader
         def log_exception exception, message
           @config.logger.error "#{exception.class}: #{exception.message}"
           @config.logger.debug exception.backtrace.to_s
-          @config.logger.debug Oj.dump message if message
+          @config.logger.debug ::JSTP::Dispatch.new(message).to.string if message
         end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jstp
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: