rsf_services 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7428288bc852d1cde1da829f034930c961059f1a
-  data.tar.gz: 84c065cc30157c9d8d1465852220ef9e3aedf81e
+  metadata.gz: 7d0d5369a400361bf794ecf66ae4d4719d1ac7bb
+  data.tar.gz: b1b14f653ffaf27d296aa07a22f087297edf2a64
 SHA512:
-  metadata.gz: 73e69b2c2516e87eca8d30ee79d7793245fde81289f4ec7ef0a9d7e62b44a747b48a99378c7698a0259f4960430dc9cac20cbc26c6359c08a14a27abf291acbf
-  data.tar.gz: 1ff1a463115cb3c321e75ad0c5c47c63267322f150661e3bc3695c5b114363d42e6110d283dc111dde46ecfde135de711cd8496a78be900e0448944f6c334891
+  metadata.gz: 4d3b34674deb57349f6c44b067f4e6aea75c79e999ce765d53493517c6693521f3f242af78f0a5195723ca41574e73475e14cad68faad4208ff397d061e03875
+  data.tar.gz: 0343b8e4eaa0b7dc560ee71b2ff0c30e997a840c34545d74b5a8f9b5976f76feb75f3afc7c5aa629d24a1651afce5dbe1a10f3fe871926de61954488fadb4b6f

data/lib/rsf_services.rb

@@ -8,7 +8,13 @@ require 'dws-registry'
 
 class RScriptRW < RScript
   
-  def read(args=[], type: :get)
+  attr_accessor :type
+  
+  def initialize(log: log)
+    super(log: log)
+  end
+  
+  def read(args=[])
     
     @log.info 'RScript/read: args: '  + args.inspect if @log
     
@@ -20,7 +26,7 @@ class RScriptRW < RScript
       
       args.each_index do |i| 
         if args[i].to_s[/\/\/job:/] then          
-          ajob << "@id='#{$'}' and @type='#{type.to_s}'"; args[i] = nil
+          ajob << "@id='#{$'}' and @type='#{self.type.to_s}'"; args[i] = nil
         end
       end
 
@@ -45,7 +51,8 @@ class RScriptRW < RScript
       out
       
     else    
-      out = read_rsf(args) {|doc| doc.root.xpath('//script').map {|s| read_script(s)}}.join("\n")   
+      out = read_rsf(args) {|doc| doc.root.xpath('//script')\
+                            .map {|s| read_script(s)}}.join("\n") 
     end    
           
     @log.info 'RScript/read: code: '  + out.inspect if @log
@@ -58,6 +65,22 @@ end
 
 class RSFServices < RScriptRW
   
+  class PackageMethod
+    
+    def initialize(parent, package_basepath, type: :get)      
+      @parent, @package_basepath, @type = parent, package_basepath, type
+      @parent.type = type
+    end
+    
+    private
+    
+    def method_missing(method_name, *args)
+      Package.new @parent, @package_basepath, method_name.to_s
+    end        
+    
+  end  
+  
+  
   class Package
     
     def initialize(obj, parent_url, package)
@@ -80,7 +103,7 @@ class RSFServices < RScriptRW
 
     private
     
-    def run_job(method_name, *args, type: :get)
+    def run_job(method_name, *args)
       
       args.flatten!(1)
       params = args.pop if args.find {|x| x.is_a? Hash}
@@ -127,6 +150,14 @@ class RSFServices < RScriptRW
     end
 
   end
+  
+  def get()
+    PackageMethod.new self, @package_basepath, type: :get
+  end  
+  
+  def post()
+    PackageMethod.new self, @package_basepath, type: :post
+  end
 
   def run_job(package, jobs, params={}, *qargs, 
                   package_path: ("%s/%s.rsf" % [@package_basepath, package]))
@@ -168,6 +199,7 @@ class RSFServices < RScriptRW
   private
   
   def method_missing(method_name, *args)
+    self.type = :get
     Package.new self, @package_basepath, method_name.to_s
   end    
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fMXSqexhUAZIyk80TuvEsqUgRCN81F92e6Yq47RQ0oKhCG9Xor/NhJodXh91NhRW
   zAgihHevT4OTsg==
   -----END CERTIFICATE-----
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript