xml-registry 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f717791f3bc8588aecdb8e813d51034ff38b283e
-  data.tar.gz: bbe154e760170b1adcf1d9238f0aa8ee610c40a4
+  metadata.gz: e5a926d40bd97d05e0ca799202af429ed4e98c8b
+  data.tar.gz: 7024f4f799a56ef3c2e4fb9b169b10a125794574
 SHA512:
-  metadata.gz: 6858b0011729777ef8a9f4dd70e0c598d1d74c984a8b2d453ef49d056658ff0f7f4615a41a6a3923c55751fadf93e59310add51e2657d82b0a0f7529648d98ea
-  data.tar.gz: 3765eae3a9ff5853ad7f7519a9b183305e74876dc5757b80ee8857e611051ec9f8e3b233ba6589a9fbd475c959930db9e1e43deffb870b25ed8c0b950f1e4778
+  metadata.gz: 4b2cfb269ca6aa448f4fa6324d5b6208dc3044e0372506a3cd16335ad663916c1ad114c47f87bd11a1e224f519f506cda5625a00028453841e88f2e4eb23c8ce
+  data.tar.gz: 2eb0f73f79ce139284e1f6ac580eccd490a2218c91b6bf2d2c49256843723956a510ed456333f52e12ad34ee6b48a5f93deafa440931f62e0f1797d74a81fe38

data/lib/xml-registry.rb

@@ -1,9 +1,3 @@
-#!/usr/bin/env ruby
-
-# file: xml-registry.rb
-
-require 'rexle'
-
 class XMLRegistry
 
   attr_reader :doc
@@ -114,10 +108,26 @@ class XMLRegistry
   def import(s)      
     reg_buffer = read(s)
 
-    reg_items = reg_buffer.gsub(/\n/,'').split(/(?=\[.[^\]]+\])/).map do |x| 
-      [x[/^\[(.[^\]]+)\]/,1], Hash[*($').scan(/"([^"]+)"="(.[^"]*)"/).flatten]]
-    end
+    if  s.strip[/^\[/] then
 
+      reg_items = reg_buffer.gsub(/\n/,'').split(/(?=\[.[^\]]+\])/).map do |x| 
+        [x[/^\[(.[^\]]+)\]/,1], Hash[*($').scan(/"([^"]+)"="(.[^"]*)"/).flatten]]
+      end
+      
+    else
+      
+      reg_items = s.split(/(?=^[^:]+$)/).map do |raw_section|
+
+        lines = raw_section.lines.to_a
+        next if lines.first.strip.empty?
+        path = lines.shift.chomp
+        [path, Hash[lines.map{|x| x.split(':',2).map(&:strip)}]]
+      end
+      
+      reg_items.compact!
+      
+    end
+        
     reg_items.each do |path, items|
       items.each {|k,value| self.set_key("%s/%s" % [path,k], value)}
     end
@@ -188,6 +198,4 @@ class XMLRegistry
     out  
   end
 
-end
-
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-registry
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   m8++OvC3wZJ60rgKYqxfVYDFYuaMttCZlmtJeF5LerbwGPPIjGwvIeYDLqBJRuA6
   4KclOqKpfBFvuefX+F9YSO3aO94nnzhV
   -----END CERTIFICATE-----
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk