Skip to content

Commit 1d59a59

Browse files
committed
rack cleanup
1 parent 28e8573 commit 1d59a59

File tree

4 files changed

+47
-6
lines changed

4 files changed

+47
-6
lines changed

Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ GEM
4848
prism (1.9.0)
4949
racc (1.7.3)
5050
rack (3.2.5)
51+
rack-test (2.2.0)
52+
rack (>= 1.3)
5153
rainbow (3.1.1)
5254
rake (13.0.6)
5355
redis-client (0.26.4)
@@ -114,6 +116,7 @@ PLATFORMS
114116

115117
DEPENDENCIES
116118
activejob
119+
rack-test
117120
rake (~> 13.0)
118121
rspec
119122
sidekiq

lib/singed/rack_middleware.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ def initialize(app)
99
end
1010

1111
def call(env)
12-
status, headers, body = if capture_flamegraph?(env)
13-
flamegraph do
14-
@app.call(env)
15-
end
12+
if capture_flamegraph?(env)
13+
flamegraph { @app.call(env) }
1614
else
1715
@app.call(env)
1816
end
19-
20-
[status, headers, body]
2117
end
2218

2319
def capture_flamegraph?(env)

singed.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
2323

2424
spec.add_dependency "stackprof", ">= 0.2.13"
2525

26+
spec.add_development_dependency "rack-test"
2627
spec.add_development_dependency "rake", "~> 13.0"
2728
spec.add_development_dependency "rspec"
2829
end

spec/singed/middleware_spec.rb

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
describe Singed::RackMiddleware do
2+
subject do
3+
instance.call(env)
4+
end
5+
6+
let(:app) { ->(*) { [200, {'Content-Type' => 'text/plain'}, ['OK']] } }
7+
let(:instance) { described_class.new(app) }
8+
let(:env) { Rack::MockRequest.env_for('/', headers) }
9+
let(:headers) { {} }
10+
11+
it 'returns a proper rack response' do
12+
status, _ = subject
13+
expect(status).to eq 200
14+
end
15+
16+
it 'does not capture a flamegraph by default' do
17+
expect(instance).not_to receive(:flamegraph)
18+
subject
19+
end
20+
21+
context 'when enabled' do
22+
before { allow(instance).to receive(:capture_flamegraph?).and_return(true) }
23+
24+
it 'captures a flamegraph' do
25+
expect(instance).to receive(:flamegraph)
26+
subject
27+
end
28+
end
29+
30+
describe '.capture_flamegraph?' do
31+
subject { instance.capture_flamegraph?(env) }
32+
33+
it { is_expected.to be false }
34+
35+
context 'when HTTP_X_SINGED is true' do
36+
let(:headers) { { 'HTTP_X_SINGED' => 'true' } }
37+
38+
it { is_expected.to be true }
39+
end
40+
end
41+
end

0 commit comments

Comments
 (0)