clifton_lib 0.0.9 → 0.0.10

data/README.md

@@ -34,6 +34,7 @@ This implementation:
 
 ## Revisions
 
+Published 0.0.10 - Fixed issue with child nodes and inner text, also XmlDocument instance references itself since it's derived from XmlNode.
 Published 0.0.9 - Must remember to push commits before pushing gem
 Published 0.0.8 - Fixed indentation issues with XmlFragments, Bad Push
 Published 0.0.7 - Added XmlFragment

data/lib/clifton_lib/version.rb

@@ -1,3 +1,3 @@
 module CliftonLib
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/clifton_lib/xml/xml_document.rb

@@ -11,6 +11,7 @@ module CliftonXml
     # XmlDocument.new()
     def initialize
       super()
+      @xml_document = self
     end
 
     # XmlDeclarationNode create_xml_declaration(string version, string encoding)
@@ -82,6 +83,14 @@ module CliftonXml
 
     private
 
+    def write_child_nodes(writer, node)
+      writer.indent()
+      writer.new_line()
+      write_nodes(writer, node.child_nodes)
+      writer.outdent()
+      writer.new_line()
+    end
+
     # void write_nodes(XmlTextWriter writer, XmlNodes[] nodes)
     def write_nodes(writer, nodes)
       nodes.each_with_index do |node, idx|
@@ -103,6 +112,11 @@ module CliftonXml
           # if inner text, write it out now.
           if node.inner_text
             writer.write('>' + node.inner_text)
+
+            if node.has_child_nodes()
+              write_child_nodes(writer, node)
+            end
+
             writer.write('</' + node.name + '>')
             crlf_if_more_nodes(writer, nodes, idx)
           else
@@ -110,11 +124,7 @@ module CliftonXml
             if node.has_child_nodes()
               # close element tag, indent, and recurse.
               writer.write('>')
-              writer.indent()
-              writer.new_line()
-              write_nodes(writer, node.child_nodes)
-              writer.outdent()
-              writer.new_line()
+              write_child_nodes(writer, node)
               # close the element
               writer.write('</' + node.name + '>')
               crlf_if_more_nodes(writer, nodes, idx)
@@ -135,7 +145,6 @@ module CliftonXml
           end
         end
       end
-
       nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clifton_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2742348 !ruby/object:Gem::Requirement
+  requirement: &26345640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2742348
+  version_requirements: *26345640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2741856 !ruby/object:Gem::Requirement
+  requirement: &26345340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2741856
+  version_requirements: *26345340
 description: A collection of useful helper classes, initially a set of classes to
   support creation and serialization of XML.
 email: