From 93258bd6fe6247e7af67f423243eba9808e920ee Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 15 Jun 2016 10:36:25 +0200 Subject: we don't need FetchKeyInfo anymore including in Source --- lib/nickserver/hkp/source.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lib/nickserver/hkp/source.rb') diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb index cbff91a..cae3e01 100644 --- a/lib/nickserver/hkp/source.rb +++ b/lib/nickserver/hkp/source.rb @@ -1,6 +1,9 @@ require 'nickserver/response' require 'nickserver/hkp/response' require 'nickserver/hkp/client' +require "nickserver/hkp/parse_key_info" +require "nickserver/hkp/key_info" + # # Fetch keys via HKP @@ -15,7 +18,7 @@ module Nickserver; module Hkp end def query(nick, &block) - FetchKeyInfo.new(adapter).search(nick) do |status, response| + search(nick) do |status, response| if status == 200 best = pick_best_key(response) get_key_by_fingerprint(nick, best.keyid, &block) @@ -25,6 +28,13 @@ module Nickserver; module Hkp end end + def search(nick, &block) + client.get_key_infos_by_email(nick) do |status, response| + parser = ParseKeyInfo.new status, response + yield parser.status_for(nick), parser.response_for(nick) + end + end + protected attr_reader :adapter -- cgit v1.2.3