pipe_rpc 2.2.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11c770e36c36885a8ca8a81401aac2cec26469c
-  data.tar.gz: 3a5f50f02c861b2b734f1c6d4e98930968e3cd0c
+  metadata.gz: 0358adf8660892a8dcd7f7fa2cdc00fa7aec1e7c
+  data.tar.gz: 260d9f45bd8c159d9a27c5a0f8630da1edc1ad15
 SHA512:
-  metadata.gz: a43880de70e696db2ca33bf80b27c3fd896bdc61f3611497b948453925ed8046b923d933b338c2e2242eda36252b2a2c72bd4b5e40ea122a874ea2c0412332ea
-  data.tar.gz: d378cb4fa296eac256178cddc280f5805c2f5e7a78e71395af5194afbe57d0e2c6570cb2dff6c54dd734b22275128072f0dd404c83d1df3d94876b9c61d80de6
+  metadata.gz: eeb67540050b3e85b54f21e0c33e2cc0880ef9b77bafe2aaa0c056b4691dc083087a212e015fe44237d4ba5b709c8f493c013c8e676196a3c606a848b3f4b8ae
+  data.tar.gz: 7ee01e84a9ae90ac0c4f86820345a9a7c1ea2aab5a5dd1dcb3426649f5a9283c811b4f9b2cdf79098d20ce18e5fac6c376169c0425cf95a57c4df5a3fb1e6779

data/lib/pipe_rpc/client.rb

@@ -1,13 +1,13 @@
 module PipeRpc
   class Client < BasicInterface
+    TRANSPORT_PREFIX = "__rpc_client__"
+
     def initialize(server_id = :default, hub)
-      ::Kernel.raise ClientInitializationError.new("server id #{server_id.inspect} no symbol") unless server_id.is_a? ::Symbol
+      Kernel.raise ClientInitializationError.new("server id #{server_id.inspect} no symbol") unless server_id.is_a? Symbol
       @__rpc_server_id__ = server_id
       @hub = hub
     end
 
-    attr_reader :__rpc_server_id__
-
     def respond_to?(method)
       super or method_missing(:respond_to?, method)
     end
@@ -16,5 +16,23 @@ module PipeRpc
       request = Client::Request.new(@hub, server: @__rpc_server_id__, method: method, arguments: args)
       @hub.requests.evaluate(request)
     end
+
+    def to_rpc_transport(hub = nil)
+      "#{TRANSPORT_PREFIX}#{@__rpc_server_id__}"
+    end
+  end
+
+  class << Client
+    def const_missing(name)
+      ::Object.const_get(name)
+    end
+
+    def from_rpc_transport?(transport)
+      (transport.is_a? String) and (transport.start_with? Hub::Server::TRANSPORT_PREFIX)
+    end
+
+    def from_rpc_transport(hub, transport)
+      hub.clients[transport.sub(Hub::Server::TRANSPORT_PREFIX, '').to_sym]
+    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] = DeepMapper.to_transport(request[:arguments], hub)
+      request[:arguments] = TransportMapper.to_transport(request[:arguments], hub)
       super request
       # discard first three entries mentioning Client::Request#initialize,
       # Client::Request.new and Client#method_missing in stacktrace

data/lib/pipe_rpc/client_request_result.rb

@@ -18,7 +18,7 @@ module PipeRpc
         @value.set_backtrace(@value.backtrace.to_a + @request.stacktrace) if @value.respond_to? :set_backtrace
         raise @value
       else
-        DeepMapper.from_transport(@value, @request.hub)
+        TransportMapper.from_transport(@value, @request.hub)
       end
     end
   end

data/lib/pipe_rpc/hub_request.rb

@@ -12,7 +12,7 @@ module PipeRpc
     def handle
       evaluate_result do
         # the block is passed for asynchronous evaluation
-        mapped_arguments = DeepMapper.from_transport(arguments, @hub)
+        mapped_arguments = TransportMapper.from_transport(arguments, @hub)
         @hub.servers[server].__send__(method, *mapped_arguments, &evaluate_result_proc)
       end
     end

data/lib/pipe_rpc/hub_request_result.rb

@@ -5,7 +5,7 @@ module PipeRpc
     end
 
     def value
-      DeepMapper.to_transport(@result, @request.hub)
+      TransportMapper.to_transport(@result, @request.hub)
     end
 
     def to_response

data/lib/pipe_rpc/hub_server.rb

@@ -1,5 +1,7 @@
 module PipeRpc
   class Hub::Server < BasicInterface
+    TRANSPORT_PREFIX = "__rpc_server__"
+
     kernel = ::Kernel.dup
     kernel.class_eval do
       alias_method :__rpc_server_class__, :class
@@ -8,14 +10,31 @@ module PipeRpc
     end
     include kernel
 
-    SERVER_ID_GETTER = :__id__
+    def to_rpc_server_id
+      "#{__rpc_server_class__}##{__id__}".to_sym
+    end
+
+    def to_rpc_transport(hub)
+      hub.servers.add(self) unless hub.servers.registered? to_rpc_server_id
+      "#{TRANSPORT_PREFIX}#{to_rpc_server_id}"
+    end
+  end
 
-    def self.const_missing(name)
+  class << Hub::Server
+    def const_missing(name)
       ::Object.const_get(name)
     end
 
-    def to_rpc_server_id
-      "#{__rpc_server_class__.to_s}##{__send__(__rpc_server_class__::SERVER_ID_GETTER)}".to_sym
+    def instance_eval_for(server, *args, &block)
+      Object.instance_method(:instance_eval).bind(server).call(*args, &block)
+    end
+
+    def from_rpc_transport?(transport)
+      (transport.is_a? String) and (transport.start_with? Client::TRANSPORT_PREFIX)
+    end
+
+    def from_rpc_transport(hub, transport)
+      hub.servers[transport.sub(Client::TRANSPORT_PREFIX, '').to_sym]
     end
   end
 end

data/lib/pipe_rpc/transport_mapper.rb

@@ -0,0 +1,39 @@
+module PipeRpc
+  class TransportMapper
+    def self.map(object, &mapper)
+      if Client === object
+        # first filter out clients so for them subsequent checks are not sent
+        # through the pipe
+        yield object
+      elsif Hash === object
+        object.map{ |k, v| [k, map(v, &mapper)] }.to_h
+      elsif object.respond_to? :map
+        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? :to_rpc_transport
+          value.to_rpc_transport(hub)
+        else
+          value
+        end
+      end
+    end
+
+    def self.from_transport(object, hub)
+      map(object) do |value|
+        if Hub::Server.from_rpc_transport? value
+          Hub::Server.from_rpc_transport(hub, value)
+        elsif Client.from_rpc_transport? value
+          Client.from_rpc_transport(hub, value)
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/pipe_rpc/version.rb

@@ -1,3 +1,3 @@
 module PipeRpc
-  VERSION = "2.2.3"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -105,7 +105,6 @@ 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
@@ -123,6 +122,7 @@ files:
 - lib/pipe_rpc/hub_socket.rb
 - lib/pipe_rpc/request.rb
 - lib/pipe_rpc/result_response.rb
+- lib/pipe_rpc/transport_mapper.rb
 - lib/pipe_rpc/version.rb
 - pipe_rpc.gemspec
 homepage: https://github.com/christopheraue/ruby-pipe_rpc

data/lib/pipe_rpc/deep_mapper.rb

@@ -1,44 +0,0 @@
-module PipeRpc
-  class DeepMapper
-    def self.map(object, &mapper)
-      if object.respond_to? :__rpc_server_id__
-        # first filter out clients so for them subsequent checks are not sent
-        # through the pipe
-        yield object
-      elsif Hash === object
-        object.map{ |k, v| [k, map(v, &mapper)] }.to_h
-      elsif object.respond_to? :map
-        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__
-          # first filter out clients so for them subsequent checks are not sent
-          # through the pipe
-          "__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__', '').to_sym]
-        elsif value.is_a?(String) and value.start_with?('__rpc_server__')
-          Client.new(value.sub('__rpc_server__', '').to_sym, hub)
-        else
-          value
-        end
-      end
-    end
-  end
-end