rsf_services 0.9.3 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86fb1a368503749f11101ebc687aaf588fd0af90ebf6687ca90f5a67f67036e5
-  data.tar.gz: 6abdb89a27223598d3c82e65b63d38c326de50503f83727d8dac29985df8c3c7
+  metadata.gz: 2f526110312deb79dfeec5348890b9062075de464c7eae75a3fddd4ca4fdfbb1
+  data.tar.gz: 45b4961f92c1891897511881fa21c5add3de8ef80f31f57514c56c0e3265a684
 SHA512:
-  metadata.gz: 8ab2aec2be43819469b9cacea29e19fa41218e61b571c325138e0c486dcf69f0c025c9daad929e8039678df1d61ccbb3a504d500f970821abbfcebfb404137f6
-  data.tar.gz: 191df149e75687e22308c912e2e9acc43d91bd00c998bba54edaad468dfc87e1c0b8c82620a12bb83a1d5c1ca60c70e3f8c35936ccb13d123dd2de0e18a9dace
+  metadata.gz: b03f92dd48e67fd465016fbd1c4e5ae10c518743eade8bd81bfa20615571f001d90f1cedab58424d96a30dc4372606d5dcbcd64303eea6915e31c26eb34d5124
+  data.tar.gz: 7d6bab11e70fceada0addf02c312c3afd8ce7c1b745af38429135568322e860c39ab96079cd577a2ad4d8a0dc22c67864fea5c3eda09fb0372a8bb439c4963ef

data/lib/rsf_services.rb

@@ -5,41 +5,52 @@
 #require 'rscript'
 require 'app-mgr'
 require 'dws-registry'
-
+require 'rxfreader'
 
 
 class RSFServices < RScriptRW
-  
+
   class PackageMethod
-    
-    def initialize(parent, type: :get)      
+
+    def initialize(parent, type: :get)
       @parent = parent
       @parent.type = type
     end
-    
+
     private
-    
+
     def method_missing(method_name, *args)
       Package.new @parent, method_name.to_s
-    end        
-    
-  end  
-  
-  
+    end
+
+  end
+
+
   class Package
-    
+
     def initialize(obj, package, debug: false)
 
+
+      puts 'inside Package#initialize' if debug
+
       @obj, @package, @debug = obj, package, debug
 
       @url = File.join(@obj.package_basepath, package + '.rsf')
-      doc = Rexle.new open(@url, 
-                           'UserAgent' => 'RSFServices::Package reader').read
+
+      puts 'before Rexle' if @debug
+      puts '@url: ' + @url.inspect if @debug
+
+      s, _ = RXFReader.read(@url)
+      puts 's: ' + s.inspect if @debug
+
+      doc = Rexle.new  s
+      puts 'before xpath' if @debug
+
       a = doc.root.xpath 'job/attribute::id'
-      
+
       a.each do |attr|
-        
-        method_name = attr.value.gsub('-','_') 
+
+        method_name = attr.value.gsub('-','_')
 
         define_singleton_method method_name.to_sym do |*args|
           run_job method_name, args
@@ -50,39 +61,39 @@ class RSFServices < RScriptRW
     end
 
     private
-    
+
     def run_job(method_name, *args)
-      
+
       puts 'inside Package::run_job: args: ' + args.inspect if @debug
-      
+
       args.flatten!(1)
       params = args.find {|x| x.is_a? Hash} ? args.pop : {}
       a = ['//job:' + method_name, @url, args].flatten(1)
-      
+
       if @debug then
         puts 'a: ' + a.inspect
         puts 'params: ' + params.inspect
       end
-      
+
       @obj.run a, params
     end
-    
 
-  end  
+
+  end
 
   attr_reader :services, :package_basepath, :registry
 
-  def initialize(reg=nil, package_basepath: '', log: nil, debug: false, 
+  def initialize(reg=nil, package_basepath: '', log: nil, debug: false,
                  app_rsf: nil)
-    
+
     @log, @debug = log, debug
-    
+
     puts 'inside RSF_services' if @debug
 
     super(log: log, debug: debug)
 
     @package_basepath, @services = package_basepath, {}
-    
+
     @initialized = {}
 
     if reg then
@@ -92,62 +103,63 @@ class RSFServices < RScriptRW
       else
         reg
       end
-      
+
       # load the system/startup RSF jobs
 
       startup = reg.get_key('system/startup')
-      
+
       jobs =  startup.xpath('*[load="1"]').inject({}) do |r, job|
         settings = reg.get_keys("system/packages/#{job.name}/*")\
                           .inject({}){|r,x| r.merge(x.name.to_sym => x.text) }
         r.merge(job.name => settings)
       end
-      
-      jobs.each do |package, settings| 
-        r = run_job(package.to_s, 'load', settings, 
+
+      jobs.each do |package, settings|
+        r = run_job(package.to_s, 'load', settings,
                                                 package_path: settings[:url])
       end
     end
-    
+
     @app = AppMgr.new(rsf: app_rsf, reg: reg, rsc: self) if app_rsf
 
   end
-  
-  
+
+
   def delete()
     PackageMethod.new self, type: :delete
-  end    
-  
+  end
+
   def get()
     PackageMethod.new self
-  end  
-  
+  end
+
   def put()
     PackageMethod.new self, type: :put
-  end  
-  
+  end
+
   def post()
     PackageMethod.new self, type: :post
   end
 
   def run_job(package, jobs, params={}, *qargs)
-    
+
     puts 'inside run_job' #if @debug
 
     package_path = "%s/%s.rsf" % [@package_basepath, package]
-                   
+
     if @log or @debug then
-      msg = 'RSFServices/run job: ' + 
+      msg = 'RSFServices/run job: ' +
           ("package: %s jobs: %s params: %s qargs: %s " + \
             " package_path: %s" % [package, jobs, params, qargs, package_path])
       @log.info msg if @log
       puts msg if @debug
     end
-    
-    yield(params) if block_given?    
-    
+
+    yield(params) if block_given?
+
     a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten(2)
-    
+    @log.info 'RSFServices/run job: a: ' + a.inspect if @log
+
     puts 'a: ' + a.inspect if @debug
 
     c, args, _ = read(a)
@@ -155,51 +167,53 @@ class RSFServices < RScriptRW
     rws, reg, app = self, @registry, @app
 
     begin
-      
+
       @log.info 'RSFServices/run job: code: ' + c if @log and c.is_a? String
 
-      # if there is a job id called *initialize* then execute if it hasn't 
+      # if there is a job id called *initialize* then execute if it hasn't
       # already been executed
 
-      if self.jobs(package_path).include? :initialize and 
+      if self.jobs(package_path).include? :initialize and
           !@initialized[package_path]  and jobs != 'initialize' then
         run_job(package, 'initialize')
         @initialized[package_path] = true
       end
 
-      r = eval c
+      r = instance_eval c
       puts 'r: ' + r.inspect if @debug
       #thread = Thread.new {Thread.current[:v] = eval c}
       #thread.join
-      #r = thread[:v] 
-      
+      #r = thread[:v]
+
       @log.info 'RSFServices/run job: result: ' + r if @log and r.is_a? String
-      
+
       return r
 
-    rescue Exception => e  
-      
+    rescue Exception => e
+
       params = {}
-      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")            
+      err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
       @log.debug 'RSFServices/run_job/error: ' + err_label if @log
 
     end
-  
+
   end
-  
+
   def package_methods(package)
-    
-    url = File.join(@package_basepath, package + '.rsf')    
-    doc = Rexle.new open(url, 'UserAgent' => 'ClientRscript').read    
+
+    url = File.join(@package_basepath, package + '.rsf')
+    doc = Rexle.new URI.open(url, 'UserAgent' => 'ClientRscript').read
     doc.root.xpath('job/attribute::id').map {|x| x.value.to_s.gsub('-','_') }
 
   end
-  
+
   private
-  
-  def method_missing2(method_name, *args)
+
+  def method_missing(method_name, *args)
+
+    puts 'inside method_missing' if @debug
     self.type = :get
     Package.new self, method_name.to_s, debug: @debug
-  end    
-  
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.6
 platform: ruby
 authors:
 - James Robertson
@@ -11,52 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjI4MTAzODExWhcN
-  MjEwNjI4MTAzODExWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDihlal
-  S7Ayw88OOfbgDNcfYFIBkwJsw1K7lnTkQ33d3CjfHjkHpwue+BPZrqNDDkzkq72C
-  GH24K4vhz9xeQ+sc+eAiSk0iARvNxFUXe/4JpZmo1A9u3fLCNbA7bL2IQIQqyBWY
-  /KgltVLGWau1X4rxuIS00TXrpUeG5pUeol/kUeDhmS8XmdU4rTbB62cz5RH/J2Zb
-  cDMx8jiap1BqyxU0qcJLoe0yJzwCNqrX3UmakhaFjv+5IHH0z+GP3evQ1Z/toY+G
-  MYrAFJ3cGjnk0s712KOa4W+tIW+q5FKjEwY5cGE/mbPh6cjZ+BYuYeSVqDrCY98d
-  a0I7JVRG6V/h+K8++OlSQ8dT4V0Yl7S6Nj21Yd9hmS/BXKbkq81J2zEF3mxHJZN7
-  AMKJE8m7jz+TLFX1f7+wIUrslfIJXqwXbThIGAqhFUb8+Ec0AuKs2F4lYNyS+TJP
-  8AjcZKx4u5J5q0bTSPCuS/inCrs3HoSvGPnhyJLUSHVlDr3vi3llx+AZW6kCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUWpAdER9r
-  XGcB19WXnvY8bjqVIFIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MTEyMDIxWhcN
+  MjIxMTE4MTEyMDIxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDK496w
+  8Wo4lOqJB1ND/vi4gyws3E8jHUqWt1YyV2YHL/+P2UUiili7z4qohHstpgBUUQtY
+  ve6g602bAmxayqqRYUTugyi/R6LRL5GSiKBFpfxWj5tUJh41frNoVjZk6AKoti4K
+  gU0ZdMhcz56zaDNQM/QDH8vaMrbs/+AcsTVKeZ+Sw930NI2QPuzyF3vgp1lGAqY8
+  j8BmT9mWzyXjjsrGV1hfzFYwoObk9SE6clyF5K6CrCsoqVzhwOhGvJShOr0kQWUo
+  x0MalRtTvMnUrtjveFmQTJhEGNjIkPiYsiSP+50otwlRqvUbY2NRkL9bq/YPQj9s
+  clxIRLdok0XE6Z6C83yHKbhSFp0WfygOM2oGFiVM1Fsaok6XKimTNj8Q5koS523a
+  pega/q9X9tHyPzeAMGTKymJteEcR7qdDYrXxOcHWVna68btSL5gaIlWCQPvyLZ+P
+  f7UVDsRCQttoB+arcmEy4JmiwHnG/6tWs+bfyhPf86uEErNBm24IkEgPLnMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUT1Vuql+w
+  8qUbu0Amwqd3msON9YswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAqfwg7zu3Btv6tGegDZ8tLTHf4WsswPXoOgh4iKyh
-  cFndGfA5c2cZEc9eTv9duBvTzmp4+uKhhCM4jkzBeRdrN+l9vnV4NZ2OjWiA9M3c
-  PpYG3LR4PaM9syzMLATGWctofw6EhsT7NbdSMBJ9nAuJbcFYXshWIJr11CgrSekM
-  66idwveobI9GeVzWHWI9KmnM6r7Th2dK4lS5y42y4pACzRSTacBVF2lylu2/X8oS
-  nzHN7yMdXRhdvboDI3Etq10pLs+e7cmB/6MkWV9Ba6kOMbJeeXokdjo6A03w/CXW
-  kSCp6ydjpEAtQhXpTOOWQfMXwafnNXvcVyh5mtQvSluCdVy0Qf5dHZuMaF+iIdtM
-  mS6T6oPPYAVaC+9DHMD5+hJRIo/U5sb+ZUQaHaME8XNCuHGxPbL2WmZr92iKZVCu
-  MxhWn7Vf3TxD/7nwBz7wR+H2ONNwWRWmRA7g+Os9YvLEB6LNsJfo+Tyer6bVsSBz
-  EOn2RvkdKH17/N7rqiDFRtI2
+  BgkqhkiG9w0BAQsFAAOCAYEAUQLpouWyYhkD5a18Z7qbypaOD3nnc4YXMdUdB9Qy
+  01NARPgklfbwJKImoq2VMT96JbBZX9nOdC2MAjo+0cK9duApEA6Sm+0n71Fub5Xn
+  9K43tJLAe3DPsW5CY4b/e1nxEiSQYntRF6tSQvjjpEHdSNyPYsvt7dN9ZwjaMo8U
+  8DeKxPlN+7fHcGZP3p4oYlRg0bRGwueO7aX8BYGzuOYrsmoq3swsE2/rz6zlC0DX
+  QyaSxFtZFOYYc4GrcixS2kX5i54MYZNpiRYMVJT3/ICbyIwtorKezJxkO7vKQiQj
+  OosD65e1Gn1rhQW6mAcblsvvMHvdfFA/uTvD77A8MgCYQa5llIZEx0Bd7ExPDPZn
+  e86Mje12aZQAyilVfeqbv5u3EZlw6kLbigLmw7BlUk7Zi2X84+iz7W8EdU3GSv8a
+  y347QSdvzPRHMpmi1wAJh+koAo4s8Noi64GU5+4xUDRUh02AV/sXFxRdJne2WDW0
+  4wvjYJ8JEXo2AHNQSXG3FQmn
   -----END CERTIFICATE-----
-date: 2020-06-28 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dws-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: app-mgr
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Runs within a DRb server to run RSF jobs, as well as other services.