rexle-xpath-parser 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efc1cfcaabc220aee650537721c02d544daee81
-  data.tar.gz: c1678f213e2d75ac6de6e2cd02107905b147ef49
+  metadata.gz: 8d1a70e9b5dadb2524bbf975079d68fc3baa07e1
+  data.tar.gz: 85c42b77a86566670ab43d72a5a4aec7036bdf61
 SHA512:
-  metadata.gz: 0840ba3af56bffdb9aa0ad72ad26a51698ef1cd0f3a69b33653bcefe12d5ce95c3ea89813051d80daa7ab04b1081f3d8caa1bce194f7301586fea9d144420a55
-  data.tar.gz: 1393af65fd02efd0f1a65f541faf1d4c4fde078b234a51bf9c98592b738d85bd3d835b3adf08ebb275d7ad73f6213de378dbbc884280d7adc3ed978a9076cc45
+  metadata.gz: 800c53f8e1669c600c70e0b545bec5f1cbb70803918e23527ac84a018e8ab1a9de70fe2d7a128a2b3039c5e196db55ab811c1728583a6d1ba24c46d119c11a4d
+  data.tar.gz: 768ecfc76b58daba89acdfc6f321e904b43b61a0bbadff2e9e3e7ece4a04168a18869a01080569cf4b8b6d5768a5c505ece596e40d78312e95a1aaff90753836

data/lib/rexle-xpath-parser.rb

@@ -34,7 +34,7 @@ class RexleXPathParser
         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
         
@@ -58,9 +58,9 @@ class RexleXPathParser
         r << [:index, x]
       elsif /^attribute::(?<attribute>\w+)/ =~ x
         r << [:attribute, attribute]        
-      elsif /^(?<name>\w+)\/?/ =~ x
+      elsif /^(?<name>[\w\*]+)\/?/ =~ x
         
-        x.slice!(/^\w+\/?/)
+        x.slice!(/^[\w\*]+\/?/)
         r3 = [[:select, name]]
 
         if x.length > 0 then
@@ -143,7 +143,7 @@ class RexleXPathParser
       end
 
     # e.g. b[c='45']
-    elsif s =~ /^[\w\/]+\[/
+    elsif s =~ /^[\w\/\*]+\[/
 
       found, token, remainder = lmatch(s.chars, '[',']') 
       a << token
@@ -153,11 +153,11 @@ class RexleXPathParser
       a.concat a2[1..-1]
 
       a2
-    elsif /^(?<name>\w+)\// =~ s
+    elsif /^(?<name>[\w\*]+)\// =~ s
       a << name <<  match($')
     else
 
-      token = s.slice!(/^[@?\w\/:]+/)
+      token = s.slice!(/^[@?\w\/:\*]+/)
       a << token
       remainder = s
     end

metadata

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