diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 05:14:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-29 05:14:31 +0000 |
commit | 708a982cb493838cac25c575b14afd20aadba818 (patch) | |
tree | cbc2b336ac926526afbc094278179bff2ae31327 | |
parent | f54b960d30cc45d0f7592a49868a5fae4feab9e3 (diff) | |
download | ruby-708a982cb493838cac25c575b14afd20aadba818.tar.gz |
erb.rb: duplicated magic comments [Fix GH-1229]
* lib/erb.rb (ERB#def_method): insert def line just before the
first non-comment and non-empty line, not to leave duplicated
and stale magic comments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/erb.rb | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Jan 29 14:13:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/erb.rb (ERB#def_method): insert def line just before the + first non-comment and non-empty line, not to leave duplicated + and stale magic comments. + Fri Jan 29 11:13:33 2016 Jeremy Evans <code@jeremyevans.net> * lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as diff --git a/lib/erb.rb b/lib/erb.rb index 2e9fad98b4..7c22ec2efa 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -905,10 +905,9 @@ class ERB # erb.def_method(MyClass, 'render(arg1, arg2)', filename) # print MyClass.new.render('foo', 123) def def_method(mod, methodname, fname='(ERB)') - src = self.src - magic_comment = "#coding:#{@encoding}\n" + src = self.src.sub(/^(?!#|$)/) {"def #{methodname}\n"} << "\nend\n" mod.module_eval do - eval(magic_comment + "def #{methodname}\n" + src + "\nend\n", binding, fname, -2) + eval(src, binding, fname, -1) end end |