Merge pull request rack#397 from ConradIrwin/line-in-rackup

Set __LINE__ correctly for rackup files.
barttenbrinke · Aug 26, 2012 · 279e6d2 · 279e6d2
2 parents d749c46 + 2fbf04b
commit 279e6d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lib/rack/builder.rb b/lib/rack/builder.rb
@@ -38,7 +38,7 @@ def self.parse_file(config, opts = Server::Options.new)
         end
         cfgfile.sub!(/^__END__\n.*\Z/m, '')
         app = eval "Rack::Builder.new {\n" + cfgfile + "\n}.to_app",
-          TOPLEVEL_BINDING, config
+          TOPLEVEL_BINDING, config, 0
       else
         require config
         app = Object.const_get(::File.basename(config, '.rb').capitalize)

diff --git a/test/builder/line.ru b/test/builder/line.ru
@@ -0,0 +1 @@
+run lambda{ |env| [200, {'Content-Type' => 'text/plain'}, [__LINE__.to_s]] }
diff --git a/test/spec_builder.rb b/test/spec_builder.rb
@@ -197,5 +197,11 @@ def config_file(name)
       Rack::MockRequest.new(app).get("/").body.to_s.should.equal 'OK'
       $:.pop
     end
+
+    it "sets __LINE__ correctly" do
+      app, options = Rack::Builder.parse_file config_file('line.ru')
+      options = nil # ignored, prevents warning
+      Rack::MockRequest.new(app).get("/").body.to_s.should.equal '1'
+    end
   end
 end