Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/pitchfork.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ def builder(ru, op)
when /\.ru$/
raw = File.read(ru)
raw.sub!(/^__END__\n.*/, '')
eval("Rack::Builder.new {(\n#{raw}\n)}.to_app", TOPLEVEL_BINDING, ru)
lines = raw.lines
trailing_comments_index = lines.index { |line| !line.start_with?('#') }
prelude = lines[0...trailing_comments_index].join
raw = lines[trailing_comments_index..-1].join

eval("#{prelude}\nRack::Builder.new do\n#{raw}\nend.to_app\n", TOPLEVEL_BINDING, ru)
else
require ru
Object.const_get(File.basename(ru, '.rb').capitalize)
Expand Down
9 changes: 9 additions & 0 deletions test/integration/frozen_string.ru
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# frozen_string_literal: true

run lambda { |_env|
if 'test'.frozen?
[200, {}, []]
else
[500, {}, []]
end
}
15 changes: 15 additions & 0 deletions test/integration/test_rack_pragmas.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# frozen_string_literal: true
require 'integration_test_helper'

class RackPragmasTest < Pitchfork::IntegrationTest
def test_keeps_rack_config_pragmas
addr, port = unused_port

pid = spawn_server("-E", "none", app: File.join(ROOT, "test/integration/frozen_string.ru"), lint: false, config: <<~CONFIG,)
listen "#{addr}:#{port}"
CONFIG

assert_healthy("http://#{addr}:#{port}")
assert_clean_shutdown(pid)
end
end