rsc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bb396af79207dc02df1dba6d3db3c8f1cd677d
-  data.tar.gz: 3e7bb33b85c71d06c43410480544178aac3151d7
+  metadata.gz: 5515efb4f9945805779a857ce5a1798fe3a52369
+  data.tar.gz: e15a3ef37d4604123de84d78990a1c39a0273a44
 SHA512:
-  metadata.gz: 9731c275bf0348bea2f1bb3efe111abd3d7edb9a97bd209f87e0217f4618781186edde4101b04ac1a7f58ede90675c187182ff021bf31b9b9ef8186e868882ac
-  data.tar.gz: 7b93d9ba504d31a8477f772f910bbab7fb734bea2d6e6e2effe997d6ab38ce34a24ebdea46f010eafd31aaa9e1b96667e33a356cba73ac8e554c558af48897fa
+  metadata.gz: d77eac9bee1bde92f22a414abe010a135b2ccef32b7481266a71181300f1adb5d51ae9cbca2b344a09368a8dc5eb5b0d78cbae1204877c7e06d7340cff2857c4
+  data.tar.gz: d8292c1e7e2a6b949e716812a2968a090d5b783e67942ba20d1a96fd562c36781488c30cc578c22766c320b98f8b294c5d50013a69e426bd3c85df5602c74fee

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-�^a�Ӵ~���la�>�c�D���~�-��$vݨA/����D���X�D�
���9���?�v�L��������rh`��1���d�m���\��`6��ެSrN>�|�7H����d~�@�)gП�����񳦡|<~T2�e۫��/���-z|�<��<����6Z��K�Ԑ�
Ɍ���W�?ٖ$��@fkK�"��O'��iw����/:0��"���� �fB�+��c,��<${0������bpL]��
+�Ֆ7��!��o��Q3�Z��tR
)Q�B�z�+�1?�@��o
+>!�vw�5fC���A;��$a�b�
+�.�5`�\
��Z6းU��I�f��y
��͠�?�(�������y�&�.4�7�Y��h��Aq��B})�%Zq!�]�H���x�W�W䢡���!�/L��Q�]Jı�ސ���I�ELB�<@I"5F<C�W��7�

data/lib/rsc.rb

@@ -40,37 +40,91 @@ class RSC
 
   end
 
-  def initialize(drb_hostname='rse', parent_url)
+  def initialize(drb_hostname='rse', parent_url=nil, port: '61000')
+    
+    @port = port
+    
+    if parent_url then
+      @parent_url = parent_url
+      drb_start(drb_hostname)
+    end
     
-    @parent_url = parent_url
-    DRb.start_service
-    @obj = DRbObject.new(nil, "druby://#{drb_hostname}:61000")
   end
 
   def delete()
-    @obj.delete
-  end  
+    s ? run_uri(s, :delete) :  @obj.delete
+  end
   
-  def get()
-    @obj.get
+  def get(s=nil)
+    s ? run_uri(s, :get) :  @obj.get
   end
-
-  def put()
-    @obj.put
-  end  
   
-  def post()
-    @obj.post
+  def post(s=nil)
+    s ? run_uri(s, :post) :  @obj.post
+  end
+
+  def put(s)
+    s ? run_uri(s, :put) :  @obj.put
   end
   
+  
   def run_job(package, job, params={}, *qargs, package_path: nil)
     @obj.run_job(package, job, params, qargs, package_path)
   end
 
   private
   
+  def drb_start(host)
+    DRb.start_service
+    @obj = DRbObject.new(nil, "druby://#{host}:#{@port}")    
+  end
+  
   def method_missing(method_name, *args)
     Package.new @obj, @parent_url, method_name.to_s
   end
   
+  def parse_uri(s)
+    
+    protocol, _, host, package, raw_job, remaining = s.split('/',6)
+    
+    if remaining then
+      
+      job = raw_job
+      # split on the 1st question mark
+      raw_args, raw_params = if remaining =~ /\?/ then
+        remaining.split('?',2)
+      else
+        remaining
+      end
+      
+    elsif raw_job =~ /\?/
+      job, raw_params = raw_job.split('?',2)
+    else
+      job = raw_job
+    end
+    
+    if raw_args or raw_params then
+      args = raw_args.split('/') if raw_args
+      
+      if raw_params then
+        params = raw_params.split('&').inject({}) do |r,x| 
+          k, v = x.split('=')
+          v ? r.merge(k[/\w+$/].to_sym => URI.unescape(v)) : r
+        end          
+      end
+
+    end    
+    
+    [host, package, job, args, params]
+  end
+  
+  def run_uri(s, type=:get)
+    
+    host, package, job, args, params = parse_uri(s)
+    drb_start host
+    @obj.type = type
+    
+    @obj.run_job(package, job, params, args)  
+    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson