aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAntoine Lyset <antoinelyset+github@gmail.com>2013-01-22 22:44:53 +0100
committerAntoine Lyset <antoinelyset+github@gmail.com>2013-01-22 22:46:11 +0100
commitb5245da94a7c7667b57bb2184fa9aa7beb998da6 (patch)
treec0753bc982839bebe38e19afdede45f89051fdff /activesupport/lib
parente35d0a6112a73a05fc886b49b6df6ef26d2e3368 (diff)
downloadrails-b5245da94a7c7667b57bb2184fa9aa7beb998da6.tar.gz
rails-b5245da94a7c7667b57bb2184fa9aa7beb998da6.tar.bz2
rails-b5245da94a7c7667b57bb2184fa9aa7beb998da6.zip
Improve String#squish whitespaces matching
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/string/filters.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index e05447439a..1811f9f861 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -3,6 +3,8 @@ class String
# the string, and then changing remaining consecutive whitespace
# groups into one space each.
#
+ # Note that it handles both ASCII and Unicode whitespace like mongolian vowel separator (U+180E).
+ #
# %{ Multi-line
# string }.squish # => "Multi-line string"
# " foo bar \n \t boo".squish # => "foo bar boo"
@@ -12,8 +14,9 @@ class String
# Performs a destructive squish. See String#squish.
def squish!
- strip!
- gsub!(/\s+/, ' ')
+ gsub!(/\A[[:space:]]+/, '')
+ gsub!(/[[:space:]]+\Z/, '')
+ gsub!(/[[:space:]]+/, ' ')
self
end