xml-registry 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 280ac5c817560aa72e83c93eabf4358d1a169781717442b7b4e2c7ee95ca1ec0
-  data.tar.gz: 0a8a32baea55901636b3a28ef6b585393883f4717107b17af84a46365a0c8658
+  metadata.gz: 17d687a31b3101edd8cb0f580e2e2d186223312ffe3ad3f983ebf6a6c3f4ad2c
+  data.tar.gz: cead0b3b39344282cccd54c70c3e747141359eede388f484a9b4488d298be088
 SHA512:
-  metadata.gz: af319f07195089806be005eb10b42267e359a65c6f668ccda8ba618b3b36019c433abede751bf10e5d7dadfdb1c3719309538db765bb56c1e7933fc528f42a56
-  data.tar.gz: a5bddd352a8865dc253cda635dde28a6ba8b66c1ad094c9b2cf5368bb1e74b32164cc8c7e2e9240be7e4e9f25d047a5ffcf1d1ed395ba748dbdf2498a376aca2
+  metadata.gz: a0d742f5b7e4f5f346bc5e30c3398954f702e940da670488d23dcb4512226706d6e662c45736a55908e888f2c11ff99a3d9241ff15b9070bd10ffe9e1f8aee6e
+  data.tar.gz: d25d7ec9f895d5fe89524fa3f0cf4556c1ca4d9b1106e3a886fad1f8fba36b57d4b3c9e22eb9231f7a1292acd5243ca5468285e8bb9a514a8d526a221622ca8b

data/lib/xml-registry.rb

@@ -10,13 +10,13 @@ require 'rxfreadwrite'
 
 
 module NumberCheck
-
+  
   refine String do
-
+    
     def is_number?
       self.to_i.to_s == self
     end
-
+    
   end
 end
 
@@ -25,9 +25,9 @@ class XMLRegistry
   include RXFReadWriteModule
 
   attr_reader :doc
-
+  
   def initialize(template = '<root></root>', debug: false)
-
+    
     @debug = debug
     super()
     @template, _ = RXFReader.read(template)
@@ -52,21 +52,21 @@ class XMLRegistry
     # if the 1st element doesn't exist create it
     e = path.split('/',2).first
     @doc.root.add_element Rexle::Element.new(e) unless @doc.root.element e
-    create_path = find_path(path)
+    create_path = find_path(path)  
 
     if not create_path.empty? then
       parent_path = (path.split('/') - create_path.reverse).join('/')
       key_builder(parent_path, create_path)
     end
-
-    add_value(path, value)
+    
+    add_value(path, value)  
   end
 
   def []=(path, val)
     s = path.split('/').map {|x| x[0].is_number? ? x.prepend('x') : x}.join '/'
     self.set_key(s, val)
   end
-
+  
   # get the key value by passing the path
   # example: get_key('app/gtd/funday').value #=> 'friday'
   #
@@ -75,14 +75,15 @@ class XMLRegistry
   def get_key(path)
 
     key = @doc.root.element path
-    raise ("xml-registry: key %s not found" % path) unless key
-
-    key.instance_eval {
-      @path = path
+    #raise ("xml-registry: key %s not found" % path) unless key
+    return nil unless key
+    
+    key.instance_eval { 
+      @path = path 
 
       def to_h(e)
 
-        v = if e.has_elements? then
+        v = if e.has_elements? then 
           e.elements.inject({}) do |r, x|
             r.merge to_h(x)
           end
@@ -91,24 +92,24 @@ class XMLRegistry
         end
 
         {e.name => v}
-      end
-
-      def to_config()
+      end    
+    
+      def to_config()                    
         SimpleConfig.new(to_h(self), attributes: {key: @path})
-      end
-
-      def to_kvx()
+      end    
+    
+      def to_kvx()                    
         Kvx.new(to_h(self), attributes: {key: @path})
-      end
-
+      end        
+    
       def to_os()
         OpenStruct.new(to_h(self).first.last)
       end
     }
-
+    
     key
   end
-
+  
   # get several keys using a Rexle XPath
   # example: get_keys('//funday') #=> [<funday>tuesday</funday>,<funday>friday</funday>]
   #
@@ -116,7 +117,7 @@ class XMLRegistry
   #
   def get_keys(path)
     @doc.root.xpath(path)
-  end
+  end        
 
   def [](path)
     s = path.split('/').map {|x| x.is_number? ? x.prepend('x') : x}.join '/'
@@ -128,7 +129,7 @@ class XMLRegistry
   #
   #
   def delete_key(path)
-    @doc.root.delete path
+    @doc.root.delete path    
   end
 
   # return the registry as an XML document
@@ -139,14 +140,14 @@ class XMLRegistry
   end
 
   alias :display_xml :to_xml
-
+  
   def xml(options={})
     @doc.root.xml options
-  end
+  end  
 
   # load a new registry xml document replacing the existing registry
   #
-  def load_xml(s='')
+  def load_xml(s='')      
     @doc = Rexle.new(RXFReader.read(s)[0].force_encoding("UTF-8"))
     self
   end
@@ -171,40 +172,40 @@ class XMLRegistry
 #"pin-no"="4321"
 #REG
 #
-#reg = XMLRegistry.new
-#reg.import s
+#reg = XMLRegistry.new 
+#reg.import s 
   #
-  def import(s)
-
+  def import(s)      
+    
     r = RXFReader.read(s)
     reg_buffer = r.first
     raise "read file error" unless reg_buffer
 
     if  reg_buffer.strip[/^\[/] then
 
-      reg_items = reg_buffer.gsub(/\n/,'').split(/(?=\[.[^\]]+\])/).map do |x|
+      reg_items = reg_buffer.gsub(/\n/,'').split(/(?=\[.[^\]]+\])/).map do |x| 
         [x[/^\[(.[^\]]+)\]/,1], Hash[*($').scan(/"([^"]+)"="(.[^"]*)"/).flatten]]
       end
-
-    elsif reg_buffer.strip.lines.grep(/^\s+\w/).any?
+      
+    elsif reg_buffer.strip.lines.grep(/^\s+\w/).any? 
 
       puts 'hierachical import' if @debug
       doc = LineTree.new(reg_buffer).to_doc
-
+      
       reg_items = []
-
+      
       doc.root.each_recursive do |e|
-
+        
         puts 'e: ' + e.inspect if @debug
         if e.is_a?(Rexle::Element) and e.children.length < 2 then
-
+          
           reg_items << [e.backtrack.to_xpath.sub(/^root\//,'')\
                         .sub(/\/[^\/]+$/,''), {e.name => e.text }]
-
+          
         end
-
-      end
-
+          
+      end      
+      
     else
 
       reg_items = reg_buffer.split(/(?=^[^:]+$)/).map do |raw_section|
@@ -214,21 +215,21 @@ class XMLRegistry
         path = lines.shift.rstrip
         [path, Hash[lines.map{|x| x.split(':',2).map(&:strip)}]]
       end
-
+      
       reg_items.compact!
-
+      
     end
 
     puts 'reg_items: ' + reg_items.inspect if @debug
     reg_items.each do |path, items|
       items.each {|k,value| self.set_key("%s/%s" % [path,k], value)}
     end
-
+    
     :import
   end
 
-  # Export the registry to file if the filepath is specified. Regardless,
-  # the registry will be returned as a string in the registry
+  # Export the registry to file if the filepath is specified. Regardless, 
+  # the registry will be returned as a string in the registry 
   # export format.
   #
   def export(s=nil)
@@ -270,21 +271,21 @@ class XMLRegistry
 
   def print_scan(node, parent=[])
     out = []
-    parent << node.name
+    parent << node.name 
     items = []
 
     node.elements.each do |e|
       if e.has_elements? then
-        out << print_scan(e, parent.clone)
+        out << print_scan(e, parent.clone) 
       else
         items << [e.name, e.text]
       end
-    end
+    end  
     if parent.length > 1 and items.length > 0 then
-      out << "[%s]\n%s\n" % [parent[1..-1].join("/"),
-                            items.map {|x| "\"%s\"=\"%s\"" % x}.join("\n")]
+      out << "[%s]\n%s\n" % [parent[1..-1].join("/"), 
+                            items.map {|x| "\"%s\"=\"%s\"" % x}.join("\n")]    
     end
-    out
+    out  
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-registry
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjE2MTgwNzIwWhcN
-  MjMwMjE2MTgwNzIwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCv4BVt
-  KmxkdjLW52PT4ZpVyDRfU5n/5KT/SUpKglcEix9tF6khOYvkMv1p/vLIdDliIJUD
-  q+VsQ+2sSn59ueuP9Cp3O3ccgPfC6+gKR/biRSsxwgH4+bik77520XkroRR6bz2c
-  Zj1D1y2iE8TJ15LL25wumPkr6qL9eEL7TnrS+kGTRHbTC3IphSHDuryJlevTcNa4
-  F7dgNiAA5rsSWoqwnu+Em3zvcP5eb/+s0EhXIpccMXskztj0tZyXdH79HFGrtNwF
-  UygeIsPRnQrD0JQBGFxsNrWJdayqQGRnrISTvcMqE3HpRnPPIesliGFK/ykxcPJa
-  Pz+RfQPug9TI83zu/jDjBtITm5pLzRSCgwljUFy1JbnL6M0YYqTTbbr3GjwOBWJI
-  cpjB/njMf4CYsDI+SSd8POLdfSjGIeJt306JG9pJb+nKSuQ8V/omEXiKBOyxn510
-  81gTyE55i5SLFewxgfK6L22A3Ld3OVQbv9LgK25Np1xQm5mzQaVlgXWAuMcCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUZm0OEWeE
-  ugAXkDkxz1rhI3H97jswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
-  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAlxjvjTEJuVVf7sNEtVkj2iPnmMYboSAdwt6vzQdR
-  kdwTQwbS83bzwtgMva+34LZYD1Rukfo8TlKi8jspSd6vMnU1KNicsiMphKgjPFZ/
-  IQOF/zOcQevEmPeis9/I8q8krX4515jaQAy/B1umRAAaBZ5HaG6RP//RfgFXiP7N
-  O+o7cMXuG5mtSBZiDsWFJbnm/jxYxsu2/KP0nptKacfGYuJ1AhbzbXcIuBDQPPds
-  iLOmzi+BcvbB5CS3COOQ3/ZfxXlpeq+SXZMd0tMuSXAi+iMQxR+L/siByoDXKzPw
-  7ipnNUzjevQz/sMYRKQIGsIn6AkJc34WtKQMxFKXvgeHlfkEinrviwxHm4dSh3Hi
-  ye5NuslP3b2U0cAcVuw3vXAufZEezb0TGxNQUFio52UGCFfj371cxj4u7VNnB55q
-  qQ7EyBaXak1o/nkw5pybDKSbUjVOvQpzjla62Xe4FzHerw4+UYRKyq6OjeDckoJD
-  qwMwsoB0WJMRTqSZ4g1aEmfr
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDMwNjA4MDM0MFoXDTI0MDMwNTA4MDM0MFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBANQ2m73IAUzzv+ye9M0/onqQA2Rw7hfL/B/du80dmD4V5J0QlXktmT8SnKV/
+  TyA+GppiI/XrdSnukgMDqP5osBYIX7Ew+J4zl9DNqzPEvXxfH1g+Rfv2ySzDBlKV
+  wp2QTxQFxu7zaZsFn/BrrbqvazhU8DGr2As2NBN/NGFWTmnq6mzZPTn7/9DR29bq
+  26zGL/gJbKzTS9zzrNqX2K/emqlSLLzOX+QUEeAzo8tGe6gfEhdDdV3WeOazdA8Q
+  O5zK99MF323pJBXUjsNcD6LV41vn0i9bMIVeGugn9yFxkmj0bzsMtHGKZfB26KCR
+  FWfyUR4woxmSkHWcU6l6Ka8V7o9WD95cpPwPTN0dsCKAZCUpM4tEshnp/abqfuyZ
+  DopU9CQoy42YZNUm9X9biCIwKiO1dopdYAd9FzRF/VwimpzP+VQOegc6BpR1Vwji
+  ycRREdrOxPhSMgh3eBxtXIIO6h/mvqOr3yhBcMwE/vqTI1cVwrmX9OD8NTz2+Rol
+  FzddtwIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSMe2Mtd30bMZYJUMbzeGfWwUaxSzAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQDO3MtMU1Q1WTNhlGUDJXpXGUvgzlQh
+  jK+hZkfw8Hq+0/QaODH7V3poSwlKoI/MuusNvbeER4HUg/BAIgMNE74R1cSDQ903
+  tYLMdW0FZKMxFVBgTF72gsFD9atnJE3N1WJNKnrUIcx+yM5W3CRrtRuO0qQWirtO
+  MDTHGhnjXtD6g4ufthiZTJIrL8O0VIhqI+MxYwEC3jgPfQ8AmetZJtKL5I8D7fzr
+  TF7DhYOoTXxCnkmJa5343IVMAP/SKLvjp7Q3GB/zTlc1Nbzdr5TtrF/6H1QNTC+E
+  HDPkLsIfkHSvrmOMGVrQjV8LvserduHd9B1M1GpOCr0dFeUa6XeljFLhD2QUjBhq
+  kL7xiX3RDqcAvy309ILHyfCi3dWb9G/CWOu7eLmnE1zcoff19nQdTEuVj8nMEhIp
+  Cs3/Ef1tya/6aFPDCTHdMU1ujt9t/Up7C1JyWLTzzoPktNtweb1a3xOVOs/vaVog
+  J5+m17iLpC8bZgQfz17lCcq7Ey37SYJlMIo=
   -----END CERTIFICATE-----
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-config
@@ -46,7 +47,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +57,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: The XML registry can be used to store or retrieve app settings etc. in an