xmlregistry_objects 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 072ddcd0246069df86016af7acefaec428107203
-  data.tar.gz: e5cebcba71bf5f6c07b5111a1143c4aafe6c44fd
+SHA256:
+  metadata.gz: cc95b8fd15a36a13fc93bd48f1bc0840cfadd1ff5cc9f0735e6bd65b2bc94ec6
+  data.tar.gz: 2bffbe5094f477efaf7a67eb734ad16f9a46314eeac3b3c85ac63a98e95dc8d4
 SHA512:
-  metadata.gz: 1fbee0b507d20e398ff9482cd593334db409fee3212ef367fc00cd752d2b9f9db4e1aa26e052d5897f8d57c6f8d9df7db6aee6cfc968423164104bf0b081efea
-  data.tar.gz: ae119c0d58ab1c45f9504357587d4f0e17652d0dbbf20244472f55ba92ffd03029ee978bf02ff85992530aa7a223577a39c618a43cc03014b63fb1139ab5f0cc
+  metadata.gz: 546866da99885b618030623ea8c5069cdabc2a24fd2ab5fd549eabbbd34d4a53b6898df666991cfe2f43247b1646e44ae3248d105cd2575d091f36cde623b2af
+  data.tar.gz: 0a9206005c018a091301ddfc90b72a0ddd842c3e0e8ab9b29df632594a531d7203d53449e14d65d951d8a59333a062c80ab3fa52d7f95dba47e7d9779b97becb

data/lib/xmlregistry_objects.rb

@@ -5,30 +5,36 @@
 
 require 'polyrex'
 require 'dws-registry'
+require 'rxfreader'
 
 
 class XMLRegistryObjects
 
   attr_reader :to_h
 
-  def initialize(reg, obj)
-    
-    polyrexdoc = if obj.is_a? Polyrex then 
-    
+  def initialize(reg, obj, log: nil)
+
+    @log = log
+    log.info 'XMLRegistryObjects/initialize: active' if log
+
+    polyrexdoc = if obj.is_a? Polyrex then
+
       obj
-    
+
     elsif obj.is_a? String then
-      
-      buffer, type = RXFHelper.read obj
+
+      buffer, type = RXFReader.read obj
 
       if type == :url then
         Polyrex.new buffer
       else
-        Polyrex.new.import "<?polyrex schema='entries/object[name, regkey]/"\
+        Polyrex.new.import "<?polyrex schema='entries/objectx[name, regkey]/"\
             "methodx[name,subkeyname]' delimiter=' = '?>\n" + obj
       end
     end
-        
+
+    log.info 'XMLRegistryObjects/initialize: before @to_h' if log
+
     @to_h = polyrexdoc.records.inject({}) do |rtn, row|
 
       name, path = row.name, row.regkey[1..-2]
@@ -39,23 +45,23 @@ class XMLRegistryObjects
         def initialize(reg)
           @reg = reg
         end
-        
+
         def last_modified()
           lm = @reg.get_key('#{path}').attributes[:last_modified]
           Time.parse(lm) if lm
         end
-        
-        def set(h)          
-          
+
+        def set(h)
+
           h.each {|key,value| self.method((key.to_s + '=').to_sym).call value }
-          
+
         end
       "
 
       s = if row.records.any? then
 
         row.records.inject(base_methods) do |r, attr|
-          
+
           attr_name, subkey = attr.name, attr.subkeyname[/\w+$/]
           key = path + '/' + subkey
 
@@ -67,56 +73,60 @@ class XMLRegistryObjects
       else
 
         a = reg.xpath("#{path}/*")
-        
-        a.inject(base_methods) do |r, x| 
+
+        a.inject(base_methods) do |r, x|
 
           methods_name = subkey = x.name
 
-          type = x.attributes[:type]          
+          type = x.attributes[:type]
           key = path + '/' + subkey
-          
-          r << make_setdef(key, method_name=subkey)          
 
-          method_name += '?' if type and type == 'boolean'          
+          r << make_setdef(key, method_name=subkey)
+
+          method_name += '?' if type and type == 'boolean'
           r << make_def(key, method_name)
 
         end
       end
 
+      log.info 'XMLRegistryObjects/initialize: before class_eval ' + klass.to_s if log
+
       klass.class_eval s
       rtn.merge name.to_sym => klass.new(reg)
 
     end
+
+    log.info 'XMLRegistryObjects/initialize: completed' if log
   end
-  
+
   def define_methods()
     @to_h.each.map {|k,v| "define_method :#{k.to_s}, ->{h[:#{k}]}"}.join("\n")
   end
-  
-  # to use this method the client is expect to  fetch the 
-  # hash object from the registry object e.g. 
+
+  # to use this method the client is expect to  fetch the
+  # hash object from the registry object e.g.
   #    xro = XMLRegistryObjects.new(reg,list)
   #    @h = xro.to_h
-  
+
   def define_methods2(obj=nil)
-    
+
     a = @to_h.each.map {|k,v| [k.to_s.to_sym, ->{@h[k.to_sym]} ] }
-    
+
     if obj then
-      
+
       a.each {|name, blk| obj.class.send(:define_method, name, blk) }
-      
+
     else
-      
+
       return a
-      
+
     end
-    
-  end  
+
+  end
 
   private
 
-  def make_def(key, method_name)    
+  def make_def(key, method_name)
 <<-EOF
 def #{method_name}()
   @reg.get_key('#{key}', auto_detect_type: true)
@@ -124,9 +134,9 @@ end
 
 EOF
   end
-  
-  def make_setdef(key, method_name)    
+
+  def make_setdef(key, method_name)
     "def #{method_name}=(v)   @reg.set_key '#{key}', v  end\n"
-  end  
+  end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlregistry_objects
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTExODE5MzE1OVoXDTE3MTExODE5MzE1OVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAO2W2oOYkPg8aof3ySqVkhUzbWkC8l/McDVQZBVR+6GX81K7a9otOP/wndHT
-  Oq0YouVAFH8HEF1zvY9xwuxXSMJRhRZegizYm3WTePIxpNSs4FGIiG5+vlSCCPd1
-  HQeWB4+m2liPy2XNyKjcacOPyDhzSNPm/OoiSpNHrOh/CUnLDfS6hnG7Pp8uN/FG
-  0oYaMLLnM+XoGhOeuXA191EoFw2XqQLPQ3twrDjYsjtpO5muh/Qgq+oVRLs5KyfN
-  AQfWOs+WrmsSaKVuqKDeq0ej9mWTif6MHt0SjsZepvxuSdbGAAx2V8Enxpr/xeGT
-  NmGfQJ+OyIYBwW9+ry0jm7HvSrECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU+JjBp7btYgKRRbcC0kgjjXOq9t4wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEANXzdxcac
-  9+ro5EDNoip8Tt5/gfXQLeitx9AJKBk049CXj7aUVQo/kvC0uG98txkMXXTYsbvp
-  nyc1i3EsQ1+qLvTeloWcNirSvqBhGp+ELJ5/TCiHPUjyQw3imIaaSbKU7cAfvXVm
-  xY2RYI59JSE5T7KJpd2uIyOZAcOmQmYOwSxyLl2BWtsU2u6v/hFXGfMQYggaskz2
-  b5n5Zg3VSfTc3BCXN2xUTpIFlo280xVt2nNvGvjcQQqjzjwXa/RvZKiCOZlJNjSo
-  IkDYjSdYbCCIK75kuYlhmDctvkgCn+0ctaLyR/UzsKKMBw6vdLU9+jMjzJTBozL8
-  nkAagQBjWS249A==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIyMjAzMzQwWhcN
+  MjMwMjIyMjAzMzQwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDjoLXS
+  JY+GeI0u2RX39kso2JcNAsJ6/nlvNKRbADfUhw/J67b65yUVFYyUx/5bp3hf+Mc9
+  ZewemRjK8SouGnUNgToIjCklCpfR5CV/jj0ELMQ3MwiZWjnkEVouAGFxDuR5L7z6
+  ayd8gbpMx6XVdWCFLqwU0f94VHVU5i+ZAfaKmmcTC4rx3DN9Q4e85eUFuOLb9IaY
+  OzdXF162GC1TJ+CQz9rwa6RAWpMvAQOOS/0H/rgYcSvsnAkgGIq/lxdfTAVJ61Q/
+  xgKFbX75D4d2tyhlzXC2HpFmWJ/f630zh0r1rpIT/K2WY0jPV9cpsIYSFQrA6Wlp
+  pDcEPw6lryGXnluUmnmw+5sZ+6v9XedHI3OAoc1ZbNzAhu1zbm5j+D9De94bk3TM
+  p5fHGG49DG553os4sJImBazjKUbM6rwNUH1g3hNWvtHyP5q8I5hSH7F/9DCODwfQ
+  eil4CMfmalAZxnXhNd/R9IuS+Ry9uFPfnWQb7IZC5GlEQgSURY7vikaTNVECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYfu9sis1
+  o3vFFRPkh/7sVOBNwI8wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAZNqTY2Edz/epqyDfis6xaOYVQtYEtzRD3v2pRPBx
+  5y9MxMsbvDjZc/oMIg33p2Vl8g6++FblRMUpV73q76pMwmojAEQMek6cCpEFFEpk
+  ZLL2RX/zW4U4DS+NdC3lMCTIg9x2MeAiqpzbacMOztiZNvsoLBMBgNxhhN2CEJvd
+  TjtB0ua2T8QB1pLdi7YuhxSkIRqXFSvhvB+kkQrgj918kLhyVM2fG1bFhG7neTSe
+  HfpFDgLOjZODHv/XMDI3YtyOLvFmUcQZnGwLAlpDT/GoEF71Mt3Ncnt9Z2Qt5gkr
+  p0+dnQ2LSGJRkn/RkGz3HM7aJcEV/nZO5b/7h61JbQ6Sg9p6Ailmub27VF6YUsO5
+  fAZEEr9vu8+K5z8LD0W7sdGbUMiz6qLKYzL5A1ERYZBqlY7J6Bo0alRRclzDpcJV
+  xxskbsrcVBnIBOJst+8ciwIklNVWeyO9DgHgc7XczsjNVAwtBywJ2OqePLHwzypv
+  j1b+b2ovUi70hCFO+BJGE3t0
   -----END CERTIFICATE-----
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dws-registry
@@ -39,42 +43,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: polyrex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.4.0
 description: 
-email: james@r0bertson.co.uk
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Query the registry using objects built dynamically from a string which maps