diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-13 19:04:28 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-07-13 19:04:28 -0700 |
commit | 003c6516dcffcd846d1f257a16062cea657cbd33 (patch) | |
tree | 056755a0470b3e958d2ba25fbab6b3d12005dcde | |
parent | 54ab63ee77ea850af301cdc2df425e3b182e0c1e (diff) | |
parent | 9c60860322d58e1a2fcd42f1a21ec86ec2caa50b (diff) | |
download | rails-003c6516dcffcd846d1f257a16062cea657cbd33.tar.gz rails-003c6516dcffcd846d1f257a16062cea657cbd33.tar.bz2 rails-003c6516dcffcd846d1f257a16062cea657cbd33.zip |
Merge pull request #2052 from amatsuda/fullwidth_blank
treat fullwidth whitespace as a blank character
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/blank.rb | 6 | ||||
-rw-r--r-- | activesupport/test/core_ext/blank_test.rb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb index 8221dc4abe..677ec1141d 100644 --- a/activesupport/lib/active_support/core_ext/object/blank.rb +++ b/activesupport/lib/active_support/core_ext/object/blank.rb @@ -86,14 +86,18 @@ class Hash end class String + # 0x3000: fullwidth whitespace + NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]! + # A string is blank if it's empty or contains whitespaces only: # # "".blank? # => true # " ".blank? # => true + # " ".blank? # => true # " something here ".blank? # => false # def blank? - self !~ /\S/ + self !~ NON_WHITESPACE_REGEXP end end diff --git a/activesupport/test/core_ext/blank_test.rb b/activesupport/test/core_ext/blank_test.rb index 97c6b213ba..98ce8541a3 100644 --- a/activesupport/test/core_ext/blank_test.rb +++ b/activesupport/test/core_ext/blank_test.rb @@ -2,7 +2,7 @@ require 'abstract_unit' require 'active_support/core_ext/object/blank' class BlankTest < Test::Unit::TestCase - BLANK = [ EmptyTrue.new, nil, false, '', ' ', " \n\t \r ", [], {} ] + BLANK = [ EmptyTrue.new, nil, false, '', ' ', " \n\t \r ", ' ', [], {} ] NOT = [ EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], { nil => 0 } ] def test_blank |