Skip to content
Snippets Groups Projects
Unverified Commit 85a56728 authored by azul's avatar azul
Browse files

refactor: turn Hkp::Response into KeyResponse

We now also use it from wkd and it seems like a generally
useful kind of response.
parent ec996134
No related branches found
No related tags found
1 merge request!20Refactor/clarify response
Pipeline #
require 'nickserver/source' require 'nickserver/source'
require 'nickserver/response' require 'nickserver/response'
require 'nickserver/hkp/response' require 'nickserver/key_response'
require 'nickserver/hkp/client' require 'nickserver/hkp/client'
require 'nickserver/hkp/parse_key_info' require 'nickserver/hkp/parse_key_info'
require 'nickserver/hkp/key_info' require 'nickserver/hkp/key_info'
...@@ -30,7 +30,7 @@ module Nickserver::Hkp ...@@ -30,7 +30,7 @@ module Nickserver::Hkp
def get_key_by_fingerprint(fingerprint, nick = nil) def get_key_by_fingerprint(fingerprint, nick = nil)
status, response = client.get_key_by_fingerprint fingerprint status, response = client.get_key_by_fingerprint fingerprint
if status == 200 if status == 200
Response.new nick, response Nickserver::KeyResponse.new nick, response
else else
Nickserver::Response.new status, 'HKP Request failed' Nickserver::Response.new status, 'HKP Request failed'
end end
......
module Nickserver::Hkp module Nickserver
class Response class KeyResponse
attr_reader :status, :content attr_reader :status, :content
def initialize(uid, key) def initialize(uid, key)
......
require 'nickserver/source' require 'nickserver/source'
require 'nickserver/response' require 'nickserver/response'
require 'nickserver/wkd/url' require 'nickserver/wkd/url'
require 'nickserver/hkp/response' require 'nickserver/key_response'
module Nickserver::Wkd module Nickserver::Wkd
# Query the web key directory for a given email address # Query the web key directory for a given email address
...@@ -10,7 +10,7 @@ module Nickserver::Wkd ...@@ -10,7 +10,7 @@ module Nickserver::Wkd
url = Url.new(email) url = Url.new(email)
status, blob = adapter.get url status, blob = adapter.get url
if status == 200 if status == 200
Nickserver::Hkp::Response.new(email.to_s, armor_key(blob)) Nickserver::KeyResponse.new(email.to_s, armor_key(blob))
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment