From 1af940f49f9ba5507673c2131fcb228b778083fb Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 9 Jun 2016 11:10:35 +0200 Subject: refactor: remove middleman Couch::FetchKey --- lib/nickserver/server.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/nickserver/server.rb') diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb index 9e1551b..b528e4b 100644 --- a/lib/nickserver/server.rb +++ b/lib/nickserver/server.rb @@ -4,6 +4,9 @@ silence_warnings do require 'evma_httpserver' end require 'json' +require 'nickserver/couch_db/source' +require 'nickserver/adapters/em_http' + # # This is the main HTTP server that clients connect to in order to fetch keys @@ -93,8 +96,8 @@ module Nickserver def get_key_from_uid(uid) if local_address?(uid) - @fetcher = Nickserver::Couch::FetchKey.new - @fetcher.get(uid) do |response| + @source = Nickserver::CouchDB::Source.new(adapter) + @source.query(uid) do |response| send_response(status: response.status, content: response.content) end else @@ -135,8 +138,13 @@ module Nickserver return uid_domain == host end end - rescue + rescue # XXX what are we rescueing here? return false end + + def adapter + @adapter ||= Nickserver::Adapters::EmHttp.new + end + end end -- cgit v1.2.3