onedrb 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e484349df963bdb3ab1dafb85fa5697dc9460c330d1f863e8ed723ca941e8fcc
-  data.tar.gz: c58a17ce4eddc48d611115ae13d5dbd97fddd983c3e2ca537b478f4029f663d3
+  metadata.gz: 3829bafa21b51494d1bc147e668427dddc6998da520a60e14eefcd6b9c99c8e5
+  data.tar.gz: 26afcc85a10fb500e8f4e8d9c69ff2d1c23def83b0feed1b6279e7df958742f0
 SHA512:
-  metadata.gz: 96d256270dbc280f69f0e9873787c608132f9ebf45cf20bd06be1a69a2845080e2bd2177d8b35fdce8ca344d6e0edb50c5bf5e3893c6941600c6ec1a3de1fe09
-  data.tar.gz: 4c119540720a72be369dec14c3156fa9f96c849b93df6c49229c14d838cb93846058496d53621a64242b72176ecf8ce800f657339f11c8221affa4f3fc0e373d
+  metadata.gz: 4d41f05105f22e8be82720dd89d0199c643ac76817ca04ae43c40132bb2d07004a9311be375bb296775834fb0e9591ce113d927fb410d1dab109601e076b73aa
+  data.tar.gz: 725672d9bf14d981f1df49be58699194bea4f722379d319a8bd84af5c89be26c8760c3c5e1d0990d6459cb29aa9462ee8b7d7974e816d936460b150ac2022eff

data/lib/onedrb.rb

@@ -47,18 +47,6 @@ class ServiceMgr < AppMgr
     end.compact
   end
 
-  def stop(service)
-    super(service).sub('app', 'service')
-  end
-
-  def unload(service)
-    super(service).sub('app', 'service')
-  end
-
-  def method_missing(sym, *args)
-    #puts 'servicemgr sym: ' + sym.inspect
-    #puts 'args: ' + args.inspect
-  end
 end
 
 
@@ -116,7 +104,7 @@ module OneDrb
       parent = self
       @obj&.services.each do |name, methods|
 
-        make_class(name, methods)
+        make_class(name, methods, parent)
 
       end
 
@@ -176,7 +164,7 @@ module OneDrb
 
       @obj.restart(service)
       found = @obj.services.assoc(service)
-      make_class(*found) if found.any?
+      make_class(*found, self) if found.any?
     end
 
     def method_missing(sym, *args)
@@ -191,7 +179,7 @@ module OneDrb
 
     private
 
-    def make_class(name, methods)
+    def make_class(name, methods, parent)
 
       class_name = name.capitalize
       klass = Object.const_set(class_name,Class.new)
@@ -213,184 +201,3 @@ module OneDrb
   end
 
 end
-
-
-
-# Note: The Server object can also use a default ServiceMgr object.
-#       Which allows multiple services (user-defined objects) to be
-#       hosted dynamically.
-
-
-class ServiceMgr
-
-  def initialize()
-    @services = {}
-  end
-
-
-  def call(service, methodname, *a)
-
-    proc1 = @services[service.to_sym].method(methodname.to_sym)
-    a.last.is_a?(Hash) ? proc1.call(*a[0..-2], **a.last) : proc1.call(*a)
-
-  end
-
-  def [](key)
-    @services[key]
-  end
-
-  def []=(key, value)
-    @services[key] = value
-
-    define_singleton_method key do
-      @services[key]
-    end
-  end
-
-  def services()
-    @services.map do |key, object|
-      [key, object.public_methods - Object.public_methods]
-    end
-  end
-
-  def method_missing(sym, *args)
-    puts 'servicemgr sym: ' + sym.inspect
-    puts 'args: ' + args.inspect
-  end
-end
-
-
-class OneDrbError < Exception
-end
-
-
-module OneDrb
-
-  class Server
-    using ColouredText
-
-    def initialize(host: '127.0.0.1', port: (49152..65535).to_a.sample.to_s,
-                    obj: ServiceMgr.new, log: nil)
-
-      log.info self.class.to_s + '/initialize: active' if log
-
-      @host, @port, @log = host, port, log
-
-      if obj then
-        @obj = obj
-      else
-        msg = "No object supplied!".error
-        puts msg
-        raise OneDrbError, msg
-      end
-
-      log.info self.class.to_s +'/initialize: completed' if log
-
-    end
-
-    def start()
-
-      @log.info self.class.to_s +'/start: active' if @log
-      puts (self.class.to_s + " running on port " + @port).info
-      DRb.start_service "druby://#{@host}:#{@port}", @obj
-      DRb.thread.join
-
-    end
-
-  end
-
-
-  class Client
-    using ColouredText
-
-    def initialize(host: '127.0.0.1', port: nil)
-
-      DRb.start_service
-
-      puts 'no port supplied'.error unless port
-
-      puts ('client connecting to port ' + port).info
-      @obj = DRbObject.new_with_uri("druby://#{host}:#{port}")
-      parent = self
-      @obj&.services.each do |name, methods|
-
-        class_name = name.capitalize
-        klass = Object.const_set(class_name,Class.new)
-
-        klass.class_eval do
-          methods.each do |method_name|
-            define_method method_name do |*args|
-              parent.call name, method_name, *args
-            end
-          end
-        end
-
-        define_singleton_method name do
-          klass.new
-        end
-
-      end
-
-    end
-
-    # Makes a remote call in 1 line of code using a URI
-    # e.g. OneDrb::Client.call 'odrb://clara.home/fun/go?arg=James&age=49'
-    #
-    def self.call(s, port: nil)
-
-      r = s.match(/^odrb:\/\/([^\/]+)\/([^\/]+)\/([^\?]+)\??(.*)/).captures
-
-      rawhostname, service, methodname, rawargs = r
-      hostname, rawport = rawhostname.split(':',2)
-      port ||= rawport
-
-      rawargs2 = rawargs&.split('&').map {|x| x.split('=')}
-
-      a1, a2 = rawargs2.partition do |field, value|
-        field.downcase.to_sym == :arg
-      end
-
-      h = a2.map {|k,v| [k.to_sym, v]}.to_h
-      a = a1.map(&:last)
-
-      client = OneDrb::Client.new host: hostname, port: port
-
-      if h.any? then
-
-        if a.any? then
-          client.call service.to_sym, methodname.to_sym, *a, **h
-        else
-          client.call service.to_sym, methodname.to_sym, **h
-        end
-
-      elsif a.any?
-
-        client.call service.to_sym, methodname.to_sym, *a
-
-      else
-
-        client.call service.to_sym, methodname.to_sym
-
-      end
-
-    end
-
-    def remote()
-      @obj
-    end
-
-    def method_missing(sym, *args)
-
-      puts '@obj.class: ' + @obj.class.inspect
-
-      if args.last.is_a?(Hash) then
-        @obj.send(sym, *args[0..-2], **args.last)
-      else
-        @obj.send(sym, *args)
-      end
-
-    end
-
-  end
-
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onedrb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lK7OtCGPauDHVuIWDW0EnHb+MMBt6F5SqC+PSy9iOzs4zAWkJMFp86MOEK2yrfnO
   /ghrVtneK08DqmYOaive8I6P
   -----END CERTIFICATE-----
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32