xml-registry 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be5e09b2429e5cca7b0cec165269845ad9bda4fbf7384705f2b884d814381bd
-  data.tar.gz: 04d20465fd4a50bb43a214767904014401ae7437d389a00fde627cbfa9ccd5dd
+  metadata.gz: 280ac5c817560aa72e83c93eabf4358d1a169781717442b7b4e2c7ee95ca1ec0
+  data.tar.gz: 0a8a32baea55901636b3a28ef6b585393883f4717107b17af84a46365a0c8658
 SHA512:
-  metadata.gz: c2c0ed23c3128cbff4c697a6944813b7d5d65816929a8e05ba3874152445ebfc4def88394efbaa5dde494a3f1bdb225f5d3297247eb2c354b14e6bd835e04c42
-  data.tar.gz: 26e18295443a69b2632138c749723173d7d8f0326190951217f33e3d20416e0b47840eb4f1c35e7f17a630e87b0e72c037bb1efd52359e4a06b197b879ff7345
+  metadata.gz: af319f07195089806be005eb10b42267e359a65c6f668ccda8ba618b3b36019c433abede751bf10e5d7dadfdb1c3719309538db765bb56c1e7933fc528f42a56
+  data.tar.gz: a5bddd352a8865dc253cda635dde28a6ba8b66c1ad094c9b2cf5368bb1e74b32164cc8c7e2e9240be7e4e9f25d047a5ffcf1d1ed395ba748dbdf2498a376aca2

data/lib/xml-registry.rb

@@ -2,32 +2,35 @@
 
 # file: xml-registry.rb
 
-#require 'rexle'
-#require 'rxfhelper'
+require 'rexle'
+require 'kvx'
+require 'ostruct'
 require 'simple-config'
+require 'rxfreadwrite'
 
 
 module NumberCheck
-  
+
   refine String do
-    
+
     def is_number?
       self.to_i.to_s == self
     end
-    
+
   end
 end
 
 class XMLRegistry
   using NumberCheck
+  include RXFReadWriteModule
 
   attr_reader :doc
-  
+
   def initialize(template = '<root></root>', debug: false)
-    
+
     @debug = debug
     super()
-    @template, _ = RXFHelper.read(template)
+    @template, _ = RXFReader.read(template)
     @doc = Rexle.new(@template)
   end
 
@@ -49,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'
   #
@@ -73,13 +76,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 +91,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 +116,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 +128,7 @@ class XMLRegistry
   #
   #
   def delete_key(path)
-    @doc.root.delete path    
+    @doc.root.delete path
   end
 
   # return the registry as an XML document
@@ -136,22 +139,22 @@ 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(RXFReader.read(s)[0].force_encoding("UTF-8"))
     self
   end
 
   # save the registry to the specified file path
   #
   def save(s)
-    RXFHelper.write s, @doc.xml(pretty: true)
+    FileX.write s, @doc.xml(pretty: true)
   end
 
   # import a registry hive from a string in registry format
@@ -168,70 +171,70 @@ class XMLRegistry
 #"pin-no"="4321"
 #REG
 #
-#reg = XMLRegistry.new 
-#reg.import s 
+#reg = XMLRegistry.new
+#reg.import s
   #
-  def import(s)      
-    
-    r = RXFHelper.read(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|
 
         lines = raw_section.lines.to_a
         next if lines.first.strip.empty?
-        path = lines.shift.chomp
+        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)
     reg = print_scan(@doc.root).join("\n")
     # jr 250118 File.open(s){|f| f.write reg} if s
-    RXFHelper.write(s, reg) if s
+    FileX.write(s, reg) if s
     reg
   end
 
@@ -267,21 +270,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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMDAzMjEzNzM2WhcN
-  MTkxMDAzMjEzNzM2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDuKHYE
-  VDoo5C3fYSy3TALaWZql8jLK3CNoRhUY0M13n4aY6vZHPhMA3GJGQD/K0dYymdOG
-  8oG6bMuiSDfECX0Me2lgmM8wi77uqLO8GP6cCFNG/SeF0E3nXNEygUv5oUsdLGC6
-  Zl1s0e8o9L4lAShGlAjSdJ6EOoKHc5lpg+giUUVEeCLLCfZWW3AUVblgpTlESBIV
-  udXHu8dkKEEwj0UPiuTHcXAf403FKnWMM9H4Pf8pDmN7qsBCgd2DpDpz4bBk3o3h
-  qKKVoHorgYxtedssPZGUwJJCO9Y7nB427QNoIbdFAJJQT3vnJFCcNyFkQF7t3iwR
-  phMVqfiYU0tAfSzWFNQLa9ZWWvc9BybmdzGDEarJ2JYWDBuhEEZwaUxQZBkAEfBU
-  lP9LxyxWRKQFRqpHO2hMwk1kDRdJMx8eGl6rm9C3mRHsfleYAjQesadwujZ8mBVr
-  tUvf44PIuxZ6j/+CNId5yrR5GqPN++qzYX447/x/p5AEizvb5gfybeqv8b8CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUREuiEPw3
-  nOHMKE8TqdNobfj+xfgwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAoF9tmO4VAAEyCkBYnNEOMiOiurr82x4Enlq83Ng1
-  6Svb49xxq0royYmlsVUzcDun31UTVZIG60mRhZlw/eQ3gPeq/2vNiQDLbDOchJ0A
-  p28M0LkVNwD4mhmW4Dqon/VX7RyL2HOa1bogK7k038wktuCm1i0l4a71//oZuUfh
-  eB8r9R7SX7prHyFnBSgDtfEHedWjg+eFJpmWlly3oHM8vNXoHfhomSAaoHy7ivRS
-  bF4593JPPQdcsxZzciAElMmjMAM7OEyJiRkCFwC/KkSJ8OAHXYVuIrczPcefGvs4
-  fnNfCqQzWQLJf2K0fTSFZRj33W3jAiEfgGfP4Q2APkfclUm5oO9sFwWbrkhDwZxl
-  Lev5l1ly85ZtYlLIotu/PL3cPeohnZPY7rI+HGoHC21O6a99qVQXFP+kkErs81mo
-  MYGFLBUz5wXgJgx3utFrNJwLp7Y4wEAzL5KoeySaQub6rFUeCGfpi/Verm9WPRqH
-  oY185KtHIZDihehN4jjAxIqU
+  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: 2018-10-03 00:00:00.000000000 Z
+date: 2022-02-22 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,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+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