pipe_rpc 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1991805b18e6be65590ca3b7467624b7c6fd804b
-  data.tar.gz: e61fcf89ca3cd3a8a8b0be4ecc195c2173cd8961
+  metadata.gz: 133a22837afd6032e1de590b632c2715f4e4913c
+  data.tar.gz: aa8338e1c9f4d3fad11f5a1ca2b3923c1704b023
 SHA512:
-  metadata.gz: e48baa8052601b1ab367a6425225bb1a2df1b941bd5ef6127d1bc4569a6ee57d02a72381f63f45ebd1fb3cf194fbb39b741eca8218ef1b99416a82e8df37ed04
-  data.tar.gz: 4395b41a3b820e9e79e7727a47527878dd8d169801aa28398ad59dbea25d8e2ce64975fb024c38495781cc766302c7e699293120c3e762ffce131b3af1f15d18
+  metadata.gz: 924584159e80cf3e6dfec8ccf288ba122985e0f9a29f6e3f8734b74cca608436e0b15f34aeeb409bd53990d5957f2b7688d84687eb06bd02e17ded15a13575d9
+  data.tar.gz: 997155d89f123a5da38e7190a9e6d1de9d1e46e479c84834c1a810b5f5279da6d757b71b4f49d7612780716e5a84544bcade5c942287837d2482659a4fbad9be

data/.rspec

@@ -1,3 +1,2 @@
---format documentation
 --color
 --require spec_helper.rb

data/lib/pipe_rpc/basic_interface.rb

@@ -1,6 +1,6 @@
 module PipeRpc
   class BasicInterface < BasicObject
-    wanted_methods = [:initialize, :__id__, :__send__, :respond_to?, :method_missing]
+    wanted_methods = [:initialize, :__id__, :object_id, :__send__, :respond_to?, :method_missing]
 
     existing_methods = if ::Object.const_defined?(:MRUBY_VERSION)
       [:initialize, :method_missing]

data/lib/pipe_rpc/client.rb

@@ -15,9 +15,5 @@ module PipeRpc
       request = Client::Request.new(@hub, server: @__rpc_server_id__, method: method, arguments: args)
       @hub.requests.evaluate(request)
     end
-
-    def to_s
-      "<Client:#{@__rpc_server_id__}>"
-    end
   end
 end

data/lib/pipe_rpc/client_request.rb

@@ -4,7 +4,7 @@ module PipeRpc
   class Client::Request < Request
     def initialize(hub, request)
       @hub = hub
-      request[:arguments] = arguments_to_server_ids(request[:arguments])
+      request[:arguments] = DeepMapper.to_transport(request[:arguments], hub)
       super request
       # discard first three entries mentioning Client::Request#initialize,
       # Client::Request.new and Client#method_missing in stacktrace
@@ -22,26 +22,5 @@ module PipeRpc
     def id
       @id or raise 'id not set'
     end
-
-    def arguments_to_server_ids(arguments)
-      deep_map(arguments) do |value|
-        if value.respond_to? :__rpc_server_id__ # is a client
-          value.__rpc_server_id__
-        elsif value.respond_to? :to_rpc_server_id # is a servable
-          @hub.servers.add(value)
-          value.to_rpc_server_id
-        else
-          value
-        end
-      end
-    end
-
-    def deep_map(object, &mapper)
-      case object
-      when Hash then object.map{ |k, v| [k, deep_map(v, &mapper)] }.to_h
-      when Array then object.map{ |item| deep_map(item, &mapper) }
-      else yield object
-      end
-    end
   end
 end

data/lib/pipe_rpc/client_request_result.rb

@@ -18,9 +18,7 @@ module PipeRpc
         @value.set_backtrace(@value.backtrace.to_a + @request.stacktrace) if @value.respond_to? :set_backtrace
         raise @value
       else
-        @request.deep_map(@value) do |value|
-          (@request.hub.servers.registered? value) ? @request.hub.servers[value] : value
-        end
+        DeepMapper.from_transport(@value, @request.hub)
       end
     end
   end

data/lib/pipe_rpc/deep_mapper.rb

@@ -0,0 +1,36 @@
+module PipeRpc
+  class DeepMapper
+    def self.map(object, &mapper)
+      case object
+      when Hash then object.map{ |k, v| [k, map(v, &mapper)] }.to_h
+      when Array then object.map{ |item| map(item, &mapper) }
+      else yield object
+      end
+    end
+
+    def self.to_transport(object, hub)
+      map(object) do |value|
+        if value.respond_to? :__rpc_server_id__
+          "__rpc_client__#{value.__rpc_server_id__}"
+        elsif value.respond_to? :to_rpc_server_id
+          hub.servers.add(value) unless hub.servers.registered? value.to_rpc_server_id
+          "__rpc_server__#{value.to_rpc_server_id}"
+        else
+          value
+        end
+      end
+    end
+
+    def self.from_transport(object, hub)
+      map(object) do |value|
+        if value.is_a?(String) and value.start_with?('__rpc_client__')
+          hub.servers[value.sub('__rpc_client__', '')]
+        elsif value.is_a?(String) and value.start_with?('__rpc_server__')
+          Client.new(value.sub('__rpc_server__', ''), hub)
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/pipe_rpc/error.rb

@@ -2,6 +2,7 @@ module PipeRpc
   class Error < StandardError; end
   class ClosedError < Error; end
   class UnknownError < Error; end
+  class ServerRegistrationError < Error; end
 
   class MessageError < Error; end
   class MessageParseError < MessageError; end

data/lib/pipe_rpc/hub_request.rb

@@ -7,13 +7,16 @@ module PipeRpc
       super body
     end
 
-    CALL_FILE, CALL_LINENO = __FILE__, __LINE__+4
+    attr_reader :hub
+
     def handle
       evaluate_result do
         # the block is passed for asynchronous evaluation
-        @hub.servers[server].__send__(method, *arguments, &evaluate_result_proc)
+        mapped_arguments = DeepMapper.from_transport(arguments, @hub)
+        @hub.servers[server].__send__(method, *mapped_arguments, &evaluate_result_proc)
       end
     end
+    CALL_FILE, CALL_LINENO = __FILE__, __LINE__-3
 
     def evaluate_result(result = nil, &block)
       result = Result.new(self, block_given? ? yield : result)

data/lib/pipe_rpc/hub_request_result.rb

@@ -5,11 +5,11 @@ module PipeRpc
     end
 
     def value
-      @result
+      DeepMapper.to_transport(@result, @request.hub)
     end
 
     def to_response
-      ResultResponse.new(id: @request.id, result: @result)
+      ResultResponse.new(id: @request.id, result: value)
     end
   end
 end

data/lib/pipe_rpc/hub_server.rb

@@ -3,17 +3,19 @@ module PipeRpc
     kernel = ::Kernel.dup
     kernel.class_eval do
       alias_method :__rpc_server_class__, :class
-      (instance_methods - [:__rpc_server_class__]).each{ |m| remove_method m }
+      (instance_methods - [:__rpc_server_class__, :object_id]).each{ |m| remove_method m }
       private_instance_methods.each{ |m| remove_method m } if respond_to? :private_instance_methods
     end
     include kernel
 
+    SERVER_ID_GETTER = :__id__
+
     def self.const_missing(name)
       ::Object.const_get(name)
     end
 
     def to_rpc_server_id
-      "#{self.__rpc_server_class__.to_s}##{__id__}".to_sym
+      "#{__rpc_server_class__.to_s}##{__send__(__rpc_server_class__::SERVER_ID_GETTER)}".to_sym
     end
   end
 end

data/lib/pipe_rpc/hub_servers.rb

@@ -4,11 +4,17 @@ module PipeRpc
       @servers = Hash.new{ |hash, key| raise NoServerError.new("no server #{key}") }
     end
 
-    def add(*servers)
-      if servers.first.respond_to? :to_rpc_server_id
-        servers.each{ |server| @servers[server.to_rpc_server_id] = server }
+    def add(server)
+      id, server = if server.respond_to? :to_rpc_server_id
+        [server.to_rpc_server_id, server]
       else
-        servers.first.each{ |id, server| @servers[id.to_sym] = server }
+        server.first
+      end
+
+      if registered? id
+        raise ServerRegistrationError.new("server id #{id.inspect} already used for another server")
+      else
+        @servers[id] = server
       end
     end
 

data/lib/pipe_rpc/version.rb

@@ -1,3 +1,3 @@
 module PipeRpc
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -105,6 +105,7 @@ files:
 - lib/pipe_rpc/client_request_response.rb
 - lib/pipe_rpc/client_request_result.rb
 - lib/pipe_rpc/client_request_result_response.rb
+- lib/pipe_rpc/deep_mapper.rb
 - lib/pipe_rpc/error.rb
 - lib/pipe_rpc/error_response.rb
 - lib/pipe_rpc/gateway.rb