rexleparser 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557d2710c7631f795fa2c25c7f48e4ed92cb0a8662a7de7df5389550a801ff1c
-  data.tar.gz: 1e1e2bc8f108e6d86ceff57fe4b8d88b82536c2d6074780414073d909c079bb5
+  metadata.gz: 6b2983f6245146772e1fb82307a06168ed3d3c07b3a96d85c4089aec35712a9d
+  data.tar.gz: e1b14339a868bc524e424e648e64ff957aa4b8aa25123d8359cb0e5c8c08939d
 SHA512:
-  metadata.gz: 46e367a488b16fd54ee1098e4a1acc69b9f9d7162ad98b0a81c6d4ef276f7adb88b5fac977778ccc9de8ef15e56235f84fd25547ee4038316ff00fe7552d08ac
-  data.tar.gz: 85eebfdf359c8c1f7f2c326cbfa05ce2bcf5a116fcf844b7ce2c95ab3d874606b5c12f479215afe515a483eaec92e7219bb79afdc7178fe2aeb54fe216c06e29
+  metadata.gz: 21e7bd2777aaff51cfe10f83d4b39b268d6fe3f188bea5ef08cedd5e899ae7d5798d19c176219e02fb64526348bacd939b3871984cff428e5d96d74095c20c99
+  data.tar.gz: 0b243a97ec7983176aff54db53482abf0449fd1c8c2294ea8b7995957e76fda61cee56f1155aa57d59bf3f969276f927932e9dff2d549d1d62a9ecec7c3e9e7d

data/lib/rexleparser.rb

@@ -7,49 +7,49 @@
 class Attributes < Hash
 
   class Value < String
-    
+
     def initialize(value)
       #jr2020-04-30 super(value.gsub("'", '&apos;'))
       super(value)
     end
-          
+
     def <(val2)
       self.to_f < val2.to_f
-    end      
-    
+    end
+
     def >(val2)
       self.to_f > val2.to_f
     end
-    
+
     def inspect()
       super().gsub('&lt;','<',).gsub('&gt;','>').gsub('&pos;',"'")
     end
-    
-    def to_s()
+
+    def to_s(unescape: true)
       #jr2020-07-18 self.gsub('&lt;','<',).gsub('&gt;','>').gsub('&pos;',"'")
-      self.gsub('&amp;','&').gsub('&pos;',"'")
+      self.gsub('&amp;','&').gsub('&pos;',"'") if unescape
     end
-    
-  end  
-  
+
+  end
+
   def initialize(h={})
     super().merge! h
   end
-  
+
   def []=(k,v)
     super(k, k != :class ? Value.new(v) : v)
   end
-  
+
   def merge(h)
 
-    h2 = h.inject({}) do |r, kv| 
+    h2 = h.inject({}) do |r, kv|
       k, raw_v = kv
       v = raw_v.is_a?(String) ? Value.new(raw_v) : raw_v
-      r.merge(k => v) 
+      r.merge(k => v)
     end
-    
+
     super(h2)
-    
+
   end
 end
 
@@ -65,7 +65,7 @@ class RexleParser
     super()
     s = raw_s.clone.strip
     return if s.empty?
-    
+
     raw_xml, raw_instrctns = if s.lines.first =~ /<?xml/ then
       s.split(/(?=\?>\s*<\w)/,2).reverse
     else
@@ -77,10 +77,10 @@ class RexleParser
     @to_a = reverse(parse_node(raw_xml.strip.reverse))
 
   end
-    
+
   private
 
-  
+
   def scan_next(r, tagname)
 
     j = tagname
@@ -89,7 +89,7 @@ class RexleParser
 
       # end tag match
       tag = r[/^>[^<]+</]
-      
+
       if tag[1][/[ \w"']/] and  tag[-2] != '/'  then
 
         # is it the end tag to match the start tag?
@@ -97,18 +97,18 @@ class RexleParser
         end_tag = tag[/^>[^>]*#{j}<$/]
 
         if end_tag then
-          
+
           j = nil
           return   [:end_tag, end_tag]
 
         elsif tag[/^>[^>]*\w+<$/] then
           # broken tag found
           broken_tag = tag
-          return [:child, [nil, [], broken_tag]] if broken_tag          
+          return [:child, [nil, [], broken_tag]] if broken_tag
         else
-          
+
           text, newtag =  tag.sub('>',';tg&').split(/>/,2)
-          
+
           if newtag then
             tag = newtag
             r.prepend '>' + tag
@@ -117,16 +117,16 @@ class RexleParser
           return [:child, text]
         end
       elsif r[0,3] == '>--' then   # comment tag found
-          
+
         r.slice!(0,3)
         i = r =~ /(\-\-!<)/
         s = r.slice!(0,i)
         r.slice!(0,4)
 
         tagname, content = ['-!',s]
-      
+
         return [:child, [">#{tagname}<", [content], ">#{tagname}/<"]]
-        
+
       elsif r[0,3] == '>]]' then   # CDATA tag found
 
         r.slice!(0,3)
@@ -136,22 +136,22 @@ class RexleParser
 
         tagname, content = ['[!',s]
 
-        return [:child, [">#{tagname}<", [content], ">#{tagname}/<"]]        
-        
+        return [:child, [">#{tagname}<", [content], ">#{tagname}/<"]]
+
       elsif tag[/>\/|\/<$/] or tag[/^>.*[\w!]+\/<$/] then
-                
-        return [:newnode]        
-        
+
+        return [:newnode]
+
       else
-  
-        r.sub!('>',';tg&')      
+
+        r.sub!('>',';tg&')
         i = r =~ />(?:[\-\/"'\w]|\]\])/ # collect until a tag is found or a CDATA element
         text = r.slice!(0,i)
 
         return [:child, text] if text
 
       end # end of tag match
-      
+
     else
 
       # it's a text value
@@ -161,12 +161,12 @@ class RexleParser
       return [:child, text] if text
     end
   end
-  
+
   def parse_node(r, j=nil)
-    
+
     return unless r.length > 0
     tag = r.slice!(/^>[^<]+</) if (r =~ /^>[^<]+</) == 0
-    tagname = tag[/([\w!:]+)\/?<$/,1] 
+    tagname = tag[/([\w!:]+)\/?<$/,1]
 
     # self closing tag?
     if tag[/^>\/.*#{tagname}<$/m] then
@@ -180,16 +180,16 @@ class RexleParser
                 start_tag.reverse + '; context: ' + r[0..120].reverse.inspect
     end
 
-    until end_tag do 
-      
-      key, res = scan_next r, tagname      
-      
-      case key 
+    until end_tag do
+
+      key, res = scan_next r, tagname
+
+      case key
       when :end_tag
         end_tag = res
         r2 = [start_tag, children, end_tag]
         end_tag = nil
-        
+
         return r2
       when :child
         children << res
@@ -204,13 +204,13 @@ class RexleParser
   end
 
   def get_attributes(raw_attributes)
-    
+
     r1 = /([\w\-:\(\)]+\='[^']*)'/
     r2 = /([\w\-:\(\)]+\="[^"]*)"/
-    
+
     r =  raw_attributes.scan(/#{r1}|#{r2}/).map(&:compact)\
                                   .flatten.inject(Attributes.new) do |r, x|
-      attr_name, raw_val = x.split(/=/,2) 
+      attr_name, raw_val = x.split(/=/,2)
       val = attr_name != 'class' ? raw_val[1..-1] : raw_val[1..-1].split
       r.merge(attr_name.to_sym => val)
     end
@@ -219,17 +219,17 @@ class RexleParser
   end
 
   def reverse(raw_obj)
-    
+
     return unless raw_obj
     obj = raw_obj.clone
     return obj.reverse! if obj.is_a? String
 
     tag = obj.pop.reverse
-    
+
     children = obj[-1]
 
     r = children.reverse.map {|x| reverse(x)}
-    
+
     return [tag[/[!\-\w:\[]+/], get_attributes(tag), *r]
-  end  
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexleparser
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - James Robertson
@@ -35,10 +35,10 @@ cert_chain:
   cF/nszU+U7PJ1WnQ+W7QTqoViru4N0S9bwi3YV5F5NPPeVnnrtmC2yruRfgTCI4b
   3nEas0DJDZbQSkPP1mVcybEA
   -----END CERTIFICATE-----
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2022-01-01 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []