xml-registry 0.5.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d705f4545f13c91ba2535d865a6033d1103f1553
-  data.tar.gz: 0a8f33f246dcbbec12fd989040117b02ca5a7413
+SHA256:
+  metadata.gz: 667bdd8cb557aaca4ea00df166d7bf0f8542a0c6d2faedeabc14c26dba83d6a0
+  data.tar.gz: 8a1ecbca36cee8fe8bf5e31612265f4dc384642d4c53a4d042bf324114b1a8a7
 SHA512:
-  metadata.gz: ec0d1ad56ef73bcbbb18756c051d35a8001a5290a5c10903d8ea92008a017c911360c72ff238548206230b0455dad608814ea0e07eb41facc804fc1032f7780f
-  data.tar.gz: f271c662d511027fd153128a9ba6073cd08e7bc5fd2f8bf44e62a699f020f10caafd7d8c7ef7fc880899ef72ca4b9b76cde92d8b2b7bbf52381d3de0ba30371e
+  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,8 +22,10 @@ class XMLRegistry
   using NumberCheck
 
   attr_reader :doc
-  
-  def initialize(template = '<root></root>')
+
+  def initialize(template = '<root></root>', debug: false)
+
+    @debug = debug
     super()
     @template, _ = RXFHelper.read(template)
     @doc = Rexle.new(@template)
@@ -47,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'
   #
@@ -71,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
@@ -86,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>]
   #
@@ -111,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 '/'
@@ -123,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
@@ -134,22 +136,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(RXFHelper.read(s)[0].force_encoding("UTF-8"))
     self
   end
 
   # save the registry to the specified file path
   #
   def save(s)
-    File.open(s, 'w'){|f| f.write @doc.xml pretty: true}
+    RXFHelper.write s, @doc.xml(pretty: true)
   end
 
   # import a registry hive from a string in registry format
@@ -166,49 +168,70 @@ 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?
+
+      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
+
     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")
-    File.open(s){|f| f.write reg} if s
+    # jr 250118 File.open(s){|f| f.write reg} if s
+    RXFHelper.write(s, reg) if s
     reg
   end
 
@@ -244,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
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-registry
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDgzMDE5MDg0MVoXDTE4MDgzMDE5MDg0MVowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBANwS6eox+xJTn89aNj2b9mOImV8L+/29tIKnp3W4CwADagq+RijUXnpFUVjH
-  LGS9q5BLEEw6Es8HKlcVzVUcr2CUjwmf9MmV2jpxQzrb8joMLgc0pyfcjodmDRca
-  Dk3kwfYzvVK564Etm2in9DDxDY20GlpUtnIQhD5w7YDsgpG13d25W2bDsAcTKQYx
-  DObG2/BTp/2Chs32D3uneyAltjuI/G83hq23fcD+V72KA70+vHkV8WHfaLavaVAE
-  N2UH6EKn6RoUjndUBBfdf/yswD+4AC6evcgJO6IGT/ONfTdgFE6sLIe9aCeHz14k
-  GUcXILb4jSZnOoOKeuxy69ubh70CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUHrjiwiOLcqxTv+Ps0Wh4IWJSvv8wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAxmC1ennt
-  kMJQpLkkpTxlBByEM8vyMQ3cg/lRx2dM5W3vbNLjGrN4KEwnF+pXFya72SOrhCmo
-  1M2UpcfL0PTScNm28VmDpoKOGJXcWqNWkCb0PdnM78Ow57c5vIsN0i2BTtpMu3CX
-  4xnSty4gq0hG86B3wI4ZUAXZpKQdIwzRfyonMcsxCv5pI8DB23BanHN8baC7OgJa
-  D+xdRBQ9oIUV4PUxVU+Nly1UsSNUFko7rfDJpHpjx2IQGcFKDiT8w8X/FcXG8LxB
-  xvVmPfHHRba2HGhRUWMvOHyNV3AMJCAokUW0u9XZ2/bcRFES72fEpHHKo23eog3+
-  VlKw5CVJPc93Fw==
+  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
   -----END CERTIFICATE-----
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-config
@@ -39,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        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.1
+        version: 0.7.2
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -79,9 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: xml-registry
+summary: The XML registry can be used to store or retrieve app settings etc. in an
+  XML document.
 test_files: []

metadata.gz.sig

@@ -1,2 +1 @@
-%*	N��5��RUEY���\���[�U�M�b9��}��C��X��\ȷ巂�D�K��֝'#i�����>���=��Rܨ��}�sM���0A_P��K�?�FJ�6��*���pw_	��a��R�����?�ʌ4����
-������%�n:7�R���|�_�1Q�tm��B͜��\İ�%5
�}_'ʮ�k��@���Y&9LP?�3���q�F%��p�GV�����ծ-�޵�$w��]�5f7�k}�����
+8���