rexle 0.9.21 → 0.9.22

data/lib/rexle.rb

@@ -206,7 +206,7 @@ class Rexle
       #remove any pre'fixes
      #@rexle.prefixes.each {|x| xpath_value.sub!(x + ':','') }
       flag_func = false
-      
+
       xpath_value = raw_xpath_value.sub(/^\[/,'*[')
 
       if xpath_value[/^[\w\/]+\s*=.*/] then        
@@ -219,9 +219,16 @@ class Rexle
 
       #xpath_value.sub!(/^attribute::/,'*/attribute::')
       raw_path, raw_condition = xpath_value.sub(/^\/(?!\/)/,'').match(/([^\[]+)(\[[^\]]+\])?/).captures 
-
+      
       remaining_path = ($').to_s
-      a_path = raw_path.split('/')     
+      
+      r = raw_path[/([^\/]+)(?=\/\/)/,1] 
+      if r then
+        a_path = raw_path.split(/(?=\/\/)/,2)
+      else
+        a_path = raw_path.split('/',2)
+      end
+      
       condition = raw_condition if a_path.length <= 1
 
       if raw_path[0,2] == '//' then
@@ -243,7 +250,7 @@ class Rexle
 
       if element_part then
         unless element_part[/^@/] then
-          element_name = element_part[/^[\w:\*]+/]
+          element_name = element_part[/^[\w:\*\.]+/]
         else
           condition = element_part
           element_name = nil
@@ -263,12 +270,14 @@ class Rexle
         return rs
       else
 
-        return_elements = @child_lookup.map.with_index.select do |x|          
+        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))
         end
 
       end
+      
 
       if return_elements.length > 0 then
 

metadata

@@ -2,7 +2,7 @@
 name: rexle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-06 00:00:00 +01:00
+date: 2012-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency