rexle-xpath-parser 0.1.17 → 0.1.18

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 64947852450fbb3e30dbc340bd40102727678360
4
- data.tar.gz: 2ed0d2a058e107b5fc7c909f9f6dbf9727d31f6d
3
+ metadata.gz: 033a1413cf694a63b30d9b3c1d227522e7d7272f
4
+ data.tar.gz: b0a3a467c18bb03b282c19af964b5c8c43a55f00
5
5
  SHA512:
6
- metadata.gz: 136cbeed6ba632da0639926c11fa931ac1bb1a01a41faaa35de11bc58dea7c05aaaec53fc175648f6fa76fac5cfdf820c3b46c9d02094c1303cd75d346e01fb0
7
- data.tar.gz: c0a4194989e08fd5bfb72086b4c70dce2061c38690d555ac88e15526e6713f7227a67d351dbb788bbcf59a47087a724faf948ee4c08fa594ca2059d01dda65d0
6
+ metadata.gz: 22f15c9d1d02917210117fd9bd94c9432fec3df417d511f07a2efd27d47bd62afeb340e46ef099e76472f41996cb5c466bf955c78bf751de1a82d35b459eb4ee
7
+ data.tar.gz: d4ee4a855c76449e1d1ed783110df04b49c3fa25edadf2b5cccff5d38aaa7fcb0de24ef375ad677bb3712b5bf900e5e3b8d74e979750b2ea396f42dac6a82f8b
checksums.yaml.gz.sig CHANGED
Binary file
@@ -26,8 +26,6 @@ class RexleXPathParser
26
26
 
27
27
  a.inject(r2) do |r,x|
28
28
 
29
- #puts 'x: ' + x.inspect
30
-
31
29
  return r << functionalise(x) if x.is_a? Array
32
30
 
33
31
  if /^(?<func>\w+)\(\)/ =~ x then
@@ -57,6 +55,8 @@ class RexleXPathParser
57
55
  r[-1] << [:value, :==, value.sub(/^["'](.*)["']$/,'\1')]
58
56
  elsif x =~ /\|/
59
57
  r << [:union]
58
+ elsif x =~ /\s+or\s+/
59
+ r << :|
60
60
  elsif x =~ /\w+\(/
61
61
  r << [x.chop.to_sym]
62
62
  elsif x =~ /\d+/
@@ -149,7 +149,7 @@ class RexleXPathParser
149
149
 
150
150
  # e.g. b[c='45']
151
151
  elsif s =~ /^[\w\/\*]+\[/
152
-
152
+
153
153
  found, token, remainder = lmatch(s.chars, '[',']')
154
154
  a << token
155
155
  a2 = match remainder
@@ -169,7 +169,7 @@ class RexleXPathParser
169
169
 
170
170
  return a if remainder.nil? or remainder.empty?
171
171
 
172
- operator = remainder.slice!(/^\s*\|\s*/)
172
+ operator = remainder.slice!(/^\s*(?:\||or)\s*/)
173
173
 
174
174
  if operator then
175
175
  a.concat [operator, *match(remainder)]
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rexle-xpath-parser
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.17
4
+ version: 0.1.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
31
31
  mkV2keVfUpfaTKNzUzo9lt/HSN8u98bD+dZh7rT5z8OBu6Kh0he35JvmyxOTg+Hg
32
32
  u9W2yccAzoPxYA==
33
33
  -----END CERTIFICATE-----
34
- date: 2016-06-02 00:00:00.000000000 Z
34
+ date: 2016-07-09 00:00:00.000000000 Z
35
35
  dependencies: []
36
36
  description:
37
37
  email: james@r0bertson.co.uk
metadata.gz.sig CHANGED
@@ -1,3 +1 @@
1
- g��2��8����|`�eaF��L�܃u�w\Mt�� �\;8��qvctj "y�ѳ�ŋ�
2
- �b�04�KAv��� ���W�@?��
3
- ��uF���h���\����4�y/ � J�o+&(+�|�s�N��Ƒ/�(+n�����,�h����h��D)Q�xq1�>��&qU�&BF�*����&Σh�#=��LP=�z���1M+ $��֫�&3  ��#�h���4�G嗕śFv+������c���^v1
1
+ ��rEO����r �F [� ��Y�����n��R8�$��������� qA�?�sd˝��i��R��7܃����"ł:f��l��sM���j#���R^�YVz�g ĭӱ��cd��c�u>��E��&����99�8�4��g���4�.��v��seM��5Y���'j0 �R�|�s�����V k�:;���-��?����1�!@�z4!���|�E@��k<��?���u<�