archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 10:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 58823: [Backport #11464]

Browse source 
erb.rb: Allow trimming carriage return

	when trim_mode is "<>", for Windows environments.

	[Bug #11464]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-07-09 20:04:25 +00:00
parent f5b840074d
commit 05215d0d80
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/erb.rb
View file

@ -392,7 +392,7 @@ class ERB
@scan_reg = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m @scan_reg = /(.*?)(%>\n|#{(stags + etags).join('|')}|\n|\z)/m
@scan_line = self.method(:trim_line1) @scan_line = self.method(:trim_line1)
elsif @trim_mode == '<>' elsif @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_line2) @scan_line = self.method(:trim_line2)
elsif @trim_mode == '-' elsif @trim_mode == '-'
@scan_reg = /(.*?)(^[ \t]*<%\-|<%\-|-%>\n|-%>|#{(stags + etags).join('|')}|\z)/m @scan_reg = /(.*?)(^[ \t]*<%\-|<%\-|-%>\n|-%>|#{(stags + etags).join('|')}|\z)/m
@ -457,7 +457,7 @@ class ERB
tokens.each do |token| tokens.each do |token|
next if token.empty? next if token.empty?
head = token unless head head = token unless head
if token == "%>\n" if token == "%>\n" || token == "%>\r\n"
yield('%>') yield('%>')
if is_erb_stag?(head) if is_erb_stag?(head)
yield(:cr) yield(:cr)

5
test/erb/test_erb.rb
View file

@ -197,6 +197,11 @@ EOS
assert_equal(ans, erb.result) assert_equal(ans, erb.result)
end 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)
end
class Foo; end class Foo; end
def test_def_class def test_def_class

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.2" #define RUBY_VERSION "2.4.2"
#define RUBY_RELEASE_DATE "2017-07-10" #define RUBY_RELEASE_DATE "2017-07-10"
#define RUBY_PATCHLEVEL 140 #define RUBY_PATCHLEVEL 141
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7