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
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: ${{matrix.ruby}} on ${{matrix.os}}
runs-on: ${{matrix.os}}-latest
env:
BUNDLER_GEMFILE: ${{matrix.gemfile}}
BUNDLE_GEMFILE: ${{matrix.gemfile}}

strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{matrix.os}}-latest
continue-on-error: ${{matrix.experimental}}
env:
BUNDLER_GEMFILE: ${{matrix.gemfile}}
BUNDLE_GEMFILE: ${{matrix.gemfile}}

strategy:
matrix:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
/gems.locked
/.covered.db
/external

*.lock
8 changes: 8 additions & 0 deletions gems/gems.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
source "https://rubygems.org"

gem "async-http"
gem "bake-test"
gem "bake-test-external"
gem "sus"
gem "sus-fixtures-async-http"
gem "covered"
2 changes: 1 addition & 1 deletion gems/rack-v1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Released under the MIT License.
# Copyright, 2022, by Samuel Williams.

eval_gemfile("../gems.rb")
eval_gemfile("gems.rb")

gem "rack", "~> 1.0"
2 changes: 1 addition & 1 deletion gems/rack-v2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Released under the MIT License.
# Copyright, 2022, by Samuel Williams.

eval_gemfile("../gems.rb")
eval_gemfile("gems.rb")

gem "rack", "~> 2.0"
2 changes: 1 addition & 1 deletion gems/rack-v3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# Released under the MIT License.
# Copyright, 2022, by Samuel Williams.

eval_gemfile("../gems.rb")
eval_gemfile("gems.rb")

gem "rack", "~> 3.0"
2 changes: 1 addition & 1 deletion lib/protocol/rack/adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
module Protocol
module Rack
module Adapter
if ::Rack::RELEASE >= "3"
if ::Rack.release >= "3"
IMPLEMENTATION = Rack3
else
IMPLEMENTATION = Rack2
Expand Down
4 changes: 3 additions & 1 deletion lib/protocol/rack/adapter/rack2.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ def wrap_headers(fields)

if key.start_with?('rack.')
meta[key] = value
else
elsif value.is_a?(String)
value.split("\n").each do |value|
headers[key] = value
end
else
headers[key] = value
end
end

Expand Down
15 changes: 15 additions & 0 deletions test/protocol/rack/adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@
end
end

with 'non-string header value' do
let(:app) do
lambda do |env|
[200, {'x-custom' => 123}, ["Hello World!"]]
end
end

let(:response) {client.get("/")}

it "get valid response" do
expect(response.read).to be == "Hello World!"
expect(response.headers['x-custom']).to be == ['123']
end
end

with 'REQUEST_URI', timeout: 1 do
let(:app) do
lambda do |env|
Expand Down