Rack::Builder: Allow more than one line of DATA-block

leahneukirchen · Oct 13, 2011 · ff47d6a · ff47d6a
1 parent bd3dcda
commit ff47d6a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/rack/builder.rb b/lib/rack/builder.rb
@@ -36,7 +36,7 @@ def self.parse_file(config, opts = Server::Options.new)
         if cfgfile[/^#\\(.*)/] && opts
           options = opts.parse! $1.split(/\s+/)
         end
-        cfgfile.sub!(/^__END__\n.*/, '')
+        cfgfile.sub!(/^__END__\n.*\Z/m, '')
         app = eval "Rack::Builder.new {\n" + cfgfile + "\n}.to_app",
           TOPLEVEL_BINDING, config
       else

diff --git a/test/builder/end.ru b/test/builder/end.ru
@@ -1,3 +1,5 @@
 run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['OK']] }
 __END__
 Should not be evaluated
+Neither should
+This