xml-registry 0.1.6 → 0.1.7

data/lib/xml-registry.rb

@@ -2,26 +2,26 @@
 
 # file: xml-registry.rb
 
-require 'rexml/document'
-include REXML
+require 'rexle'
 
 class XMLRegistry
 
   def initialize()
     super()
     @template = '<root><system/><app/><user/><ip_address/></root>'
-    @doc = Document.new(@template)
+    @doc = Rexle.new(@template)
   end
 
   def initialise_registry()
-    @doc = Document.new(@template)
+    @doc = Rexle.new(@template)
   end
 
   alias :reset_registry :initialise_registry
 
   def set_key(path, value)
+
     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)
@@ -31,30 +31,29 @@ class XMLRegistry
   end
 
   def get_key(path)
-    XPath.first(@doc.root, path)
+    @doc.root.element path
   end
   
   def get_keys(path)
-    XPath.match(@doc.root, path)
+    @doc.root.xpath path
   end        
 
   def delete_key(path)
-    node = XPath.first(@doc.root, path)
-    node.parent.delete node if node
+    @doc.root.delete path    
   end
 
-  def to_xml()
-    @doc.to_s
+  def to_xml(options={})
+    @doc.xml options
   end
 
   alias :display_xml :to_xml
 
-  def load_xml(s='')  
-    @doc = Document.new(read(s))	  
+  def load_xml(s='')      
+    @doc = Rexle.new(read(s))          
   end
 
   def save(s)
-    File.open(s){|f| @doc.write f}
+    File.open(s){|f| f.write @doc.xml}
   end
 
   def import(s)      
@@ -78,16 +77,18 @@ class XMLRegistry
   private
 
   def add_key(path='app', key='untitled')
-    node = @doc.root.elements[path] 
-    node.add_element Element.new(key)
+    node = @doc.root.element path
+    r = node.add_element Rexle::Element.new(key)
+    r
   end
 
   def add_value(key, value)
-    @doc.root.elements[key].text = value
+    @doc.root.element(key).text = value
   end
 
   def find_path(path, create_path=[])
-    return create_path if @doc.root.elements[path]
+
+    return create_path if !@doc.root.xpath(path).empty?
     apath = path.split('/')
     create_path << apath.pop
     find_path(apath.join('/'), create_path)
@@ -113,6 +114,7 @@ class XMLRegistry
     out = []
     parent << node.name 
     items = []
+
     node.elements.each do |e|
       if e.has_elements? then
         out << print_scan(e, parent.clone) 
@@ -127,6 +129,4 @@ class XMLRegistry
     out  
   end
 
-end
-
-
+end

metadata

@@ -2,7 +2,7 @@
 name: xml-registry
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 +00:00
+date: 2012-01-14 00:00:00 +00:00
 default_executable: 
 dependencies: []