diff options
author | azul <azul@riseup.net> | 2017-11-07 08:20:41 -0800 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-11-07 08:20:41 -0800 |
commit | a43e647663100b7a5117008641765d3508edbe5b (patch) | |
tree | 6e415b50e29d8c36f84c0d477fe12b3ee2ee1123 /lib/nickserver/hkp | |
parent | fac140a8ff76e98c275194845125d4c97f4ba07b (diff) | |
parent | 85a567286cf61a3a8193c339dd0967116d79299c (diff) |
Merge branch 'refactor/clarify-response' into 'master'
Refactor/clarify response
See merge request leap/nickserver!20
Diffstat (limited to 'lib/nickserver/hkp')
-rw-r--r-- | lib/nickserver/hkp/key_info.rb | 2 | ||||
-rw-r--r-- | lib/nickserver/hkp/response.rb | 16 | ||||
-rw-r--r-- | lib/nickserver/hkp/source.rb | 4 |
3 files changed, 3 insertions, 19 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/response.rb b/lib/nickserver/hkp/response.rb deleted file mode 100644 index 2cc69d3..0000000 --- a/lib/nickserver/hkp/response.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Nickserver::Hkp - class Response - attr_reader :status, :content - - def initialize(uid, key) - @content = format_response(address: uid, openpgp: key) - @status = 200 - end - - protected - - def format_response(map) - map.to_json - end - end -end 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 |