diff options
author | José Valim <jose.valim@gmail.com> | 2012-05-28 13:46:53 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-05-28 13:46:53 -0700 |
commit | 68f23bea6b3eec48f26e87ab9cdf3ff361820831 (patch) | |
tree | 5a8f89d7dfb7d5f23081afbe189703b5e75bb4a5 /activesupport/lib/active_support | |
parent | f5e26bcb1a9a44b763d4d9ff117705312d1c650f (diff) | |
parent | d64b25438a82541f781a22f42e5cee44acd57737 (diff) | |
download | rails-68f23bea6b3eec48f26e87ab9cdf3ff361820831.tar.gz rails-68f23bea6b3eec48f26e87ab9cdf3ff361820831.tar.bz2 rails-68f23bea6b3eec48f26e87ab9cdf3ff361820831.zip |
Merge pull request #6522 from lest/patch-1
ActiveSupport require and dependencies
Diffstat (limited to 'activesupport/lib/active_support')
3 files changed, 1 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/access.rb b/activesupport/lib/active_support/core_ext/string/access.rb index 5c32a2453d..8fa8157d65 100644 --- a/activesupport/lib/active_support/core_ext/string/access.rb +++ b/activesupport/lib/active_support/core_ext/string/access.rb @@ -1,5 +1,3 @@ -require 'active_support/multibyte' - class String # If you pass a single Fixnum, returns a substring of one character at that # position. The first character of the string is at position 0, the next at diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb index 70f2dcb562..8644529806 100644 --- a/activesupport/lib/active_support/core_ext/string/filters.rb +++ b/activesupport/lib/active_support/core_ext/string/filters.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/string/multibyte' - class String # Returns the string, first removing all whitespace on both ends of # the string, and then changing remaining consecutive whitespace diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb index 4fe925f7f4..87b1d76026 100644 --- a/activesupport/lib/active_support/multibyte/chars.rb +++ b/activesupport/lib/active_support/multibyte/chars.rb @@ -76,7 +76,7 @@ module ActiveSupport #:nodoc: # # 'Café périferôl'.mb_chars.split(/é/).map { |part| part.upcase.to_s } # => ["CAF", " P", "RIFERÔL"] def split(*args) - @wrapped_string.split(*args).map { |i| i.mb_chars } + @wrapped_string.split(*args).map { |i| self.class.new(i) } end # Works like like <tt>String#slice!</tt>, but returns an instance of Chars, or nil if the string was not |