2 files changed, 26 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb
index 5497b6f6f6..a83474f278 100644
--- a/activesupport/lib/active_support/core_ext/string.rb
+++ b/activesupport/lib/active_support/core_ext/string.rb
@@ -5,10 +5,12 @@ require 'active_support/core_ext/string/starts_ends_with'
 require 'active_support/core_ext/string/iterators' unless 'test'.respond_to?(:each_char)
 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'
     include ActiveSupport::CoreExtensions::String::StartsEndsWith
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
new file mode 100644
index 0000000000..3a69131ea0
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -0,0 +1,24 @@
+module ActiveSupport #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      module Filters
+        # Returns the string, first removing all whitespace on both ends of
+        # the string, and then changing remaining consecutive whitespace
+        # groups into one space each.
+        #
+        # Examples:
+        #   %{ Multi-line
+        #      string }.squish                   # => "Multi-line string"
+        #   " foo   bar    \n   \t   boo".squish # => "foo bar boo"
+        def squish
+          strip.gsub(/\s+/, ' ')
+        end
+
+        # Performs a destructive squish. See String#squish.
+        def squish!
+          replace(squish)
+        end
+      end
+    end
+  end
+end