pipe_rpc 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 404b904e9d7fdd27b2fd405391e5436fef8209ff
-  data.tar.gz: ffff7dbe2b497f70071cb1cb1af302f59cc50f2c
+  metadata.gz: b0b220bb6af80445f30658013667fa408749b8c4
+  data.tar.gz: 3df1bab18503474475c842ae78db2e9c6bcec98a
 SHA512:
-  metadata.gz: 862dd2c6bb48569342693dfeec30f0844698bb4440cb0c11d29b5740de180b8c7c6ede268976a7f1d6ac5d2d2e27d82d1dfcbea4918e1802dd357e198eb5ada1
-  data.tar.gz: 937143f71bca5bfc7c50676e0d68ad6c3bae864915273c0fbf7c8dc00e6393d7b6bdb1ae0b963909f44616a8c7ef1f8e2bfcd201337ff53d374a5fc1ccd7a662
+  metadata.gz: c114586ee4dd7873b17ec13a083cc57cdc1d00cc496bed4a857d2f82b60969646bbafdaad3e12095f4e5537054118970db2ec4944a0dd1821ee06d48af25464b
+  data.tar.gz: 83e3feddd8530083ff24eeb73fc05cdd6cf1c594bb4faf5ad7d216141145fe662b7b4b91da61d3de4c87d9a2f404d32b0a1eba06b5de419b6b28bd9b4284b154

data/lib/pipe_rpc/_pipe_rpc.rb

@@ -15,4 +15,18 @@ Module.class_eval do
     private_methods = (respond_to? :private_instance_methods) ? private_instance_methods : []
     instance_methods + private_methods
   end
+
+  if const_defined? :MRUBY_VERSION
+    alias_method :simple_const_get, :const_get
+
+    def const_get(constant_path, *args)
+      if constant_path.is_a? String
+        constant_path.split('::').inject(self) do |mod, constant|
+          mod.simple_const_get(constant.to_sym, *args)
+        end
+      else
+        simple_const_get(constant_path, *args)
+      end
+    end
+  end
 end

data/lib/pipe_rpc/basic_interface.rb

@@ -1,7 +1,29 @@
 module PipeRpc
   class BasicInterface < BasicObject
-    def self.const_missing(name)
-      ::Object.const_get(name)
+    class << self
+      def const_missing(name)
+        ::Object.const_get(name)
+      end
+
+      def instance_eval_for(object, *args, &block)
+        BasicInterface.add_instance_eval
+        object.instance_eval(*args, &block)
+      ensure
+        BasicInterface.remove_instance_eval
+      end
+
+      def remove_instance_eval
+        class_eval do
+          def instance_eval(*args)
+            caller = (Kernel.respond_to? :caller) ? [Kernel.caller(1)] : nil
+            Kernel.raise ::NoMethodError, "undefined method `instance_eval'", *caller
+          end
+        end
+      end
+
+      def add_instance_eval
+        __send__(:remove_method, :instance_eval)
+      end
     end
 
     wanted_methods = [:initialize, :__id__, :object_id, :__send__, :respond_to?, :method_missing]
@@ -9,9 +31,11 @@ module PipeRpc
 
     existing_methods = BasicObject.all_instance_methods
 
-    # Remove unwanted methods
+    # Remove unwanted methods (while treating #instance_eval specially so we
+    # can selectively use it)
     unwanted_methods = existing_methods - wanted_methods
-    unwanted_methods.each { |m| undef_method m }
+    (unwanted_methods - [:instance_eval]).each { |m| undef_method m }
+    remove_instance_eval
 
     # Add non-existing methods by including sorted out Kernel module
     include Kernel.dup_including *(wanted_methods - existing_methods)

data/lib/pipe_rpc/client.rb

@@ -2,6 +2,8 @@ module PipeRpc
   class Client < BasicInterface
     TRANSPORT_PREFIX = "__rpc_client__"
 
+    undef_method :instance_eval
+
     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
@@ -11,8 +13,8 @@ module PipeRpc
 
     attr_reader :__rpc_server_class_name__, :__rpc_server_id__
 
-    def respond_to?(method)
-      super or method_missing(:respond_to?, method)
+    def respond_to?(*args)
+      super or method_missing(:respond_to?, *args)
     end
 
     def method_missing(method, *args)
@@ -20,8 +22,15 @@ module PipeRpc
       @hub.requests.evaluate(request)
     end
 
-    def to_rpc_transport(hub = nil)
+    def to_rpc_transport(gateway)
       "#{TRANSPORT_PREFIX}#{@__rpc_server_id__}"
     end
   end
+
+  class << Client
+    def from_rpc_transport(gateway, transport)
+      client = gateway.clients[transport.sub(Server::TRANSPORT_PREFIX, '').to_sym]
+      ClientWrapper.from_rpc_transport(gateway, client)
+    end
+  end
 end

data/lib/pipe_rpc/client_request_error_response.rb

@@ -21,7 +21,7 @@ module PipeRpc
     private
 
     def no_method_error
-      NoMethodError.new("undefined method `#{@data.fetch(:method)}' for <Client:#{@request.server}>")
+      NoMethodError.new("undefined method `#{@data.fetch(:method)}' for #{@request.server}")
     end
 
     def argument_error

data/lib/pipe_rpc/client_wrapper.rb

@@ -0,0 +1,29 @@
+module PipeRpc
+  module ClientWrappers; end
+
+  class ClientWrapper < BasicInterface
+    def initialize(gateway, client)
+      @client = client
+      @gateway = gateway
+    end
+
+    def inspect
+      __rpc_server_id__
+    end
+    alias to_s inspect
+
+    def method_missing(method, *args)
+      @client.__send__(method, *args)
+    end
+  end
+
+  class << ClientWrapper
+    def from_rpc_transport(gateway, client)
+      if gateway.client_wrapper_class_namespace.const_defined?(client.__rpc_server_class_name__, false)
+        gateway.client_wrapper_class_namespace.const_get(client.__rpc_server_class_name__, false).new(gateway, client)
+      else
+        client
+      end
+    end
+  end
+end

data/lib/pipe_rpc/gateway.rb

@@ -1,9 +1,13 @@
 module PipeRpc
   class Gateway
-    def initialize(args)
-      @hub = Hub.new(args)
+    def initialize(channels)
+      @hub = Hub.new(self, channels)
+      @client_wrapper_class_namespace = ClientWrappers
+      @subject_server_class_namespace = SubjectServers
     end
 
+    attr_accessor :client_wrapper_class_namespace, :subject_server_class_namespace
+
     def channel
       @hub.channel
     end
@@ -20,6 +24,10 @@ module PipeRpc
       @hub.requests.wait_for_results_through(iteration)
     end
 
+    def handle_message
+      @hub.handle_message
+    end
+
     def on_sent(&on_sent)
       @hub.socket.on_sent(&on_sent)
     end
@@ -39,9 +47,5 @@ module PipeRpc
     def close(reason = 'manually closed')
       @hub.socket.close(reason)
     end
-
-    def handle_message
-      @hub.handle_message
-    end
   end
 end

data/lib/pipe_rpc/hub.rb

@@ -1,12 +1,12 @@
 module PipeRpc
   class Hub
-    def initialize(args)
-      @channel = args[:input]
-      @socket = Socket.new(self, args)
+    def initialize(gateway, channels)
+      @channel = channels[:input]
+      @socket = Socket.new(self, channels)
       @requests = Requests.new(self)
       @servers = Servers.new
       @clients = Clients.new(self)
-      @transport_mapper = TransportMapper.new(self)
+      @transport_mapper = TransportMapper.new(gateway)
     end
 
     attr_reader :channel, :servers, :clients, :requests, :socket, :transport_mapper

data/lib/pipe_rpc/hub_servers.rb

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

data/lib/pipe_rpc/hub_transport_mapper.rb

@@ -1,14 +1,15 @@
 module PipeRpc
   class Mapper; end
+
   class Hub::TransportMapper < Mapper
-    def initialize(hub)
-      @hub = hub
+    def initialize(gateway)
+      @gateway = gateway
     end
 
     def to_transport(object)
       map(object) do |value|
         if value.respond_to? :to_rpc_transport
-          value.to_rpc_transport(@hub)
+          value.to_rpc_transport(@gateway)
         else
           value
         end
@@ -18,9 +19,9 @@ module PipeRpc
     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]
+          Server.from_rpc_transport(@gateway, value)
         elsif (value.is_a? String) and (value.start_with? Server::TRANSPORT_PREFIX)
-          @hub.clients[value.sub(Server::TRANSPORT_PREFIX, '').to_sym]
+          Client.from_rpc_transport(@gateway, value)
         else
           value
         end

data/lib/pipe_rpc/servable.rb

@@ -0,0 +1,32 @@
+module PipeRpc
+  module Servable
+    def self.included(klass)
+      klass.extend ClassMethods
+    end
+
+    module ClassMethods
+      def rpc_server_class_name
+        to_s
+      end
+
+      def __rpc_server_class_name__
+        "#{rpc_server_class_name}".tap do |class_name|
+          class_name << 'Class' if is_a? Class
+        end
+      end
+    end
+
+    def __rpc_server_class_name__
+      self.class.rpc_server_class_name
+    end
+
+    def rpc_server_instance_id
+      __id__
+    end
+
+    def to_rpc_transport(gateway)
+      server_class = gateway.subject_server_class_namespace.const_get(__rpc_server_class_name__, false)
+      server_class.new(self).to_rpc_transport(gateway)
+    end
+  end
+end

data/lib/pipe_rpc/server.rb

@@ -9,19 +9,29 @@ module PipeRpc
       __class__.to_s
     end
 
+    def __rpc_server_instance_id__
+      __id__.to_s
+    end
+
     def __rpc_server_id__
-      "#{__rpc_server_class_name__}##{__id__}".to_sym
+      @__rpc_server_id__ ||= [__rpc_server_class_name__, *__rpc_server_instance_id__].join('#').to_sym
+    end
+
+    def inspect
+      __rpc_server_id__
     end
+    alias to_s inspect
 
-    def to_rpc_transport(hub)
-      hub.servers.add(self) unless hub.servers.registered? __rpc_server_id__
+    def to_rpc_transport(gateway)
+      gateway.servers.add(self) unless gateway.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)
+    def from_rpc_transport(gateway, transport)
+      server = gateway.servers[transport.sub(Client::TRANSPORT_PREFIX, '').to_sym]
+      SubjectServer.from_rpc_transport(gateway, server)
     end
   end
 end

data/lib/pipe_rpc/subject_server.rb

@@ -0,0 +1,39 @@
+module PipeRpc
+  module SubjectServers; end
+
+  class SubjectServer < Server
+    def initialize(server_subject)
+      @server_subject = server_subject
+    end
+
+    def __rpc_server_class_name__
+      if @server_subject.respond_to? :__rpc_server_class_name__
+        @server_subject.__rpc_server_class_name__
+      elsif @server_subject.is_a? Module
+        @server_subject.to_s
+      else
+        @server_subject.class.to_s
+      end
+    end
+
+    def __rpc_server_instance_id__
+      if @server_subject.respond_to? :rpc_server_instance_id
+        @server_subject.rpc_server_instance_id
+      elsif @server_subject.is_a? Module
+        nil
+      else
+        @server_subject.__id__.to_s
+      end
+    end
+  end
+
+  class << SubjectServer
+    def from_rpc_transport(gateway, server)
+      if self === server
+        instance_eval_for(server, '@server_subject')
+      else
+        server
+      end
+    end
+  end
+end

data/lib/pipe_rpc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipe_rpc
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -106,6 +106,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/client_wrapper.rb
 - lib/pipe_rpc/error.rb
 - lib/pipe_rpc/error_response.rb
 - lib/pipe_rpc/gateway.rb
@@ -124,7 +125,9 @@ files:
 - lib/pipe_rpc/mapper.rb
 - lib/pipe_rpc/request.rb
 - lib/pipe_rpc/result_response.rb
+- lib/pipe_rpc/servable.rb
 - lib/pipe_rpc/server.rb
+- lib/pipe_rpc/subject_server.rb
 - lib/pipe_rpc/version.rb
 - pipe_rpc.gemspec
 homepage: https://github.com/christopheraue/ruby-pipe_rpc