Permalink
Browse files

Merged pull request #317 from jaredonline/master.

Change Array#from to return consistent results
  • Loading branch information...
2 parents 4ce14fb + 74634d4 commit 344c7766a5e9e8e360cdcbb581caa146aaf69a67 @dhh dhh committed Apr 26, 2011
@@ -3,10 +3,10 @@ class Array
#
# %w( a b c d ).from(0) # => %w( a b c d )
# %w( a b c d ).from(2) # => %w( c d )
- # %w( a b c d ).from(10) # => nil
+ # %w( a b c d ).from(10) # => %w()
# %w().from(0) # => %w()
def from(position)
- self[position..-1]
+ position > length ? [] : self[position..-1]
end
# Returns the beginning of the array up to +position+.
@@ -10,7 +10,7 @@ class ArrayExtAccessTests < Test::Unit::TestCase
def test_from
assert_equal %w( a b c d ), %w( a b c d ).from(0)
assert_equal %w( c d ), %w( a b c d ).from(2)
- assert_nil %w( a b c d ).from(10)
+ assert_equal %w(), %w( a b c d ).from(10)
end
def test_to

0 comments on commit 344c776

Please sign in to comment.