rexle-xpath-parser 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b754ed1c9cd12d73362a3f1486e6ad1d228f2d16
-  data.tar.gz: 4455f9652ebe23bae65dcf8515c577095033d2a8
+  metadata.gz: 1efc1cfcaabc220aee650537721c02d544daee81
+  data.tar.gz: c1678f213e2d75ac6de6e2cd02107905b147ef49
 SHA512:
-  metadata.gz: 8f157bccb8348d5ee953bc8596ecf2db0024c152c2db78a5e1fee332b30993b1178b1578e70b9a705303af39e9afeab4ea9aa39ddae4d2fdb183141b4e302662
-  data.tar.gz: 5ed1d4c69105cd72f257d4e470f1bb2895262afebe8f49b4fd55d565a1e8663bb8869cd4d0c83e6937a326ba3083cc5ab673ed12e27e3bccce64488e7eae12a2
+  metadata.gz: 0840ba3af56bffdb9aa0ad72ad26a51698ef1cd0f3a69b33653bcefe12d5ce95c3ea89813051d80daa7ab04b1081f3d8caa1bce194f7301586fea9d144420a55
+  data.tar.gz: 1393af65fd02efd0f1a65f541faf1d4c4fde078b234a51bf9c98592b738d85bd3d835b3adf08ebb275d7ad73f6213de378dbbc884280d7adc3ed978a9076cc45

data/lib/rexle-xpath-parser.rb

@@ -22,21 +22,19 @@ class RexleXPathParser
   # maps the nested tokens to XPath functions, predicates, operators, 
   #                                                      and 1 or more elements
   #  
-  def functionalise(a)
+  def functionalise(a, r2=[])
 
-    a.inject([]) do |r,x|
-
-      #puts 'x: ' + x.inspect
+    a.inject(r2) do |r,x|
       
       return r << functionalise(x) if x.is_a? Array
       
-      if /^(?<func>\w+)\(\)/ then
+      if /^(?<func>\w+)\(\)/ =~ x 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\/]+\[/
+      elsif x =~ /^[\w\/]+\[/
         
         epath, predicate, remainder = x.match(/^([^\[]+)\[([^\]]+)\](.*)/).captures
         
@@ -60,8 +58,17 @@ class RexleXPathParser
         r << [:index, x]
       elsif /^attribute::(?<attribute>\w+)/ =~ x
         r << [:attribute, attribute]        
-      elsif x =~ /[\w\/]+/
-        r << x.split('/').map {|e| [:select, e]}
+      elsif /^(?<name>\w+)\/?/ =~ x
+        
+        x.slice!(/^\w+\/?/)
+        r3 = [[:select, name]]
+
+        if x.length > 0 then
+          functionalise([x], r3) 
+
+        end
+        r << r3        
+
       end
     
     end
@@ -123,6 +130,7 @@ class RexleXPathParser
 
     a = []
 
+    #puts 's: ' + s.inspect
     # e.g. position()
     if /^\w+\(\)$/ =~ s then
       a << s
@@ -145,8 +153,10 @@ class RexleXPathParser
       a.concat a2[1..-1]
 
       a2
-
+    elsif /^(?<name>\w+)\// =~ s
+      a << name <<  match($')
     else
+
       token = s.slice!(/^[@?\w\/:]+/)
       a << token
       remainder = s

metadata

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