rexle-xpath 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 479dc6d4c1f6c7c3270c9966af77acad9efc3654
-  data.tar.gz: b739041bf097a2faf1deb484744ba3a62d6a5615
+  metadata.gz: 1d4007487547f7b0f7fb68a76cfb7fd1a8874517
+  data.tar.gz: 14422d54c789930a6175158910adf52ce4c4a70b
 SHA512:
-  metadata.gz: c4262efd3070eceb1d64dd5ca592f288392862f56ae5c8938418f30b8aedfb064137ec9db8fd2f25df807bc4954c6d1fc63468ced5bdf06f9a7d0fcbb2740544
-  data.tar.gz: f5e6f9a12c7399f4e2e3940ae91e7206b5d4e7172aa5de7f8104f02d56279ee3abdbf050430e79269ad779133276759bbdf883b1d5a2dcb6c5876765c8682b58
+  metadata.gz: 38453d905aa27badd643941901d433068da7980be5a1f4b9d6650ab1ff822492bd5f620336d6691728a25ec3115ee5632baa7e6e39ddd25713e3ee46c107da62
+  data.tar.gz: e302f65667fc1df02ba00c3bd188dba19c81f767752e7057a2152bff2911e930862da20e32cdabcca19044d7174260975ce03546d5740b7245e55cad3d3b1ec6

data/lib/rexle-xpath.rb

@@ -29,13 +29,19 @@ class RexleXPath
   end
 
   def parse(s)
-
-    case s
       
-    # it's an xpath function
-    when /^(\w+)\(\)$/
-      @node.method(($1).to_sym).call
+    # it's an xpath function only
+    if /^(?<name>\w+)\(\)$/ =~ s
+      
+      @node.method((name).to_sym).call
+      
+    # it's an element only
+    elsif /^(?<name>\w+)$/ =~ s
+      
+      select(@node, [name])
+      
     else
+      
       a = RexleXPathParser.new(s).to_a
       #puts 'a: ' + a.inspect
       query @node, a
@@ -122,19 +128,17 @@ class RexleXPath
     a = []
     a << query(node, xi.deep_clone)
     
-    node.each_recursive do |e|
-      a << query(e, xi.deep_clone)
-    end    
+    node.each_recursive {|e| a << query(e, xi.deep_clone) }
     
     a
   end
   
-  def select(node, args, xpath_instructions)
+  def select(node, args, xpath_instructions=[])
 
     debug :select, node: node, args: args, 
         xpath_instructions: xpath_instructions
     
-    a = node.elements.select {|x| x.name == args.first }
+    nodes_found = node.elements.select {|x| x.name == args.first }
     flat_xpi = xpath_instructions.flatten
 
     predicate = flat_xpi.first.to_s == 'predicate'
@@ -142,13 +146,13 @@ class RexleXPath
     if predicate and flat_xpi[1] == :index then
       
       i = flat_xpi[2].to_i - 1
-      return a[i]
+      return nodes_found[i]
       
     end
 
-    if xpath_instructions.any? and a.any? then
+    if xpath_instructions.any? and nodes_found.any? then
       
-      a.inject([]) do |r, child_node| 
+      nodes_found.inject([]) do |r, child_node| 
 
         # deep clone the xpath instructions
         xi = xpath_instructions.deep_clone
@@ -172,11 +176,15 @@ class RexleXPath
       end # /inject
       
     else
-      a
+      nodes_found
     end  # /if
     
   end
   
+  def text(node, args, xpath_instructions)
+    node.text
+  end
+  
   def value(node, args, xpath_instructions)
 
     operator, operand = args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle-xpath
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   05Hvy/ad61XnzWtun98claEIk/rC/TxPrbRaOd7vN99WxTy1xn8ElfLSx7CDDrTc
   qN5t1BlRcAgKNw==
   -----END CERTIFICATE-----
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-xpath-parser