onedrb 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e1dea351f77a02d587369c3d60ee375e608c1e10c42598012403c101c54cff6
-  data.tar.gz: 31e34ab07655ab42669955f8a02dcf68c0afa3989797e6b8cd6765f0b9bff61d
+  metadata.gz: 3829bafa21b51494d1bc147e668427dddc6998da520a60e14eefcd6b9c99c8e5
+  data.tar.gz: 26afcc85a10fb500e8f4e8d9c69ff2d1c23def83b0feed1b6279e7df958742f0
 SHA512:
-  metadata.gz: 2abc2da0df0795521dd76c3e610ccdfa7e6f7b3bbac546e4c167364e7b1797786749326b235bbe9487f54c19087ac2033cab8b89a287d6e4efe1093e74c6db8b
-  data.tar.gz: fc4a215efd2142d0852ef91b2f6fa8749599a20fe8cb923430c1e04aace1177139293613d7f3a4cfb5996d536800140d95ff77e5dc989a5156de1e5586e689d1
+  metadata.gz: 4d41f05105f22e8be82720dd89d0199c643ac76817ca04ae43c40132bb2d07004a9311be375bb296775834fb0e9591ce113d927fb410d1dab109601e076b73aa
+  data.tar.gz: 725672d9bf14d981f1df49be58699194bea4f722379d319a8bd84af5c89be26c8760c3c5e1d0990d6459cb29aa9462ee8b7d7974e816d936460b150ac2022eff

checksums.yaml.gz.sig

@@ -1,4 +1,4 @@
-��;���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
+k��r�
+�z:��!���+�z괆d�v%wF�l���%C�`�R
+�2kހ�dh�F�q+Tʟ���08�<(y/���JE7�bv�w�#�TrS�KUI;�9=F�I��q��@��Y����w{�zȇ��܃�?��U���=_t�>�[B��ҍ�K
��jX$2H�����-2��7�P���'%�,�a���J��S�I�
+���������Ƨ��1�U�q�1�>z&
��U��f�SX�Q���饊@r1ݩ�M�P���8�0\��D�GY�E��S>�

data/lib/onedrb.rb

@@ -6,10 +6,48 @@
 
 require 'drb'
 require 'c32'
+require 'app-mgr'
 
-# 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.
+# OneDrb recommended port: 57844 (as this port is recognised by the RSC gem)
+#
+class ServiceMgr < AppMgr
+
+  def initialize(rsf: nil, debug: false)
+    super(rsf: rsf, type: 'service', debug: debug)
+    @services = @app
+  end
+
+
+  def call(service, methodname, *a)
+
+    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
+
+
+  # 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|
+      next unless object[:running]
+      [key, object[:running].public_methods - Object.public_methods]
+    end.compact
+  end
+
+end
 
 
 class OneDrbError < Exception
@@ -22,7 +60,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: nil, log: nil)
 
       log.info self.class.to_s + '/initialize: active' if log
 
@@ -63,10 +101,18 @@ 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|
+
+        make_class(name, methods, parent)
+
+      end
 
     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)
@@ -87,9 +133,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
 
@@ -97,6 +158,15 @@ module OneDrb
       @obj
     end
 
+    def restart(service)
+
+      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
@@ -107,6 +177,27 @@ 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

data.tar.gz.sig

@@ -1,2 +1,4 @@
-��y��JEZ��k��A�x8f~���3W�Q��ݦ`o���K={
-�NŽAс��WǵD�h4‰2�1���߂>b�N�f�dA"_�IS����x��s����ZP0��fL�sU�
+ ��ʟ�r՛�{Xұd����wU�"%qC+S��sߊ>~�Ҕ�gOF�Ұ��
!�Qُ�NW�dǨx�m���މ���*~辱
+�\n&rF?a+?�4�M
C�@�UrŞ=w7	>z��Y~bȝS�R)d0�=��CP�@�E
+@�R�DB�(N�R�Ɍ�܃�r��`�:���x���Z*�x5�P�i��	
R�r6�
+������[�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onedrb
 version: !ruby/object:Gem::Version
-  version: 0.2.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-22 00:00:00.000000000 Z
+date: 2022-04-25 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: []

metadata.gz.sig

@@ -1,3 +1,4 @@
-��:r�\�y���}�h�r^4����i�Z�=�%�G�1��Dy�JI�`۲	�|��Ǔ��@��F�Su����7mԝ�_}����Q���BZ2��T�	L�;����5l��� php�ڱ���t��ҹ���])F�.VB�?=}��\� #��F)�}M
-��p��A��B5�[R(�?�g���
-��X�� �N��Q~���	�ն�_��/d����Kτh�-��2�#50xBY�<��\�X$�V(�\A!B&�ڇ�.�@�*$Z��aX��쑣�n��H�Z����EA�I����N�lDg���3�X�/���(��� ��ԩ������ƭ�[w]�0p�D���t��2c���}W��Į�R�
+����6��
+��'d~��
+ɍP�X��"�u*B�Tm��SY�kHU�5���aNU�T���
+�G'z�Q�U8~ĥ�an�!KaWكO�Mɽ[���^��������"<<�i62<aŷ��,��h����8�+x��E�6�wW;[:mUdp�Qk:'jB��=�ZWo�l'A�B�&��dGy��&