pretty_xml 0.0.2.1 → 0.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26a57a73bf3d11eae02273e1be53fc6a833ad5c4
-  data.tar.gz: 74bdf7c3eb11464d4c23931890c39c8f6233a215
+  metadata.gz: 578aa9d36b024370da16c72305da36292033ba7c
+  data.tar.gz: da002a5a557455a31b1efaa19a05612d1734bc14
 SHA512:
-  metadata.gz: 7ba8fe7f3fb23eacc86134970f0f60ae4f75d9166a88bc479c4f46218acc60e4e6e0cd9ba3c08c3b55a9d2772d8974980c048b92416367b9e31db44b842302f3
-  data.tar.gz: f7591879b763a1d75592db7de1d15749adf17b9256fe2f45110a98368d707ace63c26700529eb4bc9a6d0510eb688bc837b2d98887ae7e6dce4c94fd0a97d862
+  metadata.gz: 98eaf3a93d453abe0a2af07ed64d3d01211381c23b28239f587a78dd0aeaa6b3e283c01033d5b1fed1b366eda982096208f90e0c8898698672ffb78e2ba9c72f
+  data.tar.gz: fd5caee63898b65329f561e769af3355ac855dc2d07dc51d1bd65594b7862c6f5b53c7aae1f1dda043f5e1fe1a2266a9490af5053b32383d143a69a3269e1798

data/lib/sax/sax_printer.rb

@@ -66,6 +66,10 @@ class SaxPrinter < Nokogiri::XML::SAX::Document
     @compact.include?(name)
   end
 
+  def block_or_compact?(name)
+    block?(name) or compact?(name)
+  end
+
   def inline?(name)
     @inline.include?(name)
   end
@@ -111,6 +115,7 @@ class SaxPrinter < Nokogiri::XML::SAX::Document
       pretty << "</#{name}>"
     end
     @depth -= 1
+    space_after_close(name)
     @open_tag = nil
     @opens.pop
   end
@@ -123,6 +128,10 @@ class SaxPrinter < Nokogiri::XML::SAX::Document
     increment_space if block?(name) and @depth != 0
   end
 
+  def space_after_close(name)
+    increment_space if block_or_compact?(name) and compact?(@opens[-2])
+  end
+
   def add_opening_tag(name, attrs)
     tag = attrs.empty? ? "<#{name}>" : tag_with_attrs(name, attrs)
     pretty << tag
@@ -167,16 +176,24 @@ class SaxPrinter < Nokogiri::XML::SAX::Document
     string.gsub!(/^\s+|\s+$/, '') unless whitespace?
   end
 
-  def comment(string)
+  def nontextual_text(str, op, cl)
     if in_block?
       @depth += 1
       increment_space
       @depth -= 1
     end
-    pretty << "<!--#{string}-->"
+    pretty << "#{op}#{str}#{cl}"
     @open_tag = nil
   end
 
+  def comment(string)
+    nontextual_text(string, '<!--', '-->')
+  end
+
+  def cdata_block(string)
+    nontextual_text(string, '<![CDATA[', ']]>')
+  end
+
   def sanitize(string)
     string.gsub!(/&/, CCS[:amp][@ccs])
     string.gsub!(/</, CCS[:lt][@ccs])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_xml
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.2.2
 platform: ruby
 authors:
 - Dan Corrigan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake