From f567ed80427d43019ceb1aaf77d4bc6c01e62729 Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 11 Jun 2016 15:19:50 +0200
Subject: use adapter for FetchKeyInfo

---
 lib/nickserver/hkp/fetch_key_info.rb | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'lib/nickserver/hkp/fetch_key_info.rb')

diff --git a/lib/nickserver/hkp/fetch_key_info.rb b/lib/nickserver/hkp/fetch_key_info.rb
index b7481d0..b23af15 100644
--- a/lib/nickserver/hkp/fetch_key_info.rb
+++ b/lib/nickserver/hkp/fetch_key_info.rb
@@ -1,30 +1,26 @@
-require 'em-http'
-
 #
 # used to fetch an array of KeyInfo objects that match the given uid.
 #
 
 module Nickserver; module Hkp
   class FetchKeyInfo
-    include EM::Deferrable
 
-    def search(uid)
+    def initialize(adapter)
+      @adapter = adapter
+    end
+
+    def search(uid, &block)
       # in practice, exact=on seems to have no effect
       params = {op: 'vindex', search: uid, exact: 'on', options: 'mr', fingerprint: 'on'}
-      EventMachine::HttpRequest.new(Config.hkp_url).get(query: params).callback {|http|
-        parser = ParseKeyInfo.new http.response_header, http.response
-        keys = parser.keys(uid)
-        if keys.any?
-          self.succeed keys
-        else
-          self.fail parser.status(uid), parser.msg(uid)
-        end
-      }.errback {|http|
-        self.fail 500, http.error
-      }
-      self
+      adapter.get(Config.hkp_url, query: params) do |status, response|
+        parser = ParseKeyInfo.new status, response
+        yield parser.status_for(uid), parser.response_for(uid)
+      end
     end
 
+    protected
+    attr_reader :adapter
+
   end
 
 end; end
-- 
cgit v1.2.3