rsf_services 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86c7559b8e69b8266787d83bd0378ab7e198c1e0
-  data.tar.gz: 22c70de4cbd32a0278bb3bfda4208a56ae8e6d1c
+  metadata.gz: 7428288bc852d1cde1da829f034930c961059f1a
+  data.tar.gz: 84c065cc30157c9d8d1465852220ef9e3aedf81e
 SHA512:
-  metadata.gz: 9654023482d63cb27d8e97c2ee6059a84b80dcec523da5ebadf5223df696ef90355e8798cd7e88a7e4c575cbfffa48439f060f179672377b854e7c20383a8201
-  data.tar.gz: 5fc026b0d893139ca3b36e57f0f35fe1a0ac03681cf290cd3f706526bbe9d52ed54c49ebc33246ca5e8459cf748d06f51bf905173ced3332ddb03a4211edfadf
+  metadata.gz: 73e69b2c2516e87eca8d30ee79d7793245fde81289f4ec7ef0a9d7e62b44a747b48a99378c7698a0259f4960430dc9cac20cbc26c6359c08a14a27abf291acbf
+  data.tar.gz: 1ff1a463115cb3c321e75ad0c5c47c63267322f150661e3bc3695c5b114363d42e6110d283dc111dde46ecfde135de711cd8496a78be900e0448944f6c334891

data/lib/rsf_services.rb

@@ -6,7 +6,57 @@ require 'rscript'
 require 'dws-registry'
 
 
-class RSFServices < RScript  
+class RScriptRW < RScript
+  
+  def read(args=[], type: :get)
+    
+    @log.info 'RScript/read: args: '  + args.inspect if @log
+    
+    threads = []
+    
+    if args.to_s[/\/\/job:/] then 
+
+      ajob = []
+      
+      args.each_index do |i| 
+        if args[i].to_s[/\/\/job:/] then          
+          ajob << "@id='#{$'}' and @type='#{type.to_s}'"; args[i] = nil
+        end
+      end
+
+      args.compact!
+
+      out = read_rsf(args) do |doc|
+        
+        doc.root.xpath('//job').each do |x| 
+          x.attributes[:type] = type.to_s unless x.attributes[:type]
+        end
+        
+        if @log then
+          @log.info 'RScriptRW/read: code: '  + doc.xml.inspect         
+        end
+        
+        doc.root.xpath("//job[#{ajob.join(' or ')}]").map do |job|
+          job.xpath('script').map {|s| read_script(s)}.join("\n")
+        end.join("\n")        
+      end
+
+      raise "job not found" unless out.length > 0
+      out
+      
+    else    
+      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
+
+    [out, args]    
+    
+  end
+  
+end
+
+class RSFServices < RScriptRW
   
   class Package
     
@@ -30,7 +80,7 @@ class RSFServices < RScript
 
     private
     
-    def run_job(method_name, *args)
+    def run_job(method_name, *args, type: :get)
       
       args.flatten!(1)
       params = args.pop if args.find {|x| x.is_a? Hash}
@@ -121,4 +171,4 @@ class RSFServices < RScript
     Package.new self, @package_basepath, method_name.to_s
   end    
   
-end
+end

metadata

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