aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorman Clarke <norman@njclarke.com>2012-01-05 16:26:24 -0300
committerNorman Clarke <norman@njclarke.com>2012-01-05 16:26:24 -0300
commitb81bef531c9ebe08d39a4859b01824b390866675 (patch)
tree3917af524cbe1e9435d608023ae3b70e448207fd
parent46579340c0847c433c0f9c3f46c79cd4521d9234 (diff)
downloadrails-b81bef531c9ebe08d39a4859b01824b390866675.tar.gz
rails-b81bef531c9ebe08d39a4859b01824b390866675.tar.bz2
rails-b81bef531c9ebe08d39a4859b01824b390866675.zip
Just use Ruby's String#[]=
-rw-r--r--activesupport/lib/active_support/multibyte/chars.rb41
-rw-r--r--activesupport/test/multibyte_chars_test.rb5
2 files changed, 0 insertions, 46 deletions
diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb
index 1505d3e604..8cd3cfe455 100644
--- a/activesupport/lib/active_support/multibyte/chars.rb
+++ b/activesupport/lib/active_support/multibyte/chars.rb
@@ -80,47 +80,6 @@ module ActiveSupport #:nodoc:
@wrapped_string.split(*args).map { |i| i.mb_chars }
end
- # Like <tt>String#[]=</tt>, except instead of byte offsets you specify character offsets.
- #
- # Example:
- #
- # s = "Müller"
- # s.mb_chars[2] = "e" # Replace character with offset 2
- # s
- # # => "Müeler"
- #
- # s = "Müller"
- # s.mb_chars[1, 2] = "ö" # Replace 2 characters at character offset 1
- # s
- # # => "Möler"
- def []=(*args)
- replace_by = args.pop
- # Indexed replace with regular expressions already works
- if args.first.is_a?(Regexp)
- @wrapped_string[*args] = replace_by
- else
- result = Unicode.u_unpack(@wrapped_string)
- case args.first
- when Fixnum
- raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
- min = args[0]
- max = args[1].nil? ? min : (min + args[1] - 1)
- range = Range.new(min, max)
- replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
- when Range
- raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
- range = args[0]
- else
- needle = args[0].to_s
- min = index(needle)
- max = min + Unicode.u_unpack(needle).length - 1
- range = Range.new(min, max)
- end
- result[range] = Unicode.u_unpack(replace_by)
- @wrapped_string.replace(result.pack('U*'))
- end
- end
-
def slice!(*args)
chars(@wrapped_string.slice!(*args))
end
diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb
index f25e062873..0c6b03f15f 100644
--- a/activesupport/test/multibyte_chars_test.rb
+++ b/activesupport/test/multibyte_chars_test.rb
@@ -117,11 +117,6 @@ class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
end
end
- def test_indexed_insert_accepts_fixnums
- @chars[2] = 32
- assert_equal 'こに わ', @chars
- end
-
%w{capitalize downcase lstrip reverse rstrip upcase}.each do |method|
class_eval(<<-EOTESTS)
def test_#{method}_bang_should_return_self_when_modifying_wrapped_string