1 files changed, 13 insertions, 16 deletions
diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb
index 82c94a0..d7c86a3 100644
--- a/lib/nickserver/hkp/source.rb
+++ b/lib/nickserver/hkp/source.rb
@@ -2,24 +2,21 @@ require 'nickserver/source'
 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
-# http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00
-#
-
-module Nickserver; module Hkp
+require 'nickserver/hkp/parse_key_info'
+require 'nickserver/hkp/key_info'
+
+module Nickserver::Hkp
+  #
+  # Fetch keys via HKP
+  # http://tools.ietf.org/html/draft-shaw-openpgp-hkp-00
+  #
   class Source < Nickserver::Source
-
     def query(nick)
       status, response = search(nick)
       if status == 200
         best = pick_best_key(response)
         get_key_by_fingerprint(best.keyid, nick)
-      elsif status != 404    # 404 means no key found and we proceed
+      elsif status != 404 # 404 means no key found and we proceed
         Nickserver::Response.new(status, response)
       end
     end
@@ -27,7 +24,7 @@ module Nickserver; module Hkp
     def search(nick)
       status, response = client.get_key_infos_by_email(nick)
       parser = ParseKeyInfo.new status, response
-      return parser.status_for(nick), parser.response_for(nick)
+      [parser.status_for(nick), parser.response_for(nick)]
     end
 
     def get_key_by_fingerprint(fingerprint, nick = nil)
@@ -35,7 +32,7 @@ module Nickserver; module Hkp
       if status == 200
         Response.new nick, response
       else
-        Nickserver::Response.new status, "HKP Request failed"
+        Nickserver::Response.new status, 'HKP Request failed'
       end
     end
 
@@ -48,11 +45,11 @@ module Nickserver; module Hkp
     # that is signed by the oldest key.
     #
     def pick_best_key(key_info_list)
-      key_info_list.sort {|a,b| a.creationdate <=> b.creationdate}.last
+      key_info_list.sort_by(&:creationdate).last
     end
 
     def client
       @client ||= Client.new(adapter)
     end
   end
-end; end
+end