Skip to content

Use local variables in rack middleware to prevent instance state changes #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonSchado merged 2 commits into from
Mar 25, 2020
Merged

Use local variables in rack middleware to prevent instance state changes #151

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff18d0d
Use local variables in rack middleware to prevent instance state changes
bumi Mar 3, 2020
08669ab
Merge branch 'master' into local-vars-in-middleware
DonSchado Mar 23, 2020
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
12 changes: 5 additions & 7 deletions lib/rack/tracker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def call(env)
end

def _call(env)
@status, @headers, @body = @app.call(env)
return [@status, @headers, @body] unless html?
response = Rack::Response.new([], @status, @headers)
status, headers, body = @app.call(env)
return [status, headers, body] unless headers['Content-Type'] =~ /html/

response = Rack::Response.new([], status, headers)
env[EVENT_TRACKING_KEY] ||= {}

if session = env["rack.session"]
Expand All @@ -56,16 +56,14 @@ def _call(env)
session[EVENT_TRACKING_KEY] = env[EVENT_TRACKING_KEY]
end

@body.each { |fragment| response.write inject(env, fragment) }
@body.close if @body.respond_to?(:close)
body.each { |fragment| response.write inject(env, fragment) }
body.close if body.respond_to?(:close)

response.finish
end

private

def html?; @headers['Content-Type'] =~ /html/; end

def inject(env, response)
duplicated_response = response.dup
@handlers.each(env) do |handler|
Expand Down