rexle 1.0.28 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a1d04a3bbbebe6ac28ecef677f260599677823e
-  data.tar.gz: 26c280d22625e757fddfa47a8f264790f5244458
+  metadata.gz: 093ee31cda01f5cb6bed485d2bc513cf866373cf
+  data.tar.gz: e54e0d493cfde0d7411b28f517164fafc1790981
 SHA512:
-  metadata.gz: 0e15d380c21d430e9b0c9913f536a2a30a86c2fb2743cb52167a30e38e5967ab948015a804bbaf5f6cdf050727776cc5f6d67c9360e2d8f68e40c92eb369a80c
-  data.tar.gz: e4fe7b85fc12dc1cfea3eb9a702d6bd20a56431a2ded71a9f385a598f2c931d90dc081c646ab1fa639a0d632cf703ccbaa08c112c11eb0f1042ffb6d2120f635
+  metadata.gz: 8bede7d10f4ebe56bf7b05e34a9c8e020a81a4a789a1838f539d9c9508fd501ed8a1ac65bb0737622ccc66543532924e1e0416a23c13edb114ccedaafb32b7b0
+  data.tar.gz: 329aab680819126a9f58589aeb18252388edd4320fb8da7fef6c656f6609088abdf234f96e7d252b54af8c12b80962ece05e06d0c896d9c39c3b7feb9fd79aa0

data/lib/rexle.rb

@@ -12,6 +12,8 @@ include REXML
 
 # modifications:
 
+# 21-Oct-2014: partial feature: An Xpath containing //preceding-sibling and 
+#                       //following-sibling now works
 # 19-Oct-2014: feature: An XPath containing the attribute @class is 
 #              now treated as a type of CSS selector storage area
 #              feature: Implemented Rexle::Element#previous_element and
@@ -345,6 +347,7 @@ class Rexle
     
     def xpath(path, rlist=[], &blk)
 
+      #return if path[/^(?:preceding|following)-sibling/]
       r = filter_xpath(path, rlist=[], &blk)
       r.is_a?(Array) ? r.compact : r      
     end
@@ -489,9 +492,35 @@ class Rexle
       #jr101013  return  [self]
       else
 
-        return_elements = @child_lookup.map.with_index.select do |x|    
-          (x[0][0] == element_name || element_name == '.') or \
-            (element_name == '*' && x[0].is_a?(Array))
+        if element_name.is_a? String then
+          ename, raw_selector = (element_name.split('::',2)).reverse
+          
+          selector = case raw_selector
+            when 'following-sibling' then 1
+            when 'preceding-sibling' then -1
+          end
+          
+        else
+          ename = element_name
+        end        
+        
+        return_elements = @child_lookup.map.with_index.select do |x|
+                    
+          (x[0][0] == ename || ename == '.') or \
+            (ename == '*' && x[0].is_a?(Array))
+        end
+        
+        if selector then
+          ne = return_elements.inject([]) do |r,x| 
+            i = x.last + selector
+            if i >= 0 then
+              r << i
+            else
+              r
+            end
+          end
+
+          return_elements = ne.map {|x| [@child_lookup[x], x] if x}
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexle
 version: !ruby/object:Gem::Version
-  version: 1.0.28
+  version: 1.0.29
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   UOGKUMV5RApHDnC0ywMYNe0HK7qMSTP5YLKs8JUjNxpc5jl8+o3D3sHkNN4DzbQm
   jVfzDZ+niKvAUA==
   -----END CERTIFICATE-----
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexleparser