Changeset 8878

Timestamp:

02/16/08 00:02:30 (2 years ago)

Author:

nzkoz

Message:

Add String#squish and String#squish! to remove consecutive chunks of whitespace. Closes #11123 [jordi, Henrik N]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/string.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/string/filters.rb (added)
• trunk/activesupport/test/core_ext/string_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add String#squish and String#squish! to remove consecutive chunks of whitespace.  #11123 [jordi, Henrik N]
-
-* Serialize BigDecimals as Floats when using to_yaml. #8746 [ernesto.jimenez]

trunk/activesupport/lib/active_support/core_ext/string.rb

@@ -6 +6 @@
-require 'active_support/core_ext/string/unicode'
-require 'active_support/core_ext/string/xchar'
+require 'active_support/core_ext/string/filters'
-
-class String #:nodoc:
-  include ActiveSupport::CoreExtensions::String::Access
-  include ActiveSupport::CoreExtensions::String::Conversions
+  include ActiveSupport::CoreExtensions::String::Filters
-  include ActiveSupport::CoreExtensions::String::Inflections
-  if RUBY_VERSION < '1.9'

trunk/activesupport/test/core_ext/string_ext_test.rb

@@ -169 +169 @@
-  end
-
+  def test_string_squish
+    original = %{ A string with tabs(\t\t), newlines(\n\n), and
+                  many spaces(  ). }
+
+    expected = "A string with tabs( ), newlines( ), and many spaces( )."
+
+    # Make sure squish returns what we expect:
+    assert_equal original.squish,  expected
+    # But doesn't modify the original string:
+    assert_not_equal original, expected
+
+    # Make sure squish! returns what we expect:
+    assert_equal original.squish!, expected
+    # And changes the original string:
+    assert_equal original, expected
+  end
+
-  if RUBY_VERSION < '1.9'
-    def test_each_char_with_utf8_string_when_kcode_is_utf8