rexle-xpath 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e3af7b969033bc79cda32bf7ab3a65d9b54cc9e
-  data.tar.gz: 32b1214acd14d40e15c91ad212c13f6a9d279f9c
+  metadata.gz: c52bf8349947a0e61c02afe25159018258601053
+  data.tar.gz: 0559638004066be9017d6b69f3d7bcaf89345a01
 SHA512:
-  metadata.gz: c0fa3140fc5bf40451319decd8aa432ddb235f6c7f8e0f6de79da0fce45d0cfa04557458e7b12733c0b7a79f0c2fac4175b8dc2927b5b142acd631e2e686dd13
-  data.tar.gz: 253b0aa1f5a1aeeba768ff5d5dd3d0f0a80f0e5d6c58843bc2dfa0fd86431903f285c06af1ad209e70a0be1a7b7ee8f204dbbc92194560cac822a04c9f832ce4
+  metadata.gz: c2e1dd34f9b3d221083ad78c9a59e19c782a9c004afd677b979b17173988680cd31e72a0a21c7903930d1f304bdfb75cdcb41e7051f363b003794915ebefef6d
+  data.tar.gz: 06f0e9db668e535a4d99f6dc4e599ddbbb34d5f502decf469c88d332e487cd4e65f143d0f2fd564261b27a7a7df9e2c87efeb814fa8e919fd54bd695eeb647a4

data/lib/rexle-xpath.rb

@@ -9,7 +9,7 @@ class RexleXPath
 
   def initialize(node=nil)
 
-    @node = XPathObject.new(node)
+    @node = node
 
   end
 
@@ -25,22 +25,27 @@ class RexleXPath
     end
   end
 
-  def query(node, xpath_instructions)
-    
+  def query(node=@node, xpath_instructions)
+
     r = []
-    row = xpath_instructions.shift    
 
+    row = xpath_instructions.shift    
+    
     method_name, *args = row
+
+    return query node, row if row.first.is_a? Array
     
-    a = if method_name == :select then
+    result = if method_name.to_sym == :select then
+
+      method(:select).call node, args, xpath_instructions
       
-      r = node.select args.first
+    elsif method_name.to_sym == :text or method_name.to_sym == :value then
 
-      if xpath_instructions.any? and r.any? then
-        r.map {|child_node| query(child_node, xpath_instructions) }
-      else
-        r
-      end
+      method(:value).call node, args, xpath_instructions
+      
+    elsif method_name.to_sym == :predicate then
+
+      method(:predicate).call node, args, xpath_instructions      
       
     elsif row.is_a? Array then
       query node, row
@@ -48,32 +53,62 @@ class RexleXPath
       []
     end
 
-    a.flatten
+    result.is_a?(Array) ? result.flatten : result
 
   end
+  
+  private
+  
+  def predicate(node, args, xpath_instructions)
+    
+    a = args
+    r = query node, a
+    r ? r.any? : r
+  end
+  
+  def select(node, args, xpath_instructions)
 
-  class XPathObject
+    a = node.select args.first
 
-    def initialize(element)
-      @element = element
-    end
+    if xpath_instructions.any? and a.any? then
+      
+      a.inject([]) do |r, child_node| 
+        
+        r2 = query(child_node, xpath_instructions.clone)
+
+        if r2.is_a? Rexle::Element then
+          r << r2
+        elsif r2 == true
+          r << child_node
+        elsif r2 == false
+          r
+        else
+
+          if r2.any? then
+            r << r2
+          else
+            r
+          end
+        end
+        
+      end
+    else
+      a
+    end    
+  end
+  
+  def value(node, args, xpath_instructions)
 
-    def name()
-      @element.name()
-    end
+    operator, operand = args
     
-    def not()
-      @element
-    end
-    
-    def select(name)
-      @element.select(name)
-    end
-
-    def text()
-      @element.text()
+    r = case operator.to_sym
+    when :== then  node.text == operand
+    when :>  then  node.value > operand
+    when :<  then  node.value < operand
     end
 
+    r
+        
   end
-
+  
 end

metadata

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