rexle 1.5.2 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f239257d410072638cef76f46df1b34c82e48a3943a26d3986a860348ae68851
-  data.tar.gz: f25ca91df0ff0d6834dad5f299aa28c3092304cfba4255c1d8843da5155c20ef
+  metadata.gz: f618c9f7362740fab8dd51fa97118b695effd37a7b1254992eb7bc45075256a9
+  data.tar.gz: 8fd18092107575476f66e8f46fc8251bd42a2bc9d0819867f2ba2ac4b292f47c
 SHA512:
-  metadata.gz: 4e932b40fac8bea0781aa09100ca290b20e570d7555fde08c479501c83545bb60ca83aab475153c7699907f6c93eb732c159980e5140def6849ff4853b3ebac1
-  data.tar.gz: e2d417076d437e471f8be50704767de864c0b4e7ebdb120551099aef9591d8b3c6a9a24513377055340e43647a7eea156db0b4493f8467b76b3e90ebbe29ab58
+  metadata.gz: b98a5b59400eb42f562725e87c982e086446fe5ed8fafa777ac68214e345350efe567bab0b0da3e3d43eed2283cf2f550cb59a8ed3f0b44ce5c62a5298193a78
+  data.tar.gz: d3ef38f3a5bb0cba758d98d5f7ef8618f93af4e40edea315a557c6133a7d3fdbb0420ea7441bdea06df8e787abf43314b3f1970ec05e1f2340a8676df734cc1a

data/lib/rexle.rb

@@ -13,6 +13,10 @@ require 'backtrack-xpath'
 
 # modifications:
 
+# 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
+# 18-Sep-2019: minor bug fix: &apos is now unescaped properly 
 # 09-Jul-2019: minor improvement: A comment tag now has a 
 #              new line when pretty printed
 # 02-Feb-2019: feature: A comment tag can now have nested elements
@@ -99,7 +103,7 @@ module XMLhelper
 
         tag = x.name + (a.empty? ? '' : ' ' + a.join(' '))
         
-        non_self_closing_tags = %w(script textarea iframe div object)
+        non_self_closing_tags = %w(script textarea iframe div object a)
 
         if  (x.children and x.children.length > 0 \
             and not x.children.is_an_empty_string?) or \
@@ -205,6 +209,7 @@ class Rexle
   def initialize(x=nil, rexle: self, debug: false)
 
     @rexle, @debug = rexle, debug
+    $debug = @debug
     
     puts 'inside Rexle'.debug if debug
     
@@ -253,9 +258,7 @@ class Rexle
     a = selector.split(',').flat_map do |x| 
       @doc.root.xpath RexleCSS.new(x).to_xpath
     end
-    
-    a.shift if self.kind_of? Rexle
-    
+        
     return a
   end
   
@@ -646,6 +649,7 @@ class Rexle
       attr_search = format_condition(condition) if condition \
                                                 and condition.length > 0
 
+      puts ('1. attr_search: ' + attr_search.inspect).debug if $debug
       #@log.debug 'attr_search2 : ' + attr_search.inspect
       attr_search2 = xpath_value[/^\[(.*)\]$/,1]
 
@@ -710,6 +714,7 @@ class Rexle
           end          
 
         elsif element_name.nil?
+          puts ('attr_search: ' + attr_search.inspect).debug if $debug
           return eval attr_search          
         else
 
@@ -995,6 +1000,11 @@ class Rexle
     def insert_before(node)  insert(node)                       end
     def last(a) a.last                                          end
     def map(&blk)    self.children.map(&blk)                    end        
+      
+    def plaintext()
+      xml().gsub(/<\/?[^>]+>/,'').gsub('&nbsp;',' ').gsub(/\n\s+/,' ')
+    end
+    
     def root() self                                             end 
 
     def text(s='')
@@ -1016,7 +1026,7 @@ class Rexle
       r.map do |x|
         def x.unescape()
           s = self.to_s.clone
-          %w(&lt; < &gt; > &amp; & &pos; ').each_slice(2){|x| s.gsub!(*x)}
+          %w(&lt; < &gt; > &amp; & &apos; ').each_slice(2){|x| s.gsub!(*x)}
           s
         end            
       end
@@ -1031,7 +1041,7 @@ class Rexle
       
       def r.unescape()
         s = self.clone
-        %w(&lt; < &gt; > &amp; & &pos; ').each_slice(2){|x| s.gsub!(*x)}
+        %w(&lt; < &gt; > &amp; & &apos; ').each_slice(2){|x| s.gsub!(*x)}
         s
       end     
       
@@ -1042,7 +1052,7 @@ class Rexle
 
       val = Value.new(raw_s.to_s.clone)
       
-      escape_chars = %w(& &amp; < &lt; > &gt;).each_slice(2).to_a
+      escape_chars = %w(& &amp; ' &apos; < &lt; > &gt;).each_slice(2).to_a
       escape_chars.each{|x| val.gsub!(*x)}
 
       t = val
@@ -1323,7 +1333,7 @@ class Rexle
     
     def unescape()
       s = @value.clone
-      %w(&lt; < &gt; > &amp; & &pos; ').each_slice(2){|x| s.gsub!(*x)}
+      %w(&lt; < &gt; > &amp; & &apos; ').each_slice(2){|x| s.gsub!(*x)}
       s
     end    
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.7
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMDAyMjEwMjM4WhcN
-  MTkxMDAyMjEwMjM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC1X6zL
-  G+ytuYkQsPOKreuUt/gsYlNSAw5D8VDCUdOScMLcytoL5Ssf3CBBr2LM1QJrkQ5M
-  2J4bF0uTDFmegNK44hIpPPYAYuMHL3IjSawvdyBHgl7GRqv84Y7ys7kD+X+TtxqK
-  jP3icaTau5+DQMe3lIjqlS7KhI0GhUmjiGlL1X/WOaxf3gHTRWtiMktv3VElekAj
-  cOL+hZtRICwLq6yrixODLIt9OyAZ8t+U3XpYZIHkMAswGGo05Pkf4FlDnIzm+VJ0
-  J+dTw+FVx/kPL7y4FNTN8Akl45dAFADuHHNAuOKlCWT+CkKBdDhEWNJQC/cX8nxf
-  XHwKna6YPnuAbt1IBwX/eZIDDrFrTApa6nQVWgyUWyt7z9ntslVCd1rW6K1siJ9F
-  nrW/LPUUgVhTCMwFXYaPWoBaVbiZqGlVn2cFJF9MS9bB4pPbCSU9YVJ4qtYGAatD
-  MBl0kiJdq8exmm0f9WqOvXmVWXWYlhMv5LfAH1ECbK4pIdh5DolK3NB/70sCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYY6jhDbE
-  YQSrL+8T3vNoEqjmOXowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAjUIY0ulHDqBKjbrn3mxutbu0fzMLo0TBmpvvuG2S
-  j4nitZZVmcjiEtJ9br8qjKg0Ycfkt2GTKjeJ7NwrwS0oBtOSsvrDFA+x/YoO5cuk
-  RNhiEC9tk+IF/xN9N0+eyiRBfWFtZ8yHG1d5Ql0DirzspiYLX5sVQG/8hA3s9Jbn
-  gO0fnWowD9LP+jbZr6yw/rnU1Mhb3UAI2W9LSXGslpxvtMS0yKsrHPR9/qQ3fIKH
-  teZlGb8tw9RXEKExP6zSR+ZRXpnNyZQ7flRf4lusqUNvtkguF9dL8RNd8QMV2PJw
-  IHeJbMdyTmYQb8XIAR5zXu0BHfqKRT1GLg94u03RBsBcno5YqNJ5OU42C+j8GEQt
-  nFb3gCj4YFPzQa6OVdSIi/kKW2J8wFxUvI8muMt7lbTaxFJLyK9Qdt/oKxwxXM1t
-  Zdf6ufm6l1fXtBUvl0XuKmNH8p6u/7SmI2oqJoV7Oiarx5i1LrpWL8Zc3q9MFaT4
-  pzftGMNXyXUyb9mSx4krfsRT
+  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
   -----END CERTIFICATE-----
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -63,60 +63,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        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.4.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rexle-css
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: backtrack-xpath
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rexle is an XML parser written purely in Ruby