Merge branch 'refactor/clarify-response' into 'master'

Refactor/clarify response

See merge request leap/nickserver!20

4 files changed, 7 insertions, 7 deletions

diff --git a/lib/nickserver/hkp/key_info.rb b/lib/nickserver/hkp/key_info.rb
index e1a9500..c1b1ad3 100644
--- a/lib/nickserver/hkp/key_info.rb
+++ b/lib/nickserver/hkp/key_info.rb
@@ -49,7 +49,7 @@ module Nickserver::Hkp
 
     def expirationdate
       expires = properties[4]
-      Time.at(expires.to_i)
+      expires && Time.at(expires.to_i)
     end
 
     def flags
diff --git a/lib/nickserver/hkp/source.rb b/lib/nickserver/hkp/source.rb
index d7c86a3..fe3c4a5 100644
--- a/lib/nickserver/hkp/source.rb
+++ b/lib/nickserver/hkp/source.rb
@@ -1,6 +1,6 @@
 require 'nickserver/source'
 require 'nickserver/response'
-require 'nickserver/hkp/response'
+require 'nickserver/key_response'
 require 'nickserver/hkp/client'
 require 'nickserver/hkp/parse_key_info'
 require 'nickserver/hkp/key_info'
@@ -30,7 +30,7 @@ module Nickserver::Hkp
     def get_key_by_fingerprint(fingerprint, nick = nil)
       status, response = client.get_key_by_fingerprint fingerprint
       if status == 200
-        Response.new nick, response
+        Nickserver::KeyResponse.new nick, response
       else
         Nickserver::Response.new status, 'HKP Request failed'
       end
diff --git a/lib/nickserver/hkp/response.rb b/lib/nickserver/key_response.rb
index 2cc69d3..438dfc3 100644
--- a/lib/nickserver/hkp/response.rb
+++ b/lib/nickserver/key_response.rb
@@ -1,5 +1,5 @@
-module Nickserver::Hkp
-  class Response
+module Nickserver
+  class KeyResponse
     attr_reader :status, :content
 
     def initialize(uid, key)
diff --git a/lib/nickserver/wkd/source.rb b/lib/nickserver/wkd/source.rb
index 43f0b2e..bf30c94 100644
--- a/lib/nickserver/wkd/source.rb
+++ b/lib/nickserver/wkd/source.rb
@@ -1,7 +1,7 @@
 require 'nickserver/source'
 require 'nickserver/response'
 require 'nickserver/wkd/url'
-require 'nickserver/hkp/response'
+require 'nickserver/key_response'
 
 module Nickserver::Wkd
   # Query the web key directory for a given email address
@@ -10,7 +10,7 @@ module Nickserver::Wkd
       url = Url.new(email)
       status, blob = adapter.get url
       if status == 200
-        Nickserver::Hkp::Response.new(email.to_s, armor_key(blob))
+        Nickserver::KeyResponse.new(email.to_s, armor_key(blob))
       end
     end