rexle-xpath-parser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83436a145b867565019bd5bf8b2a2028fc7e59b
-  data.tar.gz: e4b6fffcd15477d8576a7c4f6fd4cce940a7bf84
+  metadata.gz: ae7e450416eff042a5fd74f13acac2ccc8776e9f
+  data.tar.gz: 4370f0becd6d8b0a0bccdc3b238f296ba34e8242
 SHA512:
-  metadata.gz: a6a435fdf7d5bdd5112bfa582dc297309b2abfe5fd76af224729542f13bf85a1a06cd3131a5b72204aec2601ec221174967791d19c04cfc5d0a2fd1537088995
-  data.tar.gz: cbc71821bd6d7449369b1e997780a7c023551cad540851c264cd52078f695e3420409da494c958b43f2882043c4bd4d274b73a1934acaf2eb866b58340f83689
+  metadata.gz: 1d03728e8f4fc8956478bf2255bb1535834d1acb374fc936ced40ad703d4ebdec0287ee2e7c3321971e9369cafdbdf5d57887dbf98193ef516cb1972eda571e7
+  data.tar.gz: 6b6320900430ccf877871072f1f9bfd20e85f423f8d9ac22c95a231ec1968beea2025f248fd2e357d7bff75c112b1c07b0d53486c4252a83717bb45a5bb39a9f

checksums.yaml.gz.sig

@@ -1 +1 @@
-��=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$
+�T-��
�Z^�].=n�i���O��^B��W`��Ǝ����IDX\;GU��3��{{�;8I���s2�s���1�*KT��i0�;�F_K-�G���.Ob���=��I������SߘV���?gt�W��Ů��3-Q�V�]�]�\���2Y��&�h�֜�4��_�lQ��*�4��o�j�����88�U{9��X��L�����}>���˜?Gn9p/�W�RkR���I���n�)�����ߧ

data/lib/rexle-xpath-parser.rb

@@ -8,7 +8,7 @@ class RexleXPathParser
   attr_reader :to_a
 
   def initialize(string)
-    
+    #puts 'inside RExleXpathParser'
     tokens = tokenise string
     #puts 'tokens: ' + tokens.inspect
     nested_tokens = tokens.map {|x| scan(x)}
@@ -25,8 +25,8 @@ class RexleXPathParser
   def functionalise(a)
 
     a.map do |x|
-
-      if x =~ /[\w\/]+\[/ then
+      
+      r = if x =~ /[\w\/]+\[/ then
         
         epath, predicate, remainder = x.match(/^([^\[]+)\[([^\]]+)\](.*)/).captures
         
@@ -37,8 +37,11 @@ class RexleXPathParser
           []
         end
         
-        epath.split('/').map {|e| [:select, e]} + [:predicate, predicate] + r
+        epath.split('/').map {|e| [:select, e]} << \
+            [:predicate, RexleXPathParser.new(predicate).to_a] + r
         
+      elsif x =~ /=/  
+        [:text, :==, x[/=(.*)/,1].sub(/^["'](.*)["']$/,'\1')]
       elsif x =~ /\|/
         [:union] 
       elsif x =~ /\w+\(/
@@ -50,6 +53,8 @@ class RexleXPathParser
       elsif x.is_a? Array
         functionalise(x)
       end
+      
+      r
     
     end
 
@@ -110,6 +115,7 @@ class RexleXPathParser
 
     a = []
 
+    # e.g. position()
     if s =~ /^\w+\(/ then
 
       found, token, remainder = lmatch(s.chars, '(',')')
@@ -118,6 +124,7 @@ class RexleXPathParser
         a << token
       end
 
+    # e.g. b[c='45']
     elsif s =~ /^[\w\/]+\[/
 
       found, token, remainder = lmatch(s.chars, '[',']') 
@@ -139,6 +146,8 @@ class RexleXPathParser
 
     if operator then
       a.concat [operator, *match(remainder)]
+    else
+      a << remainder if remainder.length > 0
     end
     
     a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   adFNS7+S3VVpQqBQ7hIMoNW5ldGHINll6Z0dbjsCO8OFGOkrnzt9ovLffOXuQHpT
   Gpk2If0KQMuV2Q==
   -----END CERTIFICATE-----
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: rexle-xpath-parser