From cd67dfac8f764140c47e0fba9304eba168c7a25b Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Tue, 21 Jun 2016 12:33:52 +0200
Subject: refactor: change send_response -> respond in em_server

This way the interface mimics the one of Celluloid Reels request.

request.respond status, content
---
 lib/nickserver/em_server.rb       |  8 ++++----
 lib/nickserver/request_handler.rb | 14 +++++---------
 test/unit/request_handler_test.rb |  3 +--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/nickserver/em_server.rb b/lib/nickserver/em_server.rb
index bcec4cd..a983249 100644
--- a/lib/nickserver/em_server.rb
+++ b/lib/nickserver/em_server.rb
@@ -23,11 +23,11 @@ module Nickserver
       handler.respond_to params, @http_headers
     end
 
-    def send_response(options = {})
+    def respond(status, content)
       response = EM::DelegatedHttpResponse.new(self)
-      response.status = options[:status]
-      response.content_type options[:content_type]
-      response.content = options[:content]
+      response.status = status
+      response.content_type 'text/plain'
+      response.content = content
       silence_warnings do
         response.send_response
       end
diff --git a/lib/nickserver/request_handler.rb b/lib/nickserver/request_handler.rb
index 26b6ec1..a3fd57d 100644
--- a/lib/nickserver/request_handler.rb
+++ b/lib/nickserver/request_handler.rb
@@ -38,7 +38,7 @@ module Nickserver
         source = Nickserver::Hkp::Source.new(adapter)
       end
       source.query(uid) do |response|
-        send_response(status: response.status, content: response.content)
+        send_response response.status, response.content
       end
     end
 
@@ -64,19 +64,15 @@ module Nickserver
       end
     end
     def send_error(msg = "not supported")
-      send_response(status: 500, content: "500 #{msg}\n")
+      send_response 500, "500 #{msg}\n"
     end
 
     def send_not_found(msg = "Not Found")
-      send_response(status: 404, content: "404 #{msg}\n")
+      send_response 404, "404 #{msg}\n"
     end
 
-    def send_response(opts = {})
-      responder.send_response default_response.merge(opts)
-    end
-
-    def default_response
-      {status: 200, content_type: 'text/plain', content: ''}
+    def send_response(status = 200, content = '')
+      responder.respond status, content
     end
 
     attr_reader :responder, :adapter
diff --git a/test/unit/request_handler_test.rb b/test/unit/request_handler_test.rb
index c9d316f..7fe766e 100644
--- a/test/unit/request_handler_test.rb
+++ b/test/unit/request_handler_test.rb
@@ -21,8 +21,7 @@ class Nickserver::RequestHandlerTest < Minitest::Test
   end
 
   def assert_response(args)
-    args[:content_type] ||= 'text/plain'
-    responder.expect :send_response, nil, [args]
+    responder.expect :respond, nil, [args[:status], args[:content]]
     handler.respond_to @params, @headers
     responder.verify
   end
-- 
cgit v1.2.3