rexle 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b1f961f21a086af4b24a1462048089ca8267a7
-  data.tar.gz: bcd0ebb6200230227939e647bc1196d3160e49bb
+  metadata.gz: 357f8b7df88a90b74139dae305506bea4fc60484
+  data.tar.gz: ed9fe8a06e4ef7dea9b85783b82da30bde2b648c
 SHA512:
-  metadata.gz: c0dc025274b899cffb1d8e33fae29ce96f95561f1d94ab959b6995b1fbf4478d588933aef747c95df33e63719c7a6fceff6d5e8884149be3068ad6039ae4d74d
-  data.tar.gz: 56c6338919840b9ede0a74553f3c9d0b8712932864c73ff5bb8f3c7f5ea8a9feb9b6e428140039ca15542af7dc696b7f303ce3d68a45f396633d86aa30eed043
+  metadata.gz: 30b7b83180b6da2d9e68e266fcb7142607b74ae8590df652d4fa6a8980e48320db0fe8d37d61a0d2892487bfffe92ec0457d206e07eea23767d61ebeaab22029
+  data.tar.gz: 1c457f03cb94a6e16e6cdbd9b7a94685190b9075e2d2bb9a7c6162c99b07722b5635df05ad2603f26e54eea8965ccf5c31c6eac21bc0d47e7f8f0ea2359ee455

data/lib/rexle.rb

@@ -11,6 +11,8 @@ require 'cgi'
 
 # modifications:
 
+# 07-Feb-2015: Implemented XPath function last() e.g. 
+#                                       doc.root.xpath('records/item[last()]')
 # 05-Feb=2015: bug fix: 
 #                  Rexle::Element#texts now transforms all items to a String
 # 04-Feb-2015: An xpath containing text() now calls texts() to 
@@ -411,12 +413,17 @@ class Rexle
     end
     
     def filter_xpath(path, rlist=[], &blk)
-
+      
       # is it a function
       fn_match = path.match(/^(\w+)\(["']?([^\)]*)["']?\)(?:\[(.*)\])?$/)
+      end_fn_match = path.slice!(/\[\w+\(\)\]$/)
+      
+      if end_fn_match then
+        
+        m = end_fn_match[1..-4]
+        [method(m.to_sym).call(xpath path)]
       
-      #    Array: proc {|x| x.flatten.compact}, 
-      if (fn_match and fn_match.captures.first[/^(attribute|@)/]) or fn_match.nil? then 
+      elsif (fn_match and fn_match.captures.first[/^(attribute|@)/]) or fn_match.nil? then 
 
         procs = {
           #jr061012 Array: proc {|x| block_given? ? x : x.flatten.uniq },
@@ -442,7 +449,7 @@ class Rexle
 
         results = raw_results
 
-        procs[results.class.to_s.to_sym].call(results) if results
+        procs[results.class.to_s.to_sym].call(results) if results              
         
       else
 
@@ -808,6 +815,7 @@ class Rexle
     def has_elements?() !self.elements.empty?                   end    
     def insert_after(node)   insert(node, 1)                    end          
     def insert_before(node)  insert(node)                       end
+    def last(a) a.last                                          end
     def map(&blk)    self.children.map(&blk)                    end        
     def root() self                                             end 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser