pipe_rpc 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0358adf8660892a8dcd7f7fa2cdc00fa7aec1e7c
-  data.tar.gz: 260d9f45bd8c159d9a27c5a0f8630da1edc1ad15
+  metadata.gz: 404b904e9d7fdd27b2fd405391e5436fef8209ff
+  data.tar.gz: ffff7dbe2b497f70071cb1cb1af302f59cc50f2c
 SHA512:
-  metadata.gz: eeb67540050b3e85b54f21e0c33e2cc0880ef9b77bafe2aaa0c056b4691dc083087a212e015fe44237d4ba5b709c8f493c013c8e676196a3c606a848b3f4b8ae
-  data.tar.gz: 7ee01e84a9ae90ac0c4f86820345a9a7c1ea2aab5a5dd1dcb3426649f5a9283c811b4f9b2cdf79098d20ce18e5fac6c376169c0425cf95a57c4df5a3fb1e6779
+  metadata.gz: 862dd2c6bb48569342693dfeec30f0844698bb4440cb0c11d29b5740de180b8c7c6ede268976a7f1d6ac5d2d2e27d82d1dfcbea4918e1802dd357e198eb5ada1
+  data.tar.gz: 937143f71bca5bfc7c50676e0d68ad6c3bae864915273c0fbf7c8dc00e6393d7b6bdb1ae0b963909f44616a8c7ef1f8e2bfcd201337ff53d374a5fc1ccd7a662

data/lib/pipe_rpc/_pipe_rpc.rb

@@ -0,0 +1,18 @@
+Module.class_eval do
+  def dup_including(*methods)
+    dup.class_eval do
+      aliased = (methods.last.is_a? Hash) ? methods.last : {}
+      aliased.each{ |from, to| alias_method to, from }
+
+      to_be_kept_methods = methods + aliased.values
+      (all_instance_methods - to_be_kept_methods).each{ |m| remove_method m }
+
+      self
+    end
+  end
+
+  def all_instance_methods
+    private_methods = (respond_to? :private_instance_methods) ? private_instance_methods : []
+    instance_methods + private_methods
+  end
+end

data/lib/pipe_rpc/basic_interface.rb

@@ -1,26 +1,20 @@
 module PipeRpc
   class BasicInterface < BasicObject
+    def self.const_missing(name)
+      ::Object.const_get(name)
+    end
+
     wanted_methods = [:initialize, :__id__, :object_id, :__send__, :respond_to?, :method_missing]
+    wanted_methods += (Object.const_defined? :MRUBY_VERSION) ? [:!] : [:!, :==, :!=, :equal?]
 
-    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
+    existing_methods = BasicObject.all_instance_methods
 
     # 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
+    include Kernel.dup_including *(wanted_methods - existing_methods)
 
     alias send __send__
   end

data/lib/pipe_rpc/client.rb

@@ -5,9 +5,12 @@ module PipeRpc
     def initialize(server_id = :default, hub)
       Kernel.raise ClientInitializationError.new("server id #{server_id.inspect} no symbol") unless server_id.is_a? Symbol
       @__rpc_server_id__ = server_id
+      @__rpc_server_class_name__ = server_id.to_s.split('#').first
       @hub = hub
     end
 
+    attr_reader :__rpc_server_class_name__, :__rpc_server_id__
+
     def respond_to?(method)
       super or method_missing(:respond_to?, method)
     end
@@ -21,18 +24,4 @@ module PipeRpc
       "#{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] = TransportMapper.to_transport(request[:arguments], hub)
+      request[:arguments] = hub.transport_mapper.to_transport request[:arguments]
       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
-        TransportMapper.from_transport(@value, @request.hub)
+        @request.hub.transport_mapper.from_transport @value
       end
     end
   end

data/lib/pipe_rpc/hub.rb

@@ -6,9 +6,10 @@ module PipeRpc
       @requests = Requests.new(self)
       @servers = Servers.new
       @clients = Clients.new(self)
+      @transport_mapper = TransportMapper.new(self)
     end
 
-    attr_reader :channel, :servers, :clients, :requests, :socket
+    attr_reader :channel, :servers, :clients, :requests, :socket, :transport_mapper
 
     def handle_message
       Message.new(self, @socket.read).handle

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 = TransportMapper.from_transport(arguments, @hub)
+        mapped_arguments = @hub.transport_mapper.from_transport arguments
         @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
-      TransportMapper.to_transport(@result, @request.hub)
+      @request.hub.transport_mapper.to_transport @result
     end
 
     def to_response

data/lib/pipe_rpc/hub_servers.rb

@@ -5,8 +5,8 @@ module PipeRpc
     end
 
     def add(server)
-      id, server = if server.respond_to? :to_rpc_server_id
-        [server.to_rpc_server_id, server]
+      id, server = if server.respond_to? :__rpc_server_id__
+        [server.__rpc_server_id__, server]
       else
         server.first
       end

data/lib/pipe_rpc/hub_transport_mapper.rb

@@ -0,0 +1,30 @@
+module PipeRpc
+  class Mapper; end
+  class Hub::TransportMapper < Mapper
+    def initialize(hub)
+      @hub = hub
+    end
+
+    def to_transport(object)
+      map(object) do |value|
+        if value.respond_to? :to_rpc_transport
+          value.to_rpc_transport(@hub)
+        else
+          value
+        end
+      end
+    end
+
+    def from_transport(object)
+      map(object) do |value|
+        if (value.is_a? String) and (value.start_with? Client::TRANSPORT_PREFIX)
+          @hub.servers[value.sub(Client::TRANSPORT_PREFIX, '').to_sym]
+        elsif (value.is_a? String) and (value.start_with? Server::TRANSPORT_PREFIX)
+          @hub.clients[value.sub(Server::TRANSPORT_PREFIX, '').to_sym]
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/pipe_rpc/mapper.rb

@@ -0,0 +1,17 @@
+module PipeRpc
+  class Mapper
+    def 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
+  end
+end

data/lib/pipe_rpc/server.rb

@@ -0,0 +1,27 @@
+module PipeRpc
+  class Server < BasicInterface
+    TRANSPORT_PREFIX = "__rpc_server__"
+
+    include Kernel.dup_including :object_id, class: :__class__
+    private :__class__
+
+    def __rpc_server_class_name__
+      __class__.to_s
+    end
+
+    def __rpc_server_id__
+      "#{__rpc_server_class_name__}##{__id__}".to_sym
+    end
+
+    def to_rpc_transport(hub)
+      hub.servers.add(self) unless hub.servers.registered? __rpc_server_id__
+      "#{TRANSPORT_PREFIX}#{__rpc_server_id__}"
+    end
+  end
+
+  class << Server
+    def instance_eval_for(server, *args, &block)
+      Object.instance_method(:instance_eval).bind(server).call(*args, &block)
+    end
+  end
+end

data/lib/pipe_rpc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Christopher Aue
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - lib/msgpack_config.rb
 - lib/pipe_rpc.rb
+- lib/pipe_rpc/_pipe_rpc.rb
 - lib/pipe_rpc/basic_interface.rb
 - lib/pipe_rpc/client.rb
 - lib/pipe_rpc/client_request.rb
@@ -117,12 +118,13 @@ 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/hub_transport_mapper.rb
+- lib/pipe_rpc/mapper.rb
 - lib/pipe_rpc/request.rb
 - lib/pipe_rpc/result_response.rb
-- lib/pipe_rpc/transport_mapper.rb
+- lib/pipe_rpc/server.rb
 - lib/pipe_rpc/version.rb
 - pipe_rpc.gemspec
 homepage: https://github.com/christopheraue/ruby-pipe_rpc

data/lib/pipe_rpc/hub_server.rb

@@ -1,40 +0,0 @@
-module PipeRpc
-  class Hub::Server < BasicInterface
-    TRANSPORT_PREFIX = "__rpc_server__"
-
-    kernel = ::Kernel.dup
-    kernel.class_eval do
-      alias_method :__rpc_server_class__, :class
-      (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
-
-    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
-
-  class << Hub::Server
-    def const_missing(name)
-      ::Object.const_get(name)
-    end
-
-    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

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