rexle 0.8.1 → 0.8.2

data/lib/rexle.rb

@@ -393,10 +393,8 @@ class Rexle
 
   def xml(options={})
     o = {pretty: false}.merge(options)
-    body = scan_print(self.root.children).join
-    a = self.root.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}  
-    out = "<%s%s>%s</%s>" % [self.root.name, a.empty? ? '' : ' ' + a.join(' '), body, self.root.name]
-    o[:pretty] == false ? out : (PrettyXML::write out)
+    msg = o[:pretty] == false ? :doc_print : :doc_pretty_print
+    "<?xml version='1.0' encoding='UTF-8'?>\n" +  method(msg).call(self.root.children)
   end
 
   private
@@ -430,6 +428,24 @@ class Rexle
     return element
   end
 
+  def doc_print(children)
+
+    body = scan_print(children).join
+    a = self.root.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}
+    "<%s%s>%s</%s>" % [self.root.name, a.empty? ? '' : ' ' + a.join(' '), body, self.root.name]
+  end
+
+
+  def doc_pretty_print(children)
+
+    body = pretty_print(children,2).join
+    a = self.root.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}
+    ind = "\n  "   
+    "<%s%s>%s%s%s</%s>" % [self.root.name, a.empty? ? '' : ' ' + a.join(' '), ind, body, "\n", self.root.name]
+  end
+
+
+
   def scan_print(nodes)
 
     nodes.map do |x|
@@ -448,6 +464,28 @@ class Rexle
 
   end
 
+  def pretty_print(nodes, indent='0')
+    indent = indent.to_i
+    nodes.map.with_index do |x, i|
+      unless x.name == '![' then
+        a = x.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}      
+        tag = x.name + (a.empty? ? '' : ' ' + a.join(' '))
+
+        ind1 = x.children.length > 0 ? ("\n" + '  ' * indent) : ''
+        start = i > 0 ? ("\n" + '  ' * (indent - 1)) : ''
+        out = ["%s<%s>%s" % [start, tag, ind1]]
+
+        out << x.value.sub(/^[\n\s]+$/,'') unless x.value.nil? || x.value.empty?
+        out << pretty_print(x.children, (indent + 2).to_s.clone)
+        ind2 = x.children.length > 0 ? ("\n" + '  ' * (indent - 1)) : ''
+        out << "%s</%s>" % [ind2, x.name]
+      else    
+        "<![CDATA[%s]]>" % x.value
+      end
+    end
+
+  end
+
   def count(path) @doc.xpath(path).flatten.compact.length end
   def max(path) @doc.xpath(path).map(&:to_i).max end
   
@@ -459,4 +497,4 @@ class Rexle
     [node.name, node.text.to_s, attributes, *children]
   end
     
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexle
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +00:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency