Permalink
Browse files

make sure the String::Access methods return strings, and not multibyt…

…e Char instances

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5299 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2c6b6e2 commit d73f32ce0004ddb1a8470ed50c9f8323ebc5613f @jamis jamis committed Oct 13, 2006
@@ -10,7 +10,7 @@ module Access
# "hello".at(4) # => "o"
# "hello".at(10) # => nil
def at(position)
- chars[position, 1]
+ chars[position, 1].to_s
end
# Returns the remaining of the string from the +position+ treating the string as an array (where 0 is the first character).
@@ -20,7 +20,7 @@ def at(position)
# "hello".from(2) # => "llo"
# "hello".from(10) # => nil
def from(position)
- chars[position..-1]
+ chars[position..-1].to_s
end
# Returns the beginning of the string up to the +position+ treating the string as an array (where 0 is the first character).
@@ -30,7 +30,7 @@ def from(position)
# "hello".to(2) # => "hel"
# "hello".to(10) # => "hello"
def to(position)
- chars[0..position]
+ chars[0..position].to_s
end
# Returns the first character of the string or the first +limit+ characters.
@@ -40,7 +40,7 @@ def to(position)
# "hello".first(2) # => "he"
# "hello".first(10) # => "hello"
def first(limit = 1)
- chars[0..(limit - 1)]
+ chars[0..(limit - 1)].to_s
end
# Returns the last character of the string or the last +limit+ characters.
@@ -50,7 +50,7 @@ def first(limit = 1)
# "hello".last(2) # => "lo"
# "hello".last(10) # => "hello"
def last(limit = 1)
- chars[(-limit)..-1] || self
+ (chars[(-limit)..-1] || self).to_s
end
end
end
@@ -84,6 +84,33 @@ def test_access
assert_equal 'x', 'x'.last(4)
end
+ def test_access_returns_a_real_string
+ hash = {}
+ hash["h"] = true
+ hash["hello123".at(0)] = true
+ assert_equal %w(h), hash.keys
+
+ hash = {}
+ hash["llo"] = true
+ hash["hello".from(2)] = true
+ assert_equal %w(llo), hash.keys
+
+ hash = {}
+ hash["hel"] = true
+ hash["hello".to(2)] = true
+ assert_equal %w(hel), hash.keys
+
+ hash = {}
+ hash["hello"] = true
+ hash["123hello".last(5)] = true
+ assert_equal %w(hello), hash.keys
+
+ hash = {}
+ hash["hello"] = true
+ hash["hello123".first(5)] = true
+ assert_equal %w(hello), hash.keys
+ end
+
def test_starts_ends_with
s = "hello"
assert s.starts_with?('h')

0 comments on commit d73f32c

Please sign in to comment.