Changeset 141

Timestamp:

04/18/2007 14:36:15 (20 months ago)

Author:

why

Message:

• lib/hpricot/traverse.rb: honor the third dot in a Range, thanks MORGAN
  

Location:

trunk/lib/hpricot

Files:

• elements.rb (modified) (2 diffs)
• traverse.rb (modified) (2 diffs)

trunk/lib/hpricot/elements.rb

@@ -244 +244 @@
     # Given two elements, attempt to gather an Elements array of everything between
     # (and including) those two elements.
-    def self.expand(ele1, ele2)
+    def self.expand(ele1, ele2, excl=false)
       ary = []
+      offset = excl ? -1 : 0
 
       if ele1 and ele2
         # let's quickly take care of siblings
         if ele1.parent == ele2.parent
-          ary = ele1.parent.children[ele1.node_position..ele2.node_position]
+          ary = ele1.parent.children[ele1.node_position..(ele2.node_position+offset)]
         else
           # find common parent
@@ -267 +268 @@
 
           if child
-            ary = common_parent.children[0..child.node_position]
+            ary = common_parent.children[0..(child.node_position+offset)]
           end
         end

trunk/lib/hpricot/traverse.rb

@@ -60 +60 @@
       pos.map! do |r|
         if r.is_a?(Range) and r.begin.is_a?(String)
-          r = ((parent.index(r.begin)-si)..(parent.index(r.end)-si))
+          r = Range.new(parent.index(r.begin)-si, parent.index(r.end)-si, r.exclude_end?)
         end
         r
@@ -237 +237 @@
     def search(expr, &blk)
       if Range === expr
-        return Elements.expand(at(expr.begin), at(expr.end))
+        return Elements.expand(at(expr.begin), at(expr.end), expr.exclude_end?)
       end
       last = nil