rexle-xpath-parser 0.1.14 → 0.1.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +4 -3
  3. data.tar.gz.sig +0 -0
  4. data/lib/rexle-xpath-parser.rb +6 -4
  5. metadata +17 -17
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8d1a70e9b5dadb2524bbf975079d68fc3baa07e1
4
- data.tar.gz: 85c42b77a86566670ab43d72a5a4aec7036bdf61
3
+ metadata.gz: fa050387a9eddb782bd701d39d7cc1eb863da574
4
+ data.tar.gz: cdadc2d6485266a68e4630715cdacba8c6dd641f
5
5
  SHA512:
6
- metadata.gz: 800c53f8e1669c600c70e0b545bec5f1cbb70803918e23527ac84a018e8ab1a9de70fe2d7a128a2b3039c5e196db55ab811c1728583a6d1ba24c46d119c11a4d
7
- data.tar.gz: 768ecfc76b58daba89acdfc6f321e904b43b61a0bbadff2e9e3e7ece4a04168a18869a01080569cf4b8b6d5768a5c505ece596e40d78312e95a1aaff90753836
6
+ metadata.gz: 3b183a75e9635652e04b808a1f9ec388fac1e6055827e4067b4f891cbc68ba6b8a527720fe8c4329e6f2b8ff0d8b700f91beebab63e9f7b6b6e6fecd1232dd2e
7
+ data.tar.gz: 96b256b3653b545698dc591521aa3ba8f772f3b06670dec74300fd2dab66cd36e27c3b800e6d5141136bdf4b05bc9bb3754cfc45a2f13a1de9351126f2c3b2cf
checksums.yaml.gz.sig CHANGED
@@ -1,3 +1,4 @@
1
- 9�']�i�$S�cv;w:�^]m����M�I��;��U�V�*
2
- ���|Lo��8Sx�d� l��޾4&��mւ#��e�JD�$�<�|Ŵ����R�[j)]z�R
3
- ���J�\yy)�0����f� v�F�[�E�wڷ�~�h�.�ku���ҽZ��H�J ���_�S��+�X�$�
1
+ �*�e.I��k���Z�����U��X�6h�� ��ڕ�}���4���p\!��D� �fQ��vhtӾ�w��n�Z����쭓��i��6�bWhu�U_��9>b��=d#9/
2
+ ���:����m�z��Tg��7p��[6��a���2L�韹u�g�ٷ`�(�Q�h�ސW�- :�>����em̽��8�!��„[�i�d諘�(�e�&v��
3
+ ����Z��%S���
4
+ �é�>���a��|�+
data.tar.gz.sig CHANGED
Binary file
data/lib/rexle-xpath-parser.rb CHANGED
@@ -25,7 +25,7 @@ class RexleXPathParser
25
25
  def functionalise(a, r2=[])
26
26
 
27
27
  a.inject(r2) do |r,x|
28
-
28
+
29
29
  return r << functionalise(x) if x.is_a? Array
30
30
 
31
31
  if /^(?<func>\w+)\(\)/ =~ x then
@@ -37,6 +37,10 @@ class RexleXPathParser
37
37
  elsif x =~ /^[\w\/\*]+\[/
38
38
 
39
39
  epath, predicate, remainder = x.match(/^([^\[]+)\[([^\]]+)\](.*)/).captures
40
+
41
+ r.concat epath.split('/').map {|e| [:select, e]} << \
42
+ [:predicate, RexleXPathParser.new(predicate).to_a]
43
+
40
44
 
41
45
  if remainder.length > 0 then
42
46
  remainder.slice!(0) if remainder[0] == '/'
@@ -45,8 +49,6 @@ class RexleXPathParser
45
49
  r
46
50
  end
47
51
 
48
- epath.split('/').map {|e| [:select, e]} << \
49
- [:predicate, RexleXPathParser.new(predicate).to_a] + r
50
52
 
51
53
  elsif x =~ /=/
52
54
  r[-1] << [:value, :==, x[/=(.*)/,1].sub(/^["'](.*)["']$/,'\1')]
@@ -157,7 +159,7 @@ class RexleXPathParser
157
159
  a << name << match($')
158
160
  else
159
161
 
160
- token = s.slice!(/^[@?\w\/:\*]+/)
162
+ token = s.slice!(/^[@?\w\/:\*\(\)]+/)
161
163
  a << token
162
164
  remainder = s
163
165
  end
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.14
4
+ version: 0.1.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
12
12
  -----BEGIN CERTIFICATE-----
13
13
  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
14
14
  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
15
- 8ixkARkWAmV1MB4XDTE1MDUyOTIwMzkzOFoXDTE2MDUyODIwMzkzOFowSDESMBAG
15
+ 8ixkARkWAmV1MB4XDTE2MDUyOTExMDc0N1oXDTE3MDUyOTExMDc0N1owSDESMBAG
16
16
  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
17
17
  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
18
- ggEBALsORT32wo5h6pPaRIzRX1ci1+6MqtyZKEQtjoHqC8VqKIWz1e2asDWfblsb
19
- rrR+dWbx93wAenlNrA/2SeZZYyX60Kd53nrDg8V6R53dXscjPhXMP61r1Af0B//N
20
- EarqaV1ftkuA4YFQI3v8zpAqaLSxsqb80JGeVt/9+hLctmnBpg12mEEECIOVfUjl
21
- 6BAjpT0xAao8lOJGpN1D/OH5nQU3/f5IOBmwBcJjs1vB4PT7yZnB2lYcSvLzaSpJ
22
- r1PLLLSR/Ha/RFs1353BU9JuSavnvQrW4tyJgh20dVtGJE8CY1KgwX3diTqlH/ct
23
- X+ySK2oRqgadB8o3YyDT2rB9jR0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
- DwQEAwIEsDAdBgNVHQ4EFgQUU2b3SAuNaDfReHTyaKlwRNpRANcwJgYDVR0RBB8w
18
+ ggEBAL/ruA6EEQpHqFsOQQr55evUeGTpOjFOtSRdSNE9bYwCqSC0US8iPNVmi325
19
+ mi3Xs8cULs3ApByLYzzmWEZZTn+oJ4ElqdFXRQ/aREOOoLSXuoo6oDM04xnkGeUd
20
+ 44JEDr7VTTBFUpaxejl3O1YKGMUzQFAfb9mvAXfDp7q41r1F6aDh6otqqg3IAS1Z
21
+ moIYHLxNirybsttPrL67Lh9k9MehH4joYqpgOAtK/mu+0MRXUFW1Tt9QZ9bsg/7Q
22
+ Tfg7F81qe4FVdJLy/FhsVV5pdbIPAYU4l1uxn/xTSRyt58vYNMTwmNgbWD8DCs38
23
+ junZScUJ2RKk4O+CbKHJpMjORocCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
+ DwQEAwIEsDAdBgNVHQ4EFgQUPRHGmnp681CcvDyHSV26wFKnuQIwJgYDVR0RBB8w
25
25
  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
26
- c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAlxp+b9iY
27
- yadeuYVXLipJFcxEwur46s3H2sgvLBgiYSS/hNM9TJNy22AhuTiBMDG9Vfl8Q2pp
28
- JJRFwnxMVI/t7CUHf+/wHKszoKP7HvFeeyhH/nbjWI5CCknbEiPnLv8emOXUg7gR
29
- t/KTNjV7IwKJ5WXGO/OZOzIUDsxARY4eiieFObcGv3+ISrYBDTtZcM3U+UZcZCri
30
- ZW1eKo87zpxPFRkhjOE73S2i7sVEk1fwlldgRwHxet0DdLD0eemnyvjooaLqMul1
31
- adFNS7+S3VVpQqBQ7hIMoNW5ldGHINll6Z0dbjsCO8OFGOkrnzt9ovLffOXuQHpT
32
- Gpk2If0KQMuV2Q==
26
+ c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAqLdVhVXh
27
+ K/frHOO5Yti1xb5jkvmu8Q/CnE3OB9Q2bmgYLbGZAq6QmNFvB+ut5tD/k4XfIkIz
28
+ SSRJf/hu0rlhQ2bO1LR0NP2THxnraaFnWBgjtO6ZCP7M/8QOcZRMYZPCt0C6HNon
29
+ ZlZ9M8a6f3jBgOGOp/jgCzr/RKrVKsePOSNgFcFxvPgJWVgtC89IuPEqoLZKG+SB
30
+ bbARqZ76Df6faRg4TCkpn9N8eoAPV54pAEHuKpfW4QkaIV12Brre7d5gjp5wfFG1
31
+ mkV2keVfUpfaTKNzUzo9lt/HSN8u98bD+dZh7rT5z8OBu6Kh0he35JvmyxOTg+Hg
32
+ u9W2yccAzoPxYA==
33
33
  -----END CERTIFICATE-----
34
- date: 2016-05-28 00:00:00.000000000 Z
34
+ date: 2016-05-29 00:00:00.000000000 Z
35
35
  dependencies: []
36
36
  description:
37
37
  email: james@r0bertson.co.uk
metadata.gz.sig CHANGED
Binary file