rexle-xpath-parser 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eab4821ed8ede5bd6583130f1b8010e6be40f006
-  data.tar.gz: 7020ccef47cd7f31489057b3c6a7f27749e4bc3b
+  metadata.gz: e83436a145b867565019bd5bf8b2a2028fc7e59b
+  data.tar.gz: e4b6fffcd15477d8576a7c4f6fd4cce940a7bf84
 SHA512:
-  metadata.gz: be752255841e13d4c23bf81b501123df2d07e6887f21d27060d21cc8b92be4fb2d4c85b3ebe48bd04a5ca00a81b67869cd0e99cabd45de31e8321afa15565249
-  data.tar.gz: 16804a1b8ea249903b318a4b39b4e29e6cc0b972c30dc0f073e1a0aedbe3e255728230a2110d52c63d52df51f2ddb4c97fecb647951485ff85a205f5a50b1cfd
+  metadata.gz: a6a435fdf7d5bdd5112bfa582dc297309b2abfe5fd76af224729542f13bf85a1a06cd3131a5b72204aec2601ec221174967791d19c04cfc5d0a2fd1537088995
+  data.tar.gz: cbc71821bd6d7449369b1e997780a7c023551cad540851c264cd52078f695e3420409da494c958b43f2882043c4bd4d274b73a1934acaf2eb866b58340f83689

checksums.yaml.gz.sig

@@ -1 +1 @@
-1b�bI���(���|My+�K�>-y[A]C�������@��>���`w��CQ�؋ȯBl`?��;C8<|ʮ�ګ�H�bIZ*�'p�T���j]��z������h�+���#ib6wP���I�X����:��}�"��v�d�2߅�&�z(�;̱K!���hGx��Wg��޽����K���->�Au�x<t��C�]( [B�:
+��=6�������8�kt��=�q��S��߃�C�WD���E�Ж8$O^ŕ��a�D����4�Ol�����!�B��%�^��c�?Owy���F*��y����R�N
����T�|ޠ���A���Hz	��e4���eF��]�áX���Q�Z믗d1�z�3�#��-}���/�����&���o���u-s��v�e9���*Ÿ�@6C����"�0��IM.��`|P*tǘ9���x@��S$

data/lib/rexle-xpath-parser.rb

@@ -10,7 +10,9 @@ class RexleXPathParser
   def initialize(string)
     
     tokens = tokenise string
+    #puts 'tokens: ' + tokens.inspect
     nested_tokens = tokens.map {|x| scan(x)}
+    #puts 'nested_tokens: ' + nested_tokens.inspect
     @to_a = functionalise nested_tokens
     
   end
@@ -24,9 +26,19 @@ class RexleXPathParser
 
     a.map do |x|
 
-      if x =~ /\w+\[/ then
-        epath, predicate = x.match(/^([^\[]+)\[([^\]]+)\]/).captures
-        epath.split('/').map {|e| [:select, e]} + [:predicate, predicate]
+      if x =~ /[\w\/]+\[/ then
+        
+        epath, predicate, remainder = x.match(/^([^\[]+)\[([^\]]+)\](.*)/).captures
+        
+        r = if remainder.length > 0 then
+          remainder.slice!(0) if remainder[0] == '/'          
+          r = functionalise(match(remainder))
+        else
+          []
+        end
+        
+        epath.split('/').map {|e| [:select, e]} + [:predicate, predicate] + r
+        
       elsif x =~ /\|/
         [:union] 
       elsif x =~ /\w+\(/
@@ -63,7 +75,35 @@ class RexleXPathParser
 
     [c, token.join, remainder]
   end
+
   
+  # matches a right bracket for a left bracket which has already been found. 
+  #
+  def rmatch(a, lchar, rchar)
+
+    token = []
+    c = a.first
+    token << c until (c = a.shift; c == lchar or c == rchar or a.empty?)
+    token << c
+
+    if c == lchar then
+      
+      found, tokenx, remainderx = rmatch(a, lchar, rchar)
+      token << tokenx
+
+      # find the rmatch for the starting token
+      found, tokenx, remainderx = rmatch(a, lchar, rchar)        
+      c = found
+      token << tokenx
+      remainder = remainderx
+      
+    elsif c = rchar
+      remainder = a.join
+    end
+
+    [c, token.join, remainder]
+  end
+
   # tokeniser e.g. "a | d(c)" #=> ["a", " | ", "d(c)"] 
   #
   def match(s)
@@ -78,11 +118,19 @@ class RexleXPathParser
         a << token
       end
 
-    elsif s =~ /^\w+\[/
+    elsif s =~ /^[\w\/]+\[/
+
       found, token, remainder = lmatch(s.chars, '[',']') 
       a << token
+      a2 = match remainder
+
+      token << a2.first if  a2.first 
+      a.concat a2[1..-1]
+
+      a2
+
     else
-      token = s.slice!(/\w+/)
+      token = s.slice!(/^[\w\/]+/)
       a << token
       remainder = s
     end
@@ -95,33 +143,7 @@ class RexleXPathParser
     
     a
   end
-   
-  # matches a right bracket for a left bracket which has already been found. 
-  #
-  def rmatch(a, lchar, rchar)
-
-    token = []
-    c = a.first
-    token << c until (c = a.shift; c == lchar or c == rchar or a.empty?)
-    token << c
-
-    if c == lchar then
-      
-      found, tokenx, remainderx = rmatch(a, lchar, rchar)
-      token << tokenx
 
-      # find the rmatch for the starting token
-      found, tokenx, remainderx = rmatch(a, lchar, rchar)        
-      c = found
-      token << tokenx
-      remainder = remainderx
-      
-    elsif c = rchar
-      remainder = a.join
-    end
-
-    [c, token.join, remainder]
-  end
 
   # accepts a token and drills into it to identify more tokens beneath it
   #
@@ -141,5 +163,6 @@ class RexleXPathParser
   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.1
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   adFNS7+S3VVpQqBQ7hIMoNW5ldGHINll6Z0dbjsCO8OFGOkrnzt9ovLffOXuQHpT
   Gpk2If0KQMuV2Q==
   -----END CERTIFICATE-----
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk