summaryrefslogtreecommitdiff
path: root/lib/nickserver/server.rb
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-05-25 12:51:47 +0200
committerAzul <azul@riseup.net>2016-05-25 12:51:47 +0200
commitb883fa9e91ffd7c526a17f37df54ef63c5c6a4b8 (patch)
tree2291052d1a0bf5eadae43969aa915af44855a0aa /lib/nickserver/server.rb
parent69f9b2cb51ff3b9fb3de39f657f734e507ccec68 (diff)
rubocop: initialize and use ruby 1.9 hash syntax
Diffstat (limited to 'lib/nickserver/server.rb')
-rw-r--r--lib/nickserver/server.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/nickserver/server.rb b/lib/nickserver/server.rb
index 9487b43..32afdae 100644
--- a/lib/nickserver/server.rb
+++ b/lib/nickserver/server.rb
@@ -21,7 +21,7 @@ module Nickserver
#
def self.start(opts={})
Nickserver::Config.load
- options = {:host => '127.0.0.1', :port => Nickserver::Config.port.to_i}.merge(opts)
+ options = {host: '127.0.0.1', port: Nickserver::Config.port.to_i}.merge(opts)
unless defined?(TESTING)
puts "Starting nickserver #{options[:host]}:#{options[:port]}"
end
@@ -51,15 +51,15 @@ module Nickserver
private
def send_error(msg = "not supported")
- send_response(:status => 500, :content => "500 #{msg}\n")
+ send_response(status: 500, content: "500 #{msg}\n")
end
def send_not_found(msg = "Not Found")
- send_response(:status => 404, :content => "404 #{msg}\n")
+ send_response(status: 404, content: "404 #{msg}\n")
end
def send_response(opts = {})
- options = {:status => 200, :content_type => 'text/plain', :content => ''}.merge(opts)
+ options = {status: 200, content_type: 'text/plain', content: ''}.merge(opts)
response = EM::DelegatedHttpResponse.new(self)
response.status = options[:status]
response.content_type options[:content_type]
@@ -69,7 +69,7 @@ module Nickserver
def send_key(uid)
get_key_from_uid(uid) do |key|
- send_response :content => format_response(:address => uid, :openpgp => key)
+ send_response content: format_response(address: uid, openpgp: key)
end
end
@@ -98,7 +98,7 @@ module Nickserver
if status == 404
send_not_found
else
- send_response(:status => status, :content => msg)
+ send_response(status: status, content: msg)
end
}
end