From 80d85a0396fb0dbb27ac1b0885d5461ccc0cfbf2 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 9 Jun 2016 11:54:04 +0200 Subject: refactor: introduce Hkp::Response --- lib/nickserver/server.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/nickserver/server.rb') diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb index 82fb376..c6615d2 100644 --- a/lib/nickserver/server.rb +++ b/lib/nickserver/server.rb @@ -5,6 +5,7 @@ silence_warnings do end require 'json' require 'nickserver/couch_db/source' +require 'nickserver/hkp/response' require 'nickserver/adapters/em_http' @@ -97,7 +98,8 @@ module Nickserver else @fetcher = Nickserver::Hkp::FetchKey.new @fetcher.get(uid).callback {|key| - send_response content: format_response(address: uid, openpgp: key) + response = Nickserver::Hkp::Response.new(uid, key) + send_response(status: response.status, content: response.content) }.errback {|status, msg| if status == 404 send_not_found @@ -108,10 +110,6 @@ module Nickserver end end - def format_response(map) - map.to_json - end - # # Return true if the user address is for a user of this service provider. # e.g. if the provider is example.org, then alice@example.org returns true. -- cgit v1.2.3