diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-08 02:50:43 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-08 15:17:59 +0900 |
commit | cd269bf5693bcb9a7b5b301bbd3a0eb65222b9fc (patch) | |
tree | fb5f981559be2e536ea1a9066ff31f9a047b2398 /lib/plum/client/legacy_client_session.rb | |
parent | 30a6b4df628937e4905b5932d4e43e1708332b62 (diff) | |
download | plum-cd269bf5693bcb9a7b5b301bbd3a0eb65222b9fc.tar.gz |
client: call the block passed to Client#request in Response#set_headers
This reduces code lines.
Diffstat (limited to 'lib/plum/client/legacy_client_session.rb')
-rw-r--r-- | lib/plum/client/legacy_client_session.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/plum/client/legacy_client_session.rb b/lib/plum/client/legacy_client_session.rb index 166c0ef..07ae6a9 100644 --- a/lib/plum/client/legacy_client_session.rb +++ b/lib/plum/client/legacy_client_session.rb @@ -11,7 +11,6 @@ module Plum @parser = setup_parser @requests = [] @response = nil - @headers_callback = nil end def succ @@ -40,8 +39,8 @@ module Plum end end - response = Response.new(**options) - @requests << [response, headers, body, chunked, headers_cb] + response = Response.new(**options, &headers_cb) + @requests << [response, headers, body, chunked] consume_queue response end @@ -55,9 +54,8 @@ module Plum def consume_queue return if @response || @requests.empty? - response, headers, body, chunked, cb = @requests.shift + response, headers, body, chunked = @requests.shift @response = response - @headers_callback = cb @socket << construct_request(headers) @@ -98,7 +96,6 @@ module Plum # FIXME: duplicate header name? resp_headers = parser.headers.map { |key, value| [key.downcase, value] }.to_h @response.send(:set_headers, { ":status" => parser.status_code.to_s }.merge(resp_headers)) - @headers_callback.call(@response) if @headers_callback } parser.on_body = proc { |chunk| @@ -108,7 +105,6 @@ module Plum parser.on_message_complete = proc { |env| @response.send(:finish) @response = nil - @headers_callback = nil close unless parser.keep_alive? consume_queue } |