From 25e80931939fe31b4a451281f0772f085acc7f9f Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 9 Jun 2016 11:45:43 +0200
Subject: refactor: inline method get_key_from_uid

well kind of since we were yielding this is more inlining the
block and renaming the method
---
 lib/nickserver/server.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index b528e4b..82fb376 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -75,12 +75,6 @@ module Nickserver
       end
     end
 
-    def send_key(uid)
-      get_key_from_uid(uid) do |key|
-        send_response content: format_response(address: uid, openpgp: key)
-      end
-    end
-
     def get_uid_from_request
       if @http_query_string
         params = CGI.parse(@http_query_string)
@@ -94,7 +88,7 @@ module Nickserver
       end
     end
 
-    def get_key_from_uid(uid)
+    def send_key(uid)
       if local_address?(uid)
         @source = Nickserver::CouchDB::Source.new(adapter)
         @source.query(uid) do |response|
@@ -103,7 +97,7 @@ module Nickserver
       else
         @fetcher = Nickserver::Hkp::FetchKey.new
         @fetcher.get(uid).callback {|key|
-          yield key
+          send_response content: format_response(address: uid, openpgp: key)
         }.errback {|status, msg|
           if status == 404
             send_not_found
-- 
cgit v1.2.3