rexle 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 093ee31cda01f5cb6bed485d2bc513cf866373cf
-  data.tar.gz: e54e0d493cfde0d7411b28f517164fafc1790981
+  metadata.gz: adfbe5ba547c8ef5b5b716913eb8df7bc0f29e36
+  data.tar.gz: c9bc98299843537f4ee19a319e5d2d8baf8c2599
 SHA512:
-  metadata.gz: 8bede7d10f4ebe56bf7b05e34a9c8e020a81a4a789a1838f539d9c9508fd501ed8a1ac65bb0737622ccc66543532924e1e0416a23c13edb114ccedaafb32b7b0
-  data.tar.gz: 329aab680819126a9f58589aeb18252388edd4320fb8da7fef6c656f6609088abdf234f96e7d252b54af8c12b80962ece05e06d0c896d9c39c3b7feb9fd79aa0
+  metadata.gz: 0e73d745b1edccc86dfb6590004838fe671327bcb1e3a527617bd7b686892642d73d1b2ff7d4f85a495f4cf8160be0361e400638aa6e4ce463a50e64009c7483
+  data.tar.gz: 04d378818b56ed73dc244c13f674efa8e46bae7e75f7e7bcf23e5268e4d553e5a85546f0f5c773f9752f0b8a4ce767cbd092c9ed4500f764b77efdedcb85af3d

data/lib/rexle.rb

@@ -12,6 +12,9 @@ include REXML
 
 # modifications:
 
+# 26-Oct-2014: bug fix: XML output containing a class attribute, 
+#                       now appears as a string.   Empty nodes are 
+#                       now displayed as self-closing tags.
 # 21-Oct-2014: partial feature: An Xpath containing //preceding-sibling and 
 #                       //following-sibling now works
 # 19-Oct-2014: feature: An XPath containing the attribute @class is 
@@ -94,7 +97,9 @@ module XMLhelper
   def doc_print(children, declaration=true)
     
     body = (children.nil? or children.empty? or children.is_an_empty_string? ) ? '' : scan_print(children).join
-    a = self.root.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}
+    a = self.root.attributes.to_a.map do |k,v| 
+      "%s='%s'" % [k,(v.is_a?(String) ? v : v.join(' '))]
+    end
     xml = "<%s%s>%s</%s>" % [self.root.name, a.empty? ? '' : \
       ' ' + a.join(' '), body, self.root.name]
     
@@ -108,7 +113,11 @@ module XMLhelper
   def doc_pretty_print(children, declaration=true)
 
     body = pretty_print(children,2).join
-    a = self.root.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}
+    
+    a = self.root.attributes.to_a.map do |k,v| 
+      "%s='%s'" % [k,(v.is_a?(String) ? v : v.join(' '))]
+    end
+    
     ind = "\n  "   
     xml = "<%s%s>%s%s%s</%s>" % [self.root.name, a.empty? ? '' : \
       ' ' + a.join(' '), ind, body, "\n", self.root.name]
@@ -138,7 +147,9 @@ module XMLhelper
             "<![CDATA[%s]]>" % x.value
           else
 
-            a = x.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}      
+            a = x.attributes.to_a.map do |k,v| 
+              "%s='%s'" % [k,(v.is_a?(String) ? v : v.join(' '))]
+            end
             tag = x.name + (a.empty? ? '' : ' ' + a.join(' '))
 
             if (x.value and x.value.length > 0) \
@@ -196,20 +207,27 @@ module XMLhelper
             "<![CDATA[%s]]>" % x.value
           else
             #return ["<%s/>" % x.name] if x.value = ''
-            a = x.attributes.to_a.map{|k,v| "%s='%s'" % [k,v]}      
+            a = x.attributes.to_a.map do |k,v| 
+              "%s='%s'" % [k,(v.is_a?(String) ? v : v.join(' '))]
+            end
             a ||= [] 
             tag = x.name + (a.empty? ? '' : ' ' + a.join(' '))
-
             start = i > 0 ? ("\n" + '  ' * (indent - 1)) : ''          
+            
+            if (x.value and x.value.length > 0) \
+                or (x.children and x.children.length > 0 \
+                and not x.children.is_an_empty_string?) then
 
-            ind1 = (x.children and x.children.grep(Rexle::Element).length > 0) ? 
-              ("\n" + '  ' * indent) : ''
-
-            out = ["%s<%s>%s" % [start, tag, ind1]]
-            out << pretty_print(x.children, (indent + 1).to_s.clone) 
-            ind2 = (ind1 and ind1.length > 0) ? ("\n" + '  ' * (indent - 1)) : ''
-            out << "%s</%s>" % [ind2, x.name]            
-            out
+              ind1 = (x.children and x.children.grep(Rexle::Element).length > 0) ? 
+                ("\n" + '  ' * indent) : ''
+                
+              out = ["%s<%s>%s" % [start, tag, ind1]]
+              out << pretty_print(x.children, (indent + 1).to_s.clone) 
+              ind2 = (ind1 and ind1.length > 0) ? ("\n" + '  ' * (indent - 1)) : ''
+              out << "%s</%s>" % [ind2, x.name]            
+            else
+              out = ["%s<%s/>" % [start, tag]]
+            end
           end
       elsif x.is_a? String then
         x.sub(/^[\n\s]+$/,'')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser
@@ -42,7 +42,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: 0.4.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.16
+        version: 0.4.18
 - !ruby/object:Gem::Dependency
   name: dynarex-parser
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.3
 description: 
 email: james@r0bertson.co.uk
 executables: []