rexle 1.5.6 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf2a8f8144967e80871f40a221639583ea282f507c129298ef120ae944058911
-  data.tar.gz: 780227156d596752418d4c0b1a7c88602ce8544e8f980283cc1c7e6e4fbe8e38
+  metadata.gz: cc1ce190fc92b2ffac2b01b9e8ad9be1e8b135ba96336b6b694fb68f819bb03b
+  data.tar.gz: 1b045de95ba0ed3d8087d5e87a175e57fc9ae9438e155ebe39c269c78d4f5e84
 SHA512:
-  metadata.gz: a34dba5dd5e44d97f698f8086da23f8762ecf5683e6dff56dded2035467bd466982d1470f2a625a275a564b3b6c504abefa1bf0eb7d3e64e69fe492865de45a7
-  data.tar.gz: a7f8cd5a197af5f68fafbef0d74713f7d7f76e7de3a7217ae45b668a245c0d07a1eb3802c2e79d7ab9f8e470529166cb46142ba4ab61975191ba98f4bc290dd7
+  metadata.gz: e0b2f46ec5952957cf74618f844f4b63453429078dbe58fe2f051785b2aea25f5e480604368014f8f364db6e00c731b72eda69afd10896b11f8d32ff6930d83c
+  data.tar.gz: 23413dda0d64adc251a64373b90f4040c147a8ff5eaf9936bdcbfeecbe1e26e9bbacb00ebdb1152a72639783e6e3a873ffc12db5ab974b1d9db553c2badea83b

data/lib/rexle.rb

@@ -13,6 +13,10 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 03-Apr-2021: bug fix: Using *to_a* a CDATA element if present is now output
+# 20-Feb-2021: bug fix: The @instructions accessor is now ignored if nil.
+# 11-Sep-2020: feature: Rexle::Element#text now has unescaped HTML using CGI
+# 30-Jul-2020: minor improvement: #plaintext now unescapes & to &
 # 11-May-2020: bug fix: Rexle#css now responds correctly to valid selectors
 # 23-Apr-2020: feature: Added public method *plaintext*.
 # 04-Feb-2020: minor bug fix: Element A is now defined as a non self-closing tag
@@ -136,7 +140,11 @@ module XMLhelper
 
       if x.is_a? Rexle::Element then
 
-        a = [String.new(x.name), Hash.new(x.attributes), x.value.to_s]
+        a = [String.new(x.name), Hash.new(x.attributes), x.value.to_s]        
+
+        if x.cdatas.any? then        
+          a.concat x.cdatas.map {|cdata| ['![', {}, cdata] }
+        end        
 
         (a.concat(scan_to_a(x.children))) if x.children.length > 1
         r << a
@@ -1002,7 +1010,8 @@ class Rexle
     def map(&blk)    self.children.map(&blk)                    end        
       
     def plaintext()
-      xml().gsub(/<\/?[^>]+>/,'').gsub('&nbsp;',' ').gsub(/\n\s+/,' ')
+      CGI.unescapeHTML xml().gsub(/<\/?[^>]+>/,'').gsub('&nbsp;',' ')\
+          .gsub(/\n\s+/,' ')
     end
     
     def root() self                                             end 
@@ -1063,7 +1072,13 @@ class Rexle
     alias text= value=
         
     def to_a()
+    
       e = [String.new(self.name), Hash.new(self.attributes)]
+      
+      if self.cdatas.any? then        
+        e.concat self.cdatas.map {|cdata| ['![', {}, cdata] }
+      end        
+      
       [*e, *scan_to_a(self.children)]
     end
 
@@ -1485,7 +1500,7 @@ class Rexle
 
     if o[:declaration] == true then
 
-      unless @instructions.assoc 'xml' then
+      unless @instructions and @instructions.assoc 'xml' then
         @instructions.unshift ["xml","version='1.0' encoding='UTF-8'"]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.11
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwMjA0MTMxMjIzWhcN
-  MjEwMjAzMTMxMjIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCyVLqC
-  gVJ+P/zFnjtoyxfgcrc5US5+G7mDdNq/Q2GDm2zIZjVAnUHLZCcKLBlwMY0Vusqq
-  sNzbiSHqVqaXtrFq2jivmbJsKUxJMTIuErXQnpfVsmapQsYJ7U8+byHgFRf8ysTc
-  Op90xKUkroJdO+Ls0SMcFXUGqybH5d4Dxhb+3f/rAThPC8V9EWRWF/SlosXvE/sw
-  VzsGkxLQug3xJkSvN2rQQZi4RgOP37jgeEToeLTIu43npNF6H9nSV/lxUriqPyva
-  OMQYIpK+1SS42J9rSD1/1q1FscsKT2koP9Uf4zHzIeuiQ4wmAMpqYS80eNzaeAEx
-  p3Z4HLBHseWKNWSDrgW0YvuYBAEMcq+XdBMT66n+xKL5GUlsXptrFQ4QP6oOxK4K
-  UZXN94qwi54m+EIexo5ADKtrwRuQl+X9pRpOmFNJAny8vWIz6U1SZs2nBysPLj2g
-  lnKLGetPlgBVoKAPZoFu//CYQKIO+erQoAGRoA05TGrBAq2cNkNFvQJ9XM0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUCCDebAbe
-  pZaniHSTxRjAZLUsoQswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjIwMjIzMjI1WhcN
+  MjIwMjIwMjIzMjI1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDhagZR
+  4bMEv+DQCdwGY0bUNMOfHnsWtzSFTvD8RS6784DOta+qaUVRanPlw0KnPKhwNiKp
+  nDvwK8pNIc7/Mv1F/RcJWpzbC+ZwBUXAQOdHnfc4gVq5bGkyjecdEWhrExcLnnMm
+  nPovWxxRlfRzMYyrhCyWYphTSYPKYppTmF35jvpZk3HUXcTSgBi8m+ofJGePonHU
+  4iMLfY751Jem7eOWTWoM0hfxcZ30zU5ouM2t/AQi7oRTDVlYw6IPH6IqSOOurAeg
+  lRJDCFIVZbBtUnhCsof6V6kScqxgHo9pdZl5M03xBksvktVszVHhNxdO8CNgTYgY
+  r9dLSmQsdKh1Q8lIjqPzsjxo0m1WnzX5j5TAvhzToiMQOzTntxHFAt8ZTeEtAqhp
+  VPn8fcTSGYQMRFwIVLlmrluMaGx5GseabOvBoHWDV6BNx+I3wHfd9YZ+UFbaFUfI
+  ReQtPDHj9ASPE95RbuRMsroqnarg7Ki5tUJmsZ3GxvDmCRTKZq1Pzxan13sCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUjjkDzYYL
+  SN/1W+u8CjupVuZrz1IwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAEdNcc2nDj8v6FdY75tULXii+F0m1pnfxri+wtd/1
-  wnRqNqmaKQGwAUhx4qLhs8MbGU5H4xe18Hmf7n6P++HSCKaFDwE3mo38vwnPmPr8
-  J+4+CWaB+avp9/wztZS3oQ0k/w9bN4b1RUk18z4rpG9Y8KH3v7L+b4rAzzBhs60S
-  Q2+963e3C7PFkFODn1vfGMRmBK2nuekE6RdzzxzRuUBwKHMggxPsHRQzaz8cy4fB
-  UWC8eX0y59rd/gA0WunPXgpuV24SHBtIqTLk76Z1Oz3P27Hwx2JPhURtzc3bNfSg
-  gvwYrdF1dTOwourN6uqQLksl7AjcCVUV+6hyoa5Fo9HcfURnlPdjVFax/KIQj3lA
-  X0bOYG6opdA3I0zyDHGx+mC9QuhM6oKYq3fu7i8RsVsihVImOovRYVagGbULBLDZ
-  yK32Ci6By/qMCdJdE8pLLZhHuZGIkoYJK7EN7OKPznwuXRCOq7jb44HAIDi4RZST
-  J+lqIOqNxqRJkYpuYSZr+tyd
+  BgkqhkiG9w0BAQsFAAOCAYEAdGyAy/d9vAVyUxoBE0giPMNd1xMuyHlZ/sy2zRL3
+  2MI3GvFnYMSxhU+/ClDfIRfq37bgpuKPD/HmXGBgOcf05ZEyfGYFA318DWPOuSqQ
+  WGWmBohzZQm4DE0VcJpwLXdQaR3BvCryjgk110104/nxGlhXNs+joS1yL+urID3x
+  G9d3AFr3hsIydpIlSLue5z+L4ssm+hTxT+ZH3gglGlvgtqryMEec1dVQY4Qb9+Lc
+  NY6PZkkqHcAHG9nt5d5+H7SS9hRNcvs+npPjhHhoW9eXcfRz5h4KsEbmZNczUul6
+  yQ42F7lgIB0a48zmaiSneZNsRQk99SHQ+paP0DqSRsa0U9j0IEHdRui7EWA7regE
+  S3p1n7ojESGKYCT5yHp6WFpG0p7rX8U6zWJ7PAf0NBVK6TbL8dA7NY4Jeo1eWxE8
+  7GC2GlG9BZ9Re4sfu0pwhOe4qFiGyJciH9BWM8DpSRJPbEmLeoNUdU23JgQPhhkO
+  Kiffp9M4EsB/3/3SNM/RVklK
   -----END CERTIFICATE-----
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2021-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -81,22 +81,22 @@ dependencies:
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rexle-css
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,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: Rexle is an XML parser written purely in Ruby