YUKI Hiroshi
null+****@clear*****
Thu May 7 13:36:02 JST 2015
YUKI Hiroshi 2015-05-07 13:36:02 +0900 (Thu, 07 May 2015) New Revision: 6d42643e3602bf04c6121ba8b88a4fd2c05fdd16 https://github.com/droonga/droonga-client-ruby/commit/6d42643e3602bf04c6121ba8b88a4fd2c05fdd16 Message: Use completed message for HTTP connection also Modified files: bin/droonga-request bin/droonga-send lib/droonga/client.rb lib/droonga/client/connection/http.rb Modified: bin/droonga-request (+5 -10) =================================================================== --- bin/droonga-request 2015-05-07 13:25:16 +0900 (d3faad0) +++ bin/droonga-request 2015-05-07 13:36:02 +0900 (a915cee) @@ -125,16 +125,11 @@ json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| if options[:report_request] message = "Request: " - case options[:protocol] - when :droonga - request_message = client.actual_request(request_message) - begin - message << JSON.pretty_generate(request_message) - rescue - message << request_message.inspect - end - when :http - message << client.actual_request(request_message) + request_message = client.complete(request_message) + begin + message << JSON.pretty_generate(request_message) + rescue + message << request_message.inspect end message << "\n" print(message) Modified: bin/droonga-send (+5 -10) =================================================================== --- bin/droonga-send 2015-05-07 13:25:16 +0900 (f1f0cb0) +++ bin/droonga-send 2015-05-07 13:36:02 +0900 (933f6ac) @@ -191,16 +191,11 @@ json_parser.on_parse_complete = lambda do |request_message| client = clients[client_index] if options.report_request message = "Request: " - case client.protocol - when :droonga - request_message = client.actual_request(request_message) - begin - message << JSON.pretty_generate(request_message) - rescue - message << request_message.inspect - end - when :http - message << client.actual_request(request_message) + request_message = client.complete(request_message) + begin + message << JSON.pretty_generate(request_message) + rescue + message << request_message.inspect end message << "\n" print(message) Modified: lib/droonga/client.rb (+11 -7) =================================================================== --- lib/droonga/client.rb 2015-05-07 13:25:16 +0900 (61a2407) +++ lib/droonga/client.rb 2015-05-07 13:36:02 +0900 (0ba2607) @@ -126,16 +126,20 @@ module Droonga @connection.close end - def actual_request(message) + def complete(message) case @protocol when :http - @connection.build_request(message) - http_request = client.build_request(request_message) - message = "HTTP #{http_request.method} #{http_request.path}" - if http_request.method == "POST" - message << "\n#{http_request.body}" + http_request =****@conne*****_request(message) + http_headers = {} + http_request.canonical_each do |name, value| + http_headers[name] = value end - message + { + "method" => http_request.method, + "path" => http_request.path, + "headers" => http_headers, + "body" => http_request.body, + } when :droonga do_completion(message, :completion => true) else Modified: lib/droonga/client/connection/http.rb (+5 -1) =================================================================== --- lib/droonga/client/connection/http.rb 2015-05-07 13:25:16 +0900 (40ec783) +++ lib/droonga/client/connection/http.rb 2015-05-07 13:36:02 +0900 (b743e23) @@ -160,7 +160,11 @@ module Droonga when "POST" request = Net::HTTP::Post.new(build_path(message, {}), http_headers) - request.body = JSON.generate(message["body"]) + body = message["body"] + if body.is_a?(Hash) or body.is_a?(Array) + body = JSON.generate(body) + end + request.body = body request when "GET" parameters = message["body"] || {} -------------- next part -------------- HTML����������������������������...다운로드
