xml-registry 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d392b12b72700de55f9435b4a8e39a7e94039ad9d24ab29a4fe2eace7c17657f
-  data.tar.gz: 3a1a9fe380f0544d517fee1afdbd7b8efc270fc2a4a0c4aad664ec592bc37de3
+  metadata.gz: 667bdd8cb557aaca4ea00df166d7bf0f8542a0c6d2faedeabc14c26dba83d6a0
+  data.tar.gz: 8a1ecbca36cee8fe8bf5e31612265f4dc384642d4c53a4d042bf324114b1a8a7
 SHA512:
-  metadata.gz: 2f090b28afd7a35b47171d4a3c036ff728a2b93e3822c41f3f6bdeaf7e9e5606f8957dc73148f4980c1d00a9b2004d4e13770b36797934d73f0e4c9038532c46
-  data.tar.gz: a4ea5df6196a4be5954499cd5b913e1a66fa04280ed12cb30fb837eb545c6ccda2335e27f6c99d9ef0f652cc4745658e7948111ce8bf3f500022c3968ec3fcd8
+  metadata.gz: d3f73f6a72768069389584be2e733f2ad85494088bd4ad95ff98f6f86fd183e0f38152777971e1633fc3e59ec4e8e3fcbae9a76161039b8c48ff9be1d3c3f2c1
+  data.tar.gz: fb077f993036fe580363abeb6e00300e6fee9989ec18b928f95c2e5d390c39e5df1e6fc100fcbb527d8045fba896f7dd1b9130fe29d982ee1e419a06275dc6f0

data/lib/xml-registry.rb

@@ -8,13 +8,13 @@ require 'simple-config'
 
 
 module NumberCheck
-  
+
   refine String do
-    
+
     def is_number?
       self.to_i.to_s == self
     end
-    
+
   end
 end
 
@@ -22,9 +22,9 @@ class XMLRegistry
   using NumberCheck
 
   attr_reader :doc
-  
+
   def initialize(template = '<root></root>', debug: false)
-    
+
     @debug = debug
     super()
     @template, _ = RXFHelper.read(template)
@@ -49,21 +49,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'
   #
@@ -73,13 +73,13 @@ class XMLRegistry
 
     key = @doc.root.element path
     raise ("xml-registry: key %s not found" % path) unless key
-    
-    key.instance_eval { 
-      @path = path 
+
+    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
@@ -88,24 +88,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>]
   #
@@ -113,7 +113,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 '/'
@@ -125,7 +125,7 @@ class XMLRegistry
   #
   #
   def delete_key(path)
-    @doc.root.delete path    
+    @doc.root.delete path
   end
 
   # return the registry as an XML document
@@ -136,15 +136,15 @@ 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='')      
-    @doc = Rexle.new(RXFHelper.read(s)[0])          
+  def load_xml(s='')
+    @doc = Rexle.new(RXFHelper.read(s)[0].force_encoding("UTF-8"))
     self
   end
 
@@ -168,40 +168,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 = RXFHelper.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|
@@ -211,21 +211,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)
@@ -267,21 +267,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.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMjIzMjIxNDQwWhcN
-  MjAxMjIyMjIxNDQwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDMvIzK
-  0RTuEh7Eae7b6JjwT7P/Zi2V+e+yHSL6zfhqMvN6amx2ZBTCsL0fPY6vwS/ggwEJ
-  mnHzgAFZplpsyNjBTMdxN9dxLgIL1M6u6SgCYH/Bhz5Wc5YwhDetW8i/OUaPgGfs
-  njt3aEtYWCoeOTbDVc0k9O5fgDRRZFy6Aq6kxBmPrxScv8HUKcdGyfM1FhI/+6JD
-  17Q57lqjHRp1Lk55LhMRdX/qVATkfMqXJVtdICRFy74CQplFUax+V0lRTKVCtXXB
-  z+8qwTLPKBXeakP++TGA1Xfj59RmbYWYJjOcAmKnwu9rpsoSYwRAb+q/YBebnjfa
-  ToTPjMUCzHJOgOByTjbNPyN/C5gDIeCyVZORDksfolPCgCcjpsGWIJ0pMQbcg80z
-  RYzR22BNnk6xSUn3xv26Y5NQCfovrog+b/041+/wGu2Hi3eZzu7cYFcOnTwQSDzi
-  SrCJQj1YvKXNw9PGuCW0x0YFclx2Yij+qPwiPvpSk6YPkS8HPVofhYxqfvkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU97O20MVw
-  jpgtt+OmQNVyU0KUVOYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAkPa567WlYU43Do3tpl/egSUvl7vcM3dVobsN/nO9
-  YMvDqHxczglf69acZzXIp3vuZs+ZsArO95kLUxTeNxCl41Z/bcXdfJsUjscbula3
-  2x12xtb/Az5f2N3d/GcHZat5gZDzEGZKOXXHN1cL4GxnNM0S7izOj5wUlMIMiirm
-  zXyZFU67nomzcMhM5eRHt8naMuSwNw9jOzE/jHFpsyzYSdwrhnzsv6kVIlKbbIAL
-  NuxWbqVy5+lzxfMAecvdpqD1ue1mpu3plkoRV6HRnsyVeLvIimpIltAgf5Z52xgW
-  Ennbz7MzKU6PYEraB3a7qDLyqoxh1Yx5A1daLtF5PaTubnXRhXBKiGN06+xz7lxW
-  0DblGPEi11eSlzIw5+Feu4ttYZVkS9o4XZFnCHnrgwLYRQ2uD23v/0aYpXgy/tch
-  WiV7jED0GOc3eTLeE65/uvYQEOvRB2cBUs0TOtoi/xV4u63W9b58SXQ3li77MKyI
-  Lktf/4PIDPi8vzcJV5Ekfva5
+  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
   -----END CERTIFICATE-----
-date: 2019-12-23 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-config
@@ -43,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.7.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,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: The XML registry can be used to store or retrieve app settings etc. in an