diff options
| -rw-r--r-- | lib/erb.rb | 10 | ||||
| -rw-r--r-- | test/erb/test_erb.rb | 19 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 25 insertions, 6 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index 55e7034ac5..055bec0ad3 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -389,13 +389,13 @@ class ERB @trim_mode = trim_mode @percent = percent if @trim_mode == '>' - @scan_reg = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m + @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m @scan_line = self.method(:trim_line1) elsif @trim_mode == '<>' @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join('|')}|\n|\z)/m @scan_line = self.method(:trim_line2) elsif @trim_mode == '-' - @scan_reg = /(.*?)(^[ \t]*<%\-|<%\-|-%>\n|-%>|#{(stags + etags).join('|')}|\z)/m + @scan_reg = /(.*?)(^[ \t]*<%\-|<%\-|-%>\r?\n|-%>|#{(stags + etags).join('|')}|\z)/m @scan_line = self.method(:explicit_trim_line) else @scan_reg = /(.*?)(#{(stags + etags).join('|')}|\n|\z)/m @@ -441,7 +441,7 @@ class ERB line.scan(@scan_reg) do |tokens| tokens.each do |token| next if token.empty? - if token == "%>\n" + if token == "%>\n" || token == "%>\r\n" yield('%>') yield(:cr) else @@ -479,7 +479,7 @@ class ERB next if token.empty? if @stag.nil? && /[ \t]*<%-/ =~ token yield('<%') - elsif @stag && token == "-%>\n" + elsif @stag && (token == "-%>\n" || token == "-%>\r\n") yield('%>') yield(:cr) elsif @stag && token == '-%>' @@ -542,7 +542,7 @@ class ERB yield('<%') elsif elem == '-%>' yield('%>') - yield(:cr) if scanner.scan(/(\n|\z)/) + yield(:cr) if scanner.scan(/(\r?\n|\z)/) else yield(elem) end diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 70713e6384..c87bf998fb 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -197,9 +197,28 @@ EOS assert_equal(ans, erb.result) end + def test_trim_line1_with_carriage_return + erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '>') + assert_equal("line\r\n" * 3, erb.result) + + erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '%>') + assert_equal("line\r\n" * 3, erb.result) + end + def test_trim_line2_with_carriage_return erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '<>') assert_equal("line\r\n" * 3, erb.result) + + erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '%<>') + assert_equal("line\r\n" * 3, erb.result) + end + + def test_explicit_trim_line_with_carriage_return + erb = @erb.new("<%- 3.times do -%>\r\nline\r\n<%- end -%>\r\n", nil, '-') + assert_equal("line\r\n" * 3, erb.result) + + erb = @erb.new("<%- 3.times do -%>\r\nline\r\n<%- end -%>\r\n", nil, '%-') + assert_equal("line\r\n" * 3, erb.result) end class Foo; end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-07-10" -#define RUBY_PATCHLEVEL 141 +#define RUBY_PATCHLEVEL 142 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 7 |