nobject 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e7b2b83952e588a823fc66b9f9591d380e6b15ec6befc7a500f9175b708be3
-  data.tar.gz: 73520de71d444c9ce29d3a713a251c5135575c2d7ebe523d1425dcc5455424be
+  metadata.gz: a07616d80ff414ef453ae35d7f8c7ae88b6c62f6683444bb2f2fd629a39b4f0d
+  data.tar.gz: 5e9eba6b82be1695ffcf0f26b936c2939c66ea9683e459599b3909ed3e604280
 SHA512:
-  metadata.gz: 2cf62524464081dd0e49ff651c1f0ee817ab566c6cbe5666446f793cea4a6f143b7c41bd7e1f6c8030a36c7a646aceb4f8069dc0f30558f42f97b26b78444c21
-  data.tar.gz: a9e42da33528635173f4af66621b0e5aa81830371a091b1df0072d2f31c42a2dc5fedc346a83c26c62e62205116b67a7398d1d1d0507b167481f74ac358fd2a4
+  metadata.gz: 16428d2597623632176561480785fc7b02d7440177f37561ee3030c80db0c0fa5009e0583067fc9e94a106301ffdfb0b0dfb5e67dc83ed438d8281a9879bed24
+  data.tar.gz: badd4e8b38c40fe20300b58034e5815ca30a804132257334a86d009e2a25cf4053288cdfe5f1e834b1e5bddbc4050461fcd7bea054f9db37d7212b264e29ee91

data/lib/nobject/local.rb

@@ -0,0 +1,54 @@
+require 'socket'
+
+module Nobject
+  # this class is used by the client application, wraps a local object, pushes
+  # it to a Nobject::Serve4r, which will then  send method calls to a matching
+  # Nobject::Remote object
+  class Local
+    # host: the hostname of the server to push obj to
+    # port: the port number of the server to push obj to
+    # obj: the obj to store over the network
+    #
+    # ex:
+    #   # this will create a new Nobject::Local, then push it to the specified
+    #   server Nobject::Local.new('localhost', 1234, <object>)
+    def initialize(host, port, obj)
+      @socket = TCPSocket.new(host, port)
+      obj_bytes = Marshal.dump(obj)
+
+      @socket.send([obj_bytes.length].pack('Q>'), 0)
+      @socket.send(obj_bytes, 0)
+    end
+
+    def method_missing(method, *args, **kwargs, &block)
+      msg = { method: method, args: args }
+      msg_bytes = Marshal.dump(msg)
+
+      @socket.send([msg_bytes.length].pack('Q>'), 0)
+      @socket.send(msg_bytes, 0)
+
+      return_size = @socket.recv(8).unpack('Q>').first
+      return_data = Marshal.load(@socket.recv(return_size))
+
+      case return_data.first
+      when :ok then return_data.last
+      when :raise then raise return_data.last
+      else
+        raise Local::UnknownReturnDataType.new("unknown data type '#{return_data.first}' within Nobject::Local (Nobject::Local::UnknownReturnDataType)")
+      end
+    end
+
+    #####################################
+    # method overridden from Object class
+    #####################################
+    def !~(other);      method_missing(:is_a?, other);  end
+    def <=>(other);     method_missing(:<=>, other);    end
+    def ===(other);     method_missing(:<=>, other);    end
+    def is_a?(klass);   method_missing(:is_a?, klass);  end
+    def inspect;        method_missing(:inspect);       end
+    def to_s;           method_missing(:to_s);          end
+  end
+
+  class Local::UnknownReturnDataType < RuntimeError; end
+  class Local::InvalidMethod < RuntimeError; end
+end

data/lib/nobject/remote.rb

@@ -0,0 +1,38 @@
+require 'socket'
+
+module Nobject
+  # this class is used by the Nobject::Server to receive objects pushed to the
+  # Nobject::Server, listens for method invocations over the network, and sends
+  # the method invocations onwards to this object
+  class Remote
+    def initialize(socket)
+      @socket = socket
+      obj_size = @socket.recv(8).unpack('Q>').first
+      @obj = Marshal.load(@socket.recv(obj_size))
+    end
+
+    def serve!
+      Thread.new do
+        loop do
+          msg_size = @socket.recv(8).unpack('Q>').first
+          msg = Marshal.load(@socket.recv(msg_size))
+
+          result = @obj.send(msg[:method], *msg[:args]) #local_method, *msg[:args])
+          network_return([
+            :ok,
+            result
+          ])
+        end
+      end
+    end
+
+    def network_return(data)
+      data_bytes = Marshal.dump(data)
+
+      @socket.send([data_bytes.length].pack('Q>'), 0)
+      @socket.send(data_bytes, 0)
+    end
+  end
+
+  class Nobject::NoMethodError < NameError; end
+end

data/lib/nobject/server.rb

@@ -0,0 +1,47 @@
+require 'socket'
+require_relative './remote'
+
+module Nobject
+  ##
+  # this class listens for incoming requests to store an object over the network,
+  # accepts connections and then hands those sockets off to server object storage
+  # and invocation.
+  #
+  # ex:
+  #   Nobject::Server.new(1234).start!
+  class Server
+    def initialize(port)
+      @server = TCPServer.new(port)
+      @keep_running = true
+      @nobjects = []
+    end
+
+    def alive?
+      @keep_running
+    end
+
+    def start!
+      loop do
+        break unless @keep_running
+
+        begin
+          incoming_socket = @server.accept_nonblock
+          Remote.new(incoming_socket).serve!
+        rescue IO::EAGAINWaitReadable => e
+          # no connection pending
+          begin
+            IO.select([@server])
+            retry
+          rescue Interrupt, IRB::Abort
+            @keep_running = false
+            @server&.close
+          end
+        end
+      end
+    end
+
+    def stop!
+      @keep_running = false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nobject
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jeff Lunt
@@ -15,9 +15,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/nobject.rb
-- lib/nobject_server.rb
-- lib/proxy_nobject.rb
+- lib/nobject/local.rb
+- lib/nobject/remote.rb
+- lib/nobject/server.rb
 homepage: https://github.com/jefflunt/nobject
 licenses:
 - MIT

data/lib/nobject.rb

@@ -1,35 +0,0 @@
-require 'socket'
-
-# this class wraps a local object, listens for method invocations over the
-# network, and sends the method invocations onwards to the local object.
-class Nobject
-  def initialize(socket)
-    @socket = socket
-    obj_size = @socket.recv(8).unpack('Q>').first
-    @obj = Marshal.load(@socket.recv(obj_size))
-  end
-
-  def serve!
-    Thread.new do
-      loop do
-        msg_size = @socket.recv(8).unpack('Q>').first
-        msg = Marshal.load(@socket.recv(msg_size))
-
-        result = @obj.send(msg[:method], *msg[:args]) #local_method, *msg[:args])
-        network_return([
-          :ok,
-          result
-        ])
-      end
-    end
-  end
-
-  def network_return(data)
-    data_bytes = Marshal.dump(data)
-
-    @socket.send([data_bytes.length].pack('Q>'), 0)
-    @socket.send(data_bytes, 0)
-  end
-end
-
-class Nobject::NoMethodError < NameError; end

data/lib/nobject_server.rb

@@ -1,45 +0,0 @@
-require 'socket'
-require_relative './nobject'
-
-##
-# this class listens for incoming requests to store an object over the network,
-# accepts connections and then hands those sockets off to server object storage
-# and invocation.
-#
-# ex:
-#   NobjectServer.new(1234).start!
-class NobjectServer
-  def initialize(port)
-    @server = TCPServer.new(port)
-    @keep_running = true
-    @nobjects = []
-  end
-
-  def alive?
-    @keep_running
-  end
-
-  def start!
-    loop do
-      break unless @keep_running
-
-      begin
-        incoming_socket = @server.accept_nonblock
-        Nobject.new(incoming_socket).serve!
-      rescue IO::EAGAINWaitReadable => e
-        # no connection pending
-        begin
-          IO.select([@server])
-          retry
-        rescue Interrupt, IRB::Abort
-          @keep_running = false
-          @server&.close
-        end
-      end
-    end
-  end
-
-  def stop!
-    @keep_running = false
-  end
-end

data/lib/proxy_nobject.rb

@@ -1,51 +0,0 @@
-require 'socket'
-
-# this is the class that accepts instantiated objects in the main program, and
-# then pushes them to a remote server
-class ProxyNobject
-  # host: the hostname of the server to push obj to
-  # port: the port number of the server to push obj to
-  # obj: the obj to store over the network
-  #
-  # ex:
-  #   # this will create a new ProxyNobject, then put it to the specified server
-  #   ProxyNobject.new('localhost', 1234, <object>)
-  def initialize(host, port, obj)
-    @socket = TCPSocket.new(host, port)
-    obj_bytes = Marshal.dump(obj)
-
-    @socket.send([obj_bytes.length].pack('Q>'), 0)
-    @socket.send(obj_bytes, 0)
-  end
-
-  def method_missing(method, *args, **kwargs, &block)
-    msg = { method: method, args: args }
-    msg_bytes = Marshal.dump(msg)
-
-    @socket.send([msg_bytes.length].pack('Q>'), 0)
-    @socket.send(msg_bytes, 0)
-
-    return_size = @socket.recv(8).unpack('Q>').first
-    return_data = Marshal.load(@socket.recv(return_size))
-
-    case return_data.first
-    when :ok then return_data.last
-    when :raise then raise return_data.last
-    else
-      raise ProxyNobject::UnknownReturnDataType.new("unknown data type '#{return_data.first}' within ProxyNobject (ProxyNobject::UnknownReturnDataType)")
-    end
-  end
-
-  #####################################
-  # method overridden from Object class
-  #####################################
-  def !~(other);      method_missing(:is_a?, other);  end
-  def <=>(other);     method_missing(:<=>, other);    end
-  def ===(other);     method_missing(:<=>, other);    end
-  def is_a?(klass);   method_missing(:is_a?, klass);  end
-  def inspect;        method_missing(:inspect);       end
-  def object_id;      method_missing(:object_id);     end
-end
-
-class ProxyNobject::UnknownReturnDataType < RuntimeError; end
-class ProxyNobject::InvalidMethod < RuntimeError; end