rexle-xpath-parser 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db466429d95d0cf12789e04b3164973288b90da
-  data.tar.gz: 526c10f5d24d275b7567e291455bc19d41ab569c
+  metadata.gz: b754ed1c9cd12d73362a3f1486e6ad1d228f2d16
+  data.tar.gz: 4455f9652ebe23bae65dcf8515c577095033d2a8
 SHA512:
-  metadata.gz: 417e4876e41c02a27d78a818ca6557dd8ed3d806700d96c11d996fc38bdec6812d4572b26f214163bcaef70a1c86d792291e160fee12f796845c5b2c429df8ca
-  data.tar.gz: 7ab7635ba885d2ba9fe9096d10fe1790944e7da6d0cb6c9b5bd92d9d026427e6f9fe91646d8c468086cd5b182ee0c38b0e54b3e5007db4b86817ec49aa7251aa
+  metadata.gz: 8f157bccb8348d5ee953bc8596ecf2db0024c152c2db78a5e1fee332b30993b1178b1578e70b9a705303af39e9afeab4ea9aa39ddae4d2fdb183141b4e302662
+  data.tar.gz: 5ed1d4c69105cd72f257d4e470f1bb2895262afebe8f49b4fd55d565a1e8663bb8869cd4d0c83e6937a326ba3083cc5ab673ed12e27e3bccce64488e7eae12a2

data/lib/rexle-xpath-parser.rb

@@ -28,8 +28,12 @@ class RexleXPathParser
 
       #puts 'x: ' + x.inspect
       
-      if x =~ /^@[\w\/]+/ then 
-        r << [[:attribute, x[/@(\w+)/,1]]]
+      return r << functionalise(x) if x.is_a? Array
+      
+      if /^(?<func>\w+)\(\)/ then
+        r << func.to_sym
+      elsif /^@(?<attribute>[\w\/]+)/ =~ x
+        r << [[:attribute, attribute]]
       elsif x =~ /^\/\//
         r << [:recursive, *RexleXPathParser.new(x[2..-1]).to_a]                
       elsif x =~ /[\w\/]+\[/
@@ -54,8 +58,6 @@ class RexleXPathParser
         r << [x.chop.to_sym]
       elsif x =~ /\d+/
         r << [:index, x]
-      elsif x.is_a? Array
-        r << functionalise(x)        
       elsif /^attribute::(?<attribute>\w+)/ =~ x
         r << [:attribute, attribute]        
       elsif x =~ /[\w\/]+/
@@ -122,7 +124,9 @@ class RexleXPathParser
     a = []
 
     # e.g. position()
-    if s =~ /^\w+\(/ then
+    if /^\w+\(\)$/ =~ s then
+      a << s
+    elsif s =~ /^\w+\(/ 
 
       found, token, remainder = lmatch(s.chars, '(',')')
 
@@ -148,12 +152,14 @@ class RexleXPathParser
       remainder = s
     end
 
+    return a if remainder.nil? or remainder.empty?
+
     operator = remainder.slice!(/^\s*\|\s*/)
 
     if operator then
       a.concat [operator, *match(remainder)]
     else
-      a << remainder if remainder.length > 0
+      a << remainder
     end
     
     a
@@ -165,19 +171,23 @@ class RexleXPathParser
   def scan(s)
 
     if s =~ /^\w+\(/ then
+      
       func = s.slice!(/\w+\(/)
       remainder = s[0..-2]
+
+      return func if remainder.empty?
+      
       if remainder =~ /^\w+\(/ then
         scan(remainder)
       else
         [func, match(remainder)]
       end
+      
     else
       s
     end
   end
       
   alias tokenise match  
-      
-  
+ 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   adFNS7+S3VVpQqBQ7hIMoNW5ldGHINll6Z0dbjsCO8OFGOkrnzt9ovLffOXuQHpT
   Gpk2If0KQMuV2Q==
   -----END CERTIFICATE-----
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk