onedrb 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1715575559f96238261a54678e475a056223491a3ff7c610a5df823001fe454c
-  data.tar.gz: 66acb7de842732715d02c287c753d1221d2963631b6bc2edd3ca842eecd88665
+  metadata.gz: b157ce44bacdecc88e29fcd4c9ea63a2c87aad10a64b7a4dc40287a80d5c3b41
+  data.tar.gz: fa0b98b2770d33ece4ff519fd70e5cecb1dcbdcbe38256e3467781a373a5cd62
 SHA512:
-  metadata.gz: befc1ab68c1a9ede94f24415faeeb3fbbfcfc044edd3e73cdda361f3fa8cf77d309158804aecc5c2b1f995ee81b7bd382dbe359f798c24bfa222f9422479cff3
-  data.tar.gz: a83d5eb21b2270e5e51c1c8918fffe1b510c43237076f137dbe8d788a5e6394f964bbd10db08d3be4abde3f8e0551766b280c3ba27e6cb94b03fcb579cb03723
+  metadata.gz: 206ad75b01f4cd51cff4fb30b031f13ce5383947961a0ee90bd59abb1a317bea881d65e8a115fab7cfd86818330ecacc89b51a85a5718f36c752b75d495e4038
+  data.tar.gz: 7ece4f05de5579fa22fa1cdb43249b4a50103589f3dfe82aa3ce34889abee7f8de72695b2fa18108c0b60fe679d802a24a3eb460d3914f371d77c52e78364516

data/lib/onedrb.rb

@@ -6,48 +6,47 @@
 
 require 'drb'
 require 'c32'
+require 'app-mgr'
+
 
 # Note: The Server object can also use a default ServiceMgr object.
 #       Which allows multiple services (user-defined objects) to be
 #       hosted dynamically.
+# OneDrb recommended port: 57844 (as this port is recognised by the RSC gem)
+#
+class ServiceMgr < AppMgr
 
-
-class ServiceMgr
-
-  def initialize()
-    @services = {}
+  def initialize(rsf: nil, debug: false)
+    super(rsf: rsf, type: 'service', debug: debug)
+    @services = @app
   end
 
 
   def call(service, methodname, *a)
 
-    proc1 = @services[service.to_sym].method(methodname.to_sym)
+    return @services[service.to_sym][:running] unless methodname
+    proc1 = @services[service.to_sym][:running].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
+  # OneDRb version 2; Allows multiple user-defined objects to be
+  #                   served from 1 DRb service
+  #
+  # not used by any client, but may be in future
+  #
+  #def odrb2?()
+  #  true
+  #end
 
   def services()
     @services.map do |key, object|
-      [key, object.public_methods - Object.public_methods]
-    end
+      next unless object[:running]
+      [key, object[:running].public_methods - Object.public_methods]
+    end.compact
   end
 
-  def method_missing(sym, *args)
-    puts 'servicemgr sym: ' + sym.inspect
-    puts 'args: ' + args.inspect
-  end
 end
 
 
@@ -61,7 +60,7 @@ module OneDrb
     using ColouredText
 
     def initialize(host: '127.0.0.1', port: (49152..65535).to_a.sample.to_s,
-                    obj: ServiceMgr.new, log: nil)
+                    obj: nil, log: nil)
 
       log.info self.class.to_s + '/initialize: active' if log
 
@@ -103,21 +102,13 @@ module OneDrb
       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)
+      if @obj.respond_to? :services then
 
-        klass.class_eval do
-          methods.each do |method_name|
-            define_method method_name do |*args|
-              parent.call name, method_name, *args
-            end
-          end
-        end
+        @obj&.services.each do |name, methods|
+
+          make_class(name, methods, parent)
 
-        define_singleton_method name do
-          klass.new
         end
 
       end
@@ -125,6 +116,8 @@ module OneDrb
     end
 
     # Makes a remote call in 1 line of code using a URI
+    # Only available when using the ServiceMgr as the server object;
+    #
     # e.g. OneDrb::Client.call 'odrb://clara.home/fun/go?arg=James&age=49'
     #
     def self.call(s, port: nil)
@@ -170,9 +163,16 @@ module OneDrb
       @obj
     end
 
-    def method_missing(sym, *args)
+    def restart(service)
 
-      puts '@obj.class: ' + @obj.class.inspect
+      return unless @obj.respond_to? :services
+
+      @obj.restart(service)
+      found = @obj.services.assoc(service)
+      make_class(*found, self) if found.any?
+    end
+
+    def method_missing(sym, *args)
 
       if args.last.is_a?(Hash) then
         @obj.send(sym, *args[0..-2], **args.last)
@@ -182,6 +182,29 @@ module OneDrb
 
     end
 
+    private
+
+    def make_class(name, methods, parent)
+
+      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
 
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onedrb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lK7OtCGPauDHVuIWDW0EnHb+MMBt6F5SqC+PSy9iOzs4zAWkJMFp86MOEK2yrfnO
   /ghrVtneK08DqmYOaive8I6P
   -----END CERTIFICATE-----
-date: 2022-04-23 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: app-mgr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Makes it convenient to make an object remotely accessible.