rexle-xpath-parser 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033a1413cf694a63b30d9b3c1d227522e7d7272f
-  data.tar.gz: b0a3a467c18bb03b282c19af964b5c8c43a55f00
+  metadata.gz: 0eb094bc9685658e7742f8cf6b12b640f057ac2c
+  data.tar.gz: b18b160e6dc524e45ed86ba2a4b3a33cb67a9e62
 SHA512:
-  metadata.gz: 22f15c9d1d02917210117fd9bd94c9432fec3df417d511f07a2efd27d47bd62afeb340e46ef099e76472f41996cb5c466bf955c78bf751de1a82d35b459eb4ee
-  data.tar.gz: d4ee4a855c76449e1d1ed783110df04b49c3fa25edadf2b5cccff5d38aaa7fcb0de24ef375ad677bb3712b5bf900e5e3b8d74e979750b2ea396f42dac6a82f8b
+  metadata.gz: a16e477fec94065135404d1026d3011ae1d3901075de32e1034844ef6fbaee3431a1c10235e3a9fa3c125ad09a16a84b24cd1475e37ccbe019f2348df3b1f9dd
+  data.tar.gz: 2d580efe36ce525a3ad51f51bc6e5acbe844acf340a9ce6cf2e68e8853cb12f5f1a11fd78ec8b4d626da477f0385a474f25be0ef634d4b0f51e25611583df606

checksums.yaml.gz.sig

@@ -1 +1,2 @@
- ��4h�o+z+�e_�D��0��7Yp�'^����[7D?�n{��'pAջ�iN��Չ�[�c۞��/?Xx�������xs#��֟b��@�~E�8IVW��Z���F�Tb��|3IF�Z�>�ر8EYChG
+V�e�nL{�aMB�BsGX��-�ݱ$N1+"�u�3~f��i9IN�3s˔���g�>Hv�F�g%�\:�Ki
��H����<�/�wQ���fNeg��ĿS�U����eWLX��_�,-Y�c���"������C�W�QB��Y�ӱ$�R�-�gE۷���z�N羟?��$���lc'f����ُ�m
+\$����,"�4Ԃ�L������d��i������&

data/lib/rexle-xpath-parser.rb

@@ -24,14 +24,23 @@ class RexleXPathParser
   #  
   def functionalise(a, r2=[])
 
-    a.inject(r2) do |r,x|
+    r4 = a.inject(r2) do |r,x|
       
       return r << functionalise(x) if x.is_a? Array
       
-      if /^(?<func>\w+)\(\)/ =~ x then
-        r << func.to_sym
+      if x =~ /^or$/ then
+        r << :|
+
+      elsif /^(?<func>\w+)\(\)(?:\s+(?<operator>[<>=])\s+(?<value>\w+))?/ =~ x
+
+        r << if operator then
+            x = ''
+          [func.to_sym, operator.to_sym, value]
+        else
+          func.to_sym
+        end
       elsif /^@(?<attribute>[\w\/]+)/ =~ x
-        r << [[:attribute, attribute]]
+        r << [:attribute, attribute]
       elsif x =~ /^\/\//
         r << [:recursive, *RexleXPathParser.new(x[2..-1]).to_a]                
       elsif x =~ /^[\w\/\*]+\[/
@@ -50,9 +59,9 @@ class RexleXPathParser
         end
         
       elsif /!=(?<value>.*)/  =~ x
-        r[-1] << [:value, :'!=', value.sub(/^["'](.*)["']$/,'\1')]        
+        r << [:value, :'!=', value.sub(/^["'](.*)["']$/,'\1')]        
       elsif /=(?<value>.*)/  =~ x
-        r[-1] << [:value, :==, value.sub(/^["'](.*)["']$/,'\1')]
+        r << [:value, :==, value.sub(/^["'](.*)["']$/,'\1')]
       elsif x =~ /\|/
         r << [:union] 
       elsif x =~ /\s+or\s+/
@@ -63,21 +72,25 @@ class RexleXPathParser
         r << [:index, x]
       elsif /^attribute::(?<attribute>\w+)/ =~ x
         r << [:attribute, attribute]        
-      elsif /^(?<name>[\w\*\.]+)\/?/ =~ x
+      elsif x.is_a? String and /^(?<name>[\w\*\.]+)\/?/ =~ x
         
         x.slice!(/^[\w\*\.]+\/?/)
-        r3 = [[:select, name]]
+        r3 = [:select, name]
 
         if x.length > 0 then
           functionalise([x], r3) 
 
         end
         r << r3        
+      else
 
+        r
       end
     
     end
 
+    r4
+
   end
   
   # matches a left bracket with a right bracket recursively if necessary
@@ -134,11 +147,21 @@ class RexleXPathParser
   def match(s)
 
     a = []
-
-    #puts 's: ' + s.inspect
+    
+    # it's a function with no arguments
     # e.g. position()
-    if /^\w+\(\)$/ =~ s then
+    if /^\w+\(\)/ =~ s then
+
       a << s
+
+    elsif /^\w+\(\)/ =~ s then
+      
+      fn, operator, val = s.match(/^(\w+)\(\)\s+(<|>|=)\s+(\w+)/).captures
+
+      a << [fn.to_sym, operator.to_sym, val]
+      return a
+      
+    # it's a function with arguments      
     elsif s =~ /^\w+\(/ 
 
       found, token, remainder = lmatch(s.chars, '(',')')
@@ -147,6 +170,7 @@ class RexleXPathParser
         a << token
       end
 
+    # it contains a predicate
     # e.g. b[c='45']
     elsif s =~ /^[\w\/\*]+\[/
       
@@ -158,16 +182,21 @@ class RexleXPathParser
       a.concat a2[1..-1]
 
       a2
+      
+    # it's an element name e.g. b
     elsif /^(?<name>[\w\*]+)\// =~ s
       a << name <<  match($')
+      
+    # it's something else e.g. @colour='red'
     else
 
       token = s.slice!(/^[@?\w\/:\*\(\)\.]+/)
+
       a << token
       remainder = s
     end
 
-    return a if remainder.nil? or remainder.empty?
+    return a if remainder.nil? or remainder.strip.empty?
 
     operator = remainder.slice!(/^\s*(?:\||or)\s*/)
 
@@ -185,7 +214,7 @@ class RexleXPathParser
   #
   def scan(s)
 
-    if s =~ /^\w+\(/ then
+    if s =~ /^\w+\([^\)]/ then
       
       func = s.slice!(/\w+\(/)
       remainder = s[0..-2]
@@ -203,6 +232,22 @@ class RexleXPathParser
     end
   end
       
-  alias tokenise match  
+  #alias tokenise match  
+  def tokenise(s)
+    
+    if s =~ /\[/ then
+      match s
+    else
+      s.split(/(?=\bor\b)/).flat_map do |x| 
+
+        if /^or\b\s+(?<exp>.*)/ =~ x then
+          match(exp).unshift 'or'
+        else
+          match x
+        end
+
+      end
+    end
+  end
  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   mkV2keVfUpfaTKNzUzo9lt/HSN8u98bD+dZh7rT5z8OBu6Kh0he35JvmyxOTg+Hg
   u9W2yccAzoPxYA==
   -----END CERTIFICATE-----
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk

metadata.gz.sig

@@ -1 +1,2 @@
-��rE�O����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<�
+t�^]�s`�
+5���gX��v~$io��ȩi�1R��d(Jr������E�AX����*�H���^`�51\�Ve��5��7�:5��r���=4C�Z�Xu�/}/��ޜ��pY�R	�)���o�o�]%C\tw�S`7