diff options
| -rw-r--r-- | lib/nickserver.rb | 4 | ||||
| -rw-r--r-- | lib/nickserver/hkp/fetch_key_info.rb | 30 | ||||
| -rw-r--r-- | lib/nickserver/hkp/source.rb | 12 | ||||
| -rw-r--r-- | test/integration/hkp_test.rb | 2 |
4 files changed, 12 insertions, 36 deletions
diff --git a/lib/nickserver.rb b/lib/nickserver.rb index 16f7e85..8843acd 100644 --- a/lib/nickserver.rb +++ b/lib/nickserver.rb @@ -3,9 +3,5 @@ require "nickserver/version" require "nickserver/config" require "nickserver/email_address" -require "nickserver/hkp/fetch_key_info" -require "nickserver/hkp/parse_key_info" -require "nickserver/hkp/key_info" - require "nickserver/server" require "nickserver/daemon" diff --git a/lib/nickserver/hkp/fetch_key_info.rb b/lib/nickserver/hkp/fetch_key_info.rb deleted file mode 100644 index b8685bc..0000000 --- a/lib/nickserver/hkp/fetch_key_info.rb +++ /dev/null @@ -1,30 +0,0 @@ -require 'nickserver/hkp/client' - -# -# used to fetch an array of KeyInfo objects that match the given uid. -# - -module Nickserver; module Hkp - class FetchKeyInfo - - def initialize(adapter) - @adapter = adapter - end - - def search(uid, &block) - client.get_key_infos_by_email(uid) do |status, response| - parser = ParseKeyInfo.new status, response - yield parser.status_for(uid), parser.response_for(uid) - end - end - - protected - attr_reader :adapter - - def client - @client ||= Client.new(adapter) - end - - end - -end; end 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 diff --git a/test/integration/hkp_test.rb b/test/integration/hkp_test.rb index 2afd2c0..a824a3f 100644 --- a/test/integration/hkp_test.rb +++ b/test/integration/hkp_test.rb @@ -122,7 +122,7 @@ class HkpTest < Minitest::Test def assert_key_info_for_uid(uid, &block) EM.run do - Nickserver::Hkp::FetchKeyInfo.new(adapter).search uid do |status, keys| + Nickserver::Hkp::Source.new(adapter).search uid do |status, keys| assert_equal 200, status yield keys EM.stop |