YUKI Hiroshi
null+****@clear*****
Thu May 7 13:24:53 JST 2015
YUKI Hiroshi 2015-05-07 13:24:53 +0900 (Thu, 07 May 2015) New Revision: fd5317db122a79bbcb746956421f8eef192dec73 https://github.com/droonga/droonga-client-ruby/commit/fd5317db122a79bbcb746956421f8eef192dec73 Message: Output actual request for HTTP connections in human readable format Modified files: bin/droonga-request bin/droonga-send lib/droonga/client.rb lib/droonga/client/connection/http.rb Modified: bin/droonga-request (+3 -1) =================================================================== --- bin/droonga-request 2015-05-07 12:54:36 +0900 (69d8223) +++ bin/droonga-request 2015-05-07 13:24:53 +0900 (d3faad0) @@ -127,12 +127,14 @@ json_parser.on_parse_complete = lambda do |request_message| message = "Request: " case options[:protocol] when :droonga - request_message = client.complete(request_message) + 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) end message << "\n" print(message) Modified: bin/droonga-send (+3 -1) =================================================================== --- bin/droonga-send 2015-05-07 12:54:36 +0900 (8fae2cb) +++ bin/droonga-send 2015-05-07 13:24:53 +0900 (f1f0cb0) @@ -193,12 +193,14 @@ json_parser.on_parse_complete = lambda do |request_message| message = "Request: " case client.protocol when :droonga - request_message = client.complete(request_message) + 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) end message << "\n" print(message) Modified: lib/droonga/client.rb (+15 -2) =================================================================== --- lib/droonga/client.rb 2015-05-07 12:54:36 +0900 (ec205a7) +++ lib/droonga/client.rb 2015-05-07 13:24:53 +0900 (61a2407) @@ -126,8 +126,21 @@ module Droonga @connection.close end - def complete(message) - do_completion(message, :completion => true) + def actual_request(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}" + end + message + when :droonga + do_completion(message, :completion => true) + else + nil + end end private Modified: lib/droonga/client/connection/http.rb (+2 -2) =================================================================== --- lib/droonga/client/connection/http.rb 2015-05-07 12:54:36 +0900 (880e7a9) +++ lib/droonga/client/connection/http.rb 2015-05-07 13:24:53 +0900 (40ec783) @@ -153,11 +153,10 @@ module Droonga def close end - private def build_request(message) http_method = message["method"] || "GET" http_headers = message["headers"] || {} - case http_method + case http_method.to_s.upcase when "POST" request = Net::HTTP::Post.new(build_path(message, {}), http_headers) @@ -172,6 +171,7 @@ module Droonga end end + private def build_path(message, parameters) type = message["type"] base_path = message["path"] || build_droonga_path(type) -------------- next part -------------- HTML����������������������������...Download