From b422cda2ebfff4032f4c18271e96ad329c413dcc Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Mon, 30 Aug 2010 10:24:02 +0200 Subject: let String#strip_heredoc handle blank lines even if they are not indented --- activesupport/lib/active_support/core_ext/string/strip.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'activesupport/lib') diff --git a/activesupport/lib/active_support/core_ext/string/strip.rb b/activesupport/lib/active_support/core_ext/string/strip.rb index 84d279adbc..086c610976 100644 --- a/activesupport/lib/active_support/core_ext/string/strip.rb +++ b/activesupport/lib/active_support/core_ext/string/strip.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/object/try' + class String # Strips indentation in heredocs. # @@ -18,7 +20,7 @@ class String # Technically, it looks for the least indented line in the whole string, and removes # that amount of leading whitespace. def strip_heredoc - indent = chomp.scan(/^\s*/).min.size - gsub(/^\s{#{indent}}/, '') + indent = scan(/^[ \t]*(?=\S)/).min.try(:size) || 0 + gsub(/^[ \t]{#{indent}}/, '') end -end \ No newline at end of file +end -- cgit v1.2.3