pipe_rpc 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0f50e52b37b279be08b1044701ff5dc9fdb53f
-  data.tar.gz: 9aa8ac09ca6ad298acba5869c649a707c2d5bf4c
+  metadata.gz: 1991805b18e6be65590ca3b7467624b7c6fd804b
+  data.tar.gz: e61fcf89ca3cd3a8a8b0be4ecc195c2173cd8961
 SHA512:
-  metadata.gz: 57dd76c93512192edbe0878d59887a09d9177d0db745243bc4549c226e0e9f908fcd72eb1a195dfa0bdc9009e26bd471745abdedceae9d49a84f04a776a8f640
-  data.tar.gz: cc9327c2967955c7c82790f919acc1e7ed33f93eb596a91b88e7bc92b149d9f430e646dd15b674fe562b23454818b5c38ed244d4f83082179f777b3f57c2998d
+  metadata.gz: e48baa8052601b1ab367a6425225bb1a2df1b941bd5ef6127d1bc4569a6ee57d02a72381f63f45ebd1fb3cf194fbb39b741eca8218ef1b99416a82e8df37ed04
+  data.tar.gz: 4395b41a3b820e9e79e7727a47527878dd8d169801aa28398ad59dbea25d8e2ce64975fb024c38495781cc766302c7e699293120c3e762ffce131b3af1f15d18

data/lib/pipe_rpc/basic_interface.rb

@@ -0,0 +1,27 @@
+module PipeRpc
+  class BasicInterface < BasicObject
+    wanted_methods = [:initialize, :__id__, :__send__, :respond_to?, :method_missing]
+
+    existing_methods = if ::Object.const_defined?(:MRUBY_VERSION)
+      [:initialize, :method_missing]
+    else
+      [:initialize, :__id__, :__send__, :instance_eval, :instance_exec, :method_missing,
+        :singleton_method_added, :singleton_method_removed, :singleton_method_undefined]
+    end
+
+    # Remove unwanted methods
+    unwanted_methods = existing_methods - wanted_methods
+    unwanted_methods.each { |m| undef_method m }
+
+    # Add non-existing methods by including sorted out Kernel module
+    to_be_added_methods = wanted_methods - existing_methods
+    kernel = ::Kernel.dup
+    kernel.class_eval do
+      (instance_methods - to_be_added_methods).each{ |m| remove_method m }
+      private_instance_methods.each{ |m| remove_method m } if respond_to? :private_instance_methods
+    end
+    include kernel
+
+    alias send __send__
+  end
+end

data/lib/pipe_rpc/client.rb

@@ -1,27 +1,23 @@
 module PipeRpc
-  class Client < BasicObject
-    undef_method :instance_eval unless ::Object.const_defined?(:MRUBY_VERSION)
-    undef_method :instance_exec unless ::Object.const_defined?(:MRUBY_VERSION)
-
-    def initialize(server = :default, hub)
-      @server = server.to_sym
+  class Client < BasicInterface
+    def initialize(server_id = :default, hub)
+      @__rpc_server_id__ = server_id.to_sym
       @hub = hub
     end
 
+    attr_reader :__rpc_server_id__
+
+    def respond_to?(method)
+      super or method_missing(:respond_to?, method)
+    end
+
     def method_missing(method, *args)
-      request = Client::Request.new(server: @server, method: method, arguments: args)
+      request = Client::Request.new(@hub, server: @__rpc_server_id__, method: method, arguments: args)
       @hub.requests.evaluate(request)
     end
-    alias __send__ method_missing
-    alias send method_missing
-    alias public_send method_missing
 
     def to_s
-      "<Client:#{@server.to_s}>"
-    end
-
-    def is_a?(object)
-      object == Client
+      "<Client:#{@__rpc_server_id__}>"
     end
   end
 end

data/lib/pipe_rpc/client_request.rb

@@ -2,15 +2,17 @@ class PipeRpc::Request; end
 
 module PipeRpc
   class Client::Request < Request
-    def initialize(*args)
-      super
+    def initialize(hub, request)
+      @hub = hub
+      request[:arguments] = arguments_to_server_ids(request[:arguments])
+      super request
       # discard first three entries mentioning Client::Request#initialize,
       # Client::Request.new and Client#method_missing in stacktrace
       @stacktrace = Kernel.respond_to?(:caller) ? Kernel.caller(3).to_a : []
       @result = Result.new(self)
     end
 
-    attr_reader :stacktrace, :result
+    attr_reader :hub, :stacktrace, :result
 
     def id=(id)
       raise 'id already set' if @id
@@ -20,5 +22,26 @@ 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,7 +18,9 @@ module PipeRpc
         @value.set_backtrace(@value.backtrace.to_a + @request.stacktrace) if @value.respond_to? :set_backtrace
         raise @value
       else
-        @value
+        @request.deep_map(@value) do |value|
+          (@request.hub.servers.registered? value) ? @request.hub.servers[value] : value
+        end
       end
     end
   end

data/lib/pipe_rpc/hub_server.rb

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

data/lib/pipe_rpc/hub_servers.rb

@@ -4,20 +4,24 @@ module PipeRpc
       @servers = Hash.new{ |hash, key| raise NoServerError.new("no server #{key}") }
     end
 
-    def add(servers)
-      servers.each{ |name, server| @servers[name.to_sym] = server }
+    def add(*servers)
+      if servers.first.respond_to? :to_rpc_server_id
+        servers.each{ |server| @servers[server.to_rpc_server_id] = server }
+      else
+        servers.first.each{ |id, server| @servers[id.to_sym] = server }
+      end
     end
 
-    def [](name)
-      @servers[name.to_sym]
+    def [](id)
+      @servers[id.to_sym]
     end
 
-    def remove(name)
-      @servers.delete(name.to_sym)
+    def remove(id)
+      @servers.delete(id.to_sym)
     end
 
-    def registered?(name)
-      @servers.has_key?(name)
+    def registered?(id)
+      @servers.has_key?(id)
     end
   end
 end

data/lib/pipe_rpc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - lib/msgpack_config.rb
 - lib/pipe_rpc.rb
+- lib/pipe_rpc/basic_interface.rb
 - lib/pipe_rpc/client.rb
 - lib/pipe_rpc/client_request.rb
 - lib/pipe_rpc/client_request_error_response.rb
@@ -116,6 +117,7 @@ files:
 - lib/pipe_rpc/hub_request_error_result.rb
 - lib/pipe_rpc/hub_request_result.rb
 - lib/pipe_rpc/hub_requests.rb
+- lib/pipe_rpc/hub_server.rb
 - lib/pipe_rpc/hub_servers.rb
 - lib/pipe_rpc/hub_socket.rb
 - lib/pipe_rpc/request.rb