onedrb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1dea351f77a02d587369c3d60ee375e608c1e10c42598012403c101c54cff6
-  data.tar.gz: 31e34ab07655ab42669955f8a02dcf68c0afa3989797e6b8cd6765f0b9bff61d
+  metadata.gz: 1715575559f96238261a54678e475a056223491a3ff7c610a5df823001fe454c
+  data.tar.gz: 66acb7de842732715d02c287c753d1221d2963631b6bc2edd3ca842eecd88665
 SHA512:
-  metadata.gz: 2abc2da0df0795521dd76c3e610ccdfa7e6f7b3bbac546e4c167364e7b1797786749326b235bbe9487f54c19087ac2033cab8b89a287d6e4efe1093e74c6db8b
-  data.tar.gz: fc4a215efd2142d0852ef91b2f6fa8749599a20fe8cb923430c1e04aace1177139293613d7f3a4cfb5996d536800140d95ff77e5dc989a5156de1e5586e689d1
+  metadata.gz: befc1ab68c1a9ede94f24415faeeb3fbbfcfc044edd3e73cdda361f3fa8cf77d309158804aecc5c2b1f995ee81b7bd382dbe359f798c24bfa222f9422479cff3
+  data.tar.gz: a83d5eb21b2270e5e51c1c8918fffe1b510c43237076f137dbe8d788a5e6394f964bbd10db08d3be4abde3f8e0551766b280c3ba27e6cb94b03fcb579cb03723

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-��;���a�d��2̀���Z5$�G-w��'�Y��w��L�����6��uue�`P|�!8���w'�@�^��R.�׶���Zd�{PG}�>ը-�W��;�ќ���v�x׽��1�X9R�ӱ?�*��VT4s��]�𰣇1�A�s�[K䄔���7+��8Ǝ
-�Xx��S1�@�R�f�
-Fg�P�u���{K��L$b�Ie����B���KA\���U��'���;#_;5�k��L�kk�%��
-X�?�_BtR����\\�P)����B�nR�7��캥:�X��.���Oy��&6}c�0��B�]c���[0�TM��)u�E.W��{�ٳs�ZUE!��9ѻ�OE�u�	��c����+�NƼ)vS�xU���&d
+�y��I�G<��V�%Ӫ�w�E�������
��QԬ}�M�ܔC,���5j&�Nkv>$����o���!���J���B�w�`�J��`��Q�U�0/u��"^��b�4J�b��^�:�zA���O��h�X��K.�N��+�s^��Β-�x���F�|Ҽi��>A%����9Q�,�-�|sa7wqՓU'����4:Q��%FF�2��P%��NIMh	�x\�[��a[]r\ލȲ��P�9)��&����>ټp��9�fv���d=��ҲV"�
+?���n,���

data/lib/onedrb.rb

@@ -7,9 +7,48 @@
 require 'drb'
 require 'c32'
 
-# Note: The Server object can also use a default Hash object.
-#       Which allows the Client object to define what user-defined objects the server
-#       should host dynamically.
+# 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
@@ -22,7 +61,7 @@ module OneDrb
     using ColouredText
 
     def initialize(host: '127.0.0.1', port: (49152..65535).to_a.sample.to_s,
-                    obj: Hash.new, log: nil)
+                    obj: ServiceMgr.new, log: nil)
 
       log.info self.class.to_s + '/initialize: active' if log
 
@@ -63,6 +102,25 @@ 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)
+
+        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
 
@@ -87,9 +145,24 @@ module OneDrb
       a = a1.map(&:last)
 
       client = OneDrb::Client.new host: hostname, port: port
-      proc1 = client[service].method(methodname.to_sym)
 
-      h.any? ? proc1.call(*a, **h) : proc1.call(*a)
+      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
 
@@ -99,6 +172,8 @@ module OneDrb
 
     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

metadata

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