rexle 0.1.0 → 0.1.1

data/lib/rexle.rb

@@ -19,7 +19,7 @@ class Rexle
       @name, @value, @attributes = name, value, attributes
       raise "Element name must not be blank" unless name
       @child_elements = []
-      @child_lookup = {}
+      @child_lookup = []
     end
 
     def children()
@@ -31,19 +31,37 @@ class Rexle
     end
 
     def add_element(item)
-      @child_lookup[item.name] = item.value
+      @child_lookup << [item.name, item.attributes, item.value]
       @child_elements << item
-    end
+    end    
 
     def xpath(xpath_value)
 
       a = xpath_value.split('/')
-      element_name = a.shift
+      s = a.shift
+
+      element_name, condition = s.split(/\[/)
+      
+      if condition then
+        raw_items = condition.scan(/[\w]+=\'[^\']+\'|and/)
 
-      index = @child_lookup.keys.index(element_name)
-      if index then
+        items = raw_items.map do |x| 
+          name, value = x.split(/=/)
+          [name, (value ? value[1..-2] : '')]
+        end
+      end
+
+      return_elements = @child_lookup.map.with_index.select {|x| x[0][0] == element_name}
+        
+      count = return_elements.length
+      if count > 0 then
         if a.empty? then
-          @child_elements[index]
+          if count == 1 then
+            index = return_elements[0][-1]
+            @child_elements[index]
+          else
+            return_elements.map{|x| @child_elements[x.last]}            
+          end
         else
           @child_elements[index].xpath a.join
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rexle
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +01:00
+date: 2010-10-16 00:00:00 +01:00
 default_executable: 
 dependencies: []