rexleparser 0.9.4 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd792a48a5e928e25ee0fb376940f6b474c0fee9c0bf57c4f5e927cec3a5dfba
-  data.tar.gz: 8c911113c032d1c2c4a81083f98e5ccc51000a2521abfeb0e3ffff7380977163
+  metadata.gz: 6b2983f6245146772e1fb82307a06168ed3d3c07b3a96d85c4089aec35712a9d
+  data.tar.gz: e1b14339a868bc524e424e648e64ff957aa4b8aa25123d8359cb0e5c8c08939d
 SHA512:
-  metadata.gz: '0953543aa1668b5096eb8643b152ea771ed31a55be6c56cb022d9164a8a5b4a2b64f97e41a5b8d3aca2dd466ecd783f4c9fea491d56712ad384c7d3211429b23'
-  data.tar.gz: 1f63769b1a069d592c8aa669da0c68123e254a3cf4294d32ce3a12d5cc8790d0dd2452d5804b532a8a85fb3ee6fde1b78fc8dc733bf5bd9b800d04161be9c37b
+  metadata.gz: 21e7bd2777aaff51cfe10f83d4b39b268d6fe3f188bea5ef08cedd5e899ae7d5798d19c176219e02fb64526348bacd939b3871984cff428e5d96d74095c20c99
+  data.tar.gz: 0b243a97ec7983176aff54db53482abf0449fd1c8c2294ea8b7995957e76fda61cee56f1155aa57d59bf3f969276f927932e9dff2d549d1d62a9ecec7c3e9e7d

data/lib/rexleparser.rb

@@ -7,47 +7,49 @@
 class Attributes < Hash
 
   class Value < String
-    
+
     def initialize(value)
-      super(value.gsub("'", '&apos;'))
+      #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()
-      self.gsub('&lt;','<',).gsub('&gt;','>').gsub('&pos;',"'")
+
+    def to_s(unescape: true)
+      #jr2020-07-18 self.gsub('&lt;','<',).gsub('&gt;','>').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
 
@@ -63,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
@@ -75,10 +77,10 @@ class RexleParser
     @to_a = reverse(parse_node(raw_xml.strip.reverse))
 
   end
-    
+
   private
 
-  
+
   def scan_next(r, tagname)
 
     j = tagname
@@ -87,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?
@@ -95,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
@@ -115,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)
@@ -134,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
@@ -159,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
@@ -178,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
@@ -202,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
@@ -217,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.4
+  version: 0.9.8
 platform: ruby
 authors:
 - James Robertson
@@ -11,34 +11,34 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTMwMjAwODA5WhcN
-  MjAwOTI5MjAwODA5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDk5pTR
-  pX4gfQNbdtleggKLuPVnWNjmpA9dhXvIU5wmWsOFv9Iz9S6IcCo6jphqosofb8PI
-  c79Jv3a0COalq4Qka3g84ew6SuUf1MeVN9Q8V4bhUiuNLC+I/zu66TldHOpGFG+F
-  oz/GiusJvsDI5/VbsWasECR9zvrPcLEz8As+hKDsrQK0ugEWqcBwQv/DvGi/bwkS
-  NSVhtms8DTWapCmF61ZtDzqtKHCInGNHgEb4t2VZ0CqvLVfbiD+H3E0OV2STh7Tj
-  rmV6otJltarcdqmLc5Aq8mkrQPVd0263BtLYbvF0e/BuU9g6Vrs55VxPHrzt2zxz
-  wL9ETVOXUbpMnjLEhlTjBqai+GALjFezpziR8SmK13luPMVmlT8CGBYVAvOTzvL7
-  SDju4bVcCRXdx+BUwviB3m/Dbm26iE4HK/NIB5sydvnZcAu/FNrjI1POQirzQ640
-  OJjtQnl40r7nNDJwCsDI4xHpOjgeacU6lJ0ttpS3Uakgwfe5Iwk7xPNrCUkCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUKZMicNOO
-  WygILTKTnC128Qm/i9gwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNDAxMTI1NDA1WhcN
+  MjIwNDAxMTI1NDA1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC9tf0T
+  BYEECADFGYQisEHfQBwZtTbhsjWGAsDG1CCEg+Zje9gQIwCPVPUYtEiZkmPtb2en
+  YQ0gdCvrSdaxyeP+O7UnN2sR/Rb0G/4Nx3gzY5e+k1PeZ+YEHhehzF/CjpxCpief
+  Mhi2HgToCQ71U1iyUT3Squb3CBA6vwLJI6MMh71GWU01aqrMT/l9W3vN54SAZ5i7
+  Ud9nVF4JsMXwHyzikv5MH6WwIOzMhqKMUxaAeeGAlFN3u2G2DGW+7fd9/z5zpD6S
+  XJEvqjllf5fetAk77Lvw7hPfK0gHJHwTva7k87K704pYgKvi8bAwcnhk/aHXgyON
+  D42nLpNYipRRVTXiNXxo9svPTSDGsee5e0prmpC/U9bD2T4SxCrM7VvfVWXbhhEX
+  47iZDeo2KllKmocjA02vfqtbaQXEATi3fSz/pdRpCr1g/Rd/JdAjRnxHgUu1q1TU
+  JU99/sfjaxBGvbL+C20cfMgdXdPrkGPNsiEDqfxK5IIBfaob8cp6jzKNDosCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUgG4OM1TJ
+  YfZh1FAIhnVN+TXDs64wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAWznQuPa0IAove4YVnnxZPpfBa4fA2acbeeigtMp8
-  Y/WehyRBB60VNtRY/KuIdnJkgFmJntLnWK9E7YNw9cdexIZ3fw5uAqNqBgRx6+pW
-  5Aj3KfQq3ZP5WtWEXnOVq1A+S3/Id8xpJvHSI1GkQ6X/GCbq4AgHvouRWQNwywCR
-  ssFgqF/VAwpp/5Xo/NiXsI4o6k9bWGuKM97T//HxVYjHNKFF+kUy8NtEIYryf76E
-  +4tG+7dEUen0OkYgA/syu5OZHm+ARXVL7G+idlPkGv4ZyJZ7RNGg83cX0LpimoAX
-  u+M+EVXoKE4kyNLbBsFySWQGP0958ELchC6pL3VSveL50NGhb6+Agp7Pavy4vcFC
-  TFi1rfWwx2iTO1P17jHl8X0nNHB23O/MffFDU+kugutdTwLTajFUZNrf8R74c69S
-  T71m/FVIgpvTDrvFUbSk75LOR+Sh7epwzIFUPsY3RNhBU1HuZrPEBI6IK8Xjc27P
-  ahkta6LWar5SSzKmTY034ms+
+  BgkqhkiG9w0BAQsFAAOCAYEACka8bLaU+wG55T9M2lqOrmXMsKpHQ5xtmSQk29OJ
+  4FUZ4aJEhTYxzJosvMNpauZVyrk+KyF/8uuGz5CfG/aPbOboB9+EIsmIcvRZ696M
+  BUXc6OuHE8SL0C9yuB9PloIZy2nxrRENFSV5xxyMS04bcaQjKCqtKw69+QT6lbra
+  iAU2EIebKyy0UIbrJSBIDKfig9KMEUrXvFUR4hu0lWpeT1bwq4sYeIeZNcg3v/y3
+  EbV3QK7AumvKgYvaz7iTu+9FKWT7AqIOH9wuPNPeXDLgyuKhLjdMaugz0wy6RYhT
+  Q8tgppTgSzQP8XwMg3xsaM+gWHbRLy8tO+3dkWTPN1m0xETWlSWFCiyi6oq8G4wC
+  t4pClPXscWrfmQa/u189WCF/O5BbsElrKQqx0vjq73l2apKjN9xViJi4LrEsZTuz
+  cF/nszU+U7PJ1WnQ+W7QTqoViru4N0S9bwi3YV5F5NPPeVnnrtmC2yruRfgTCI4b
+  3nEas0DJDZbQSkPP1mVcybEA
   -----END CERTIFICATE-----
-date: 2020-02-18 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: []
@@ -63,7 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Rexleparser is an XML parser used by the Rexle gem