example/server.rb in http-2-0.7.0 vs example/server.rb in http-2-0.8.0

@@ -1,35 +1,35 @@
 require_relative 'helper'
 
-options = {port: 8080}
+options = { port: 8080 }
 OptionParser.new do |opts|
-  opts.banner = "Usage: server.rb [options]"
+  opts.banner = 'Usage: server.rb [options]'
 
-  opts.on("-s", "--secure", "HTTPS mode") do |v|
+  opts.on('-s', '--secure', 'HTTPS mode') do |v|
     options[:secure] = v
   end
 
-  opts.on("-p", "--port [Integer]", "listen port") do |v|
+  opts.on('-p', '--port [Integer]', 'listen port') do |v|
     options[:port] = v
   end
 end.parse!
 
 puts "Starting server on port #{options[:port]}"
 server = TCPServer.new(options[:port])
 
 if options[:secure]
   ctx = OpenSSL::SSL::SSLContext.new
-  ctx.cert = OpenSSL::X509::Certificate.new(File.open("keys/mycert.pem"))
-  ctx.key = OpenSSL::PKey::RSA.new(File.open("keys/mykey.pem"))
+  ctx.cert = OpenSSL::X509::Certificate.new(File.open('keys/mycert.pem'))
+  ctx.key = OpenSSL::PKey::RSA.new(File.open('keys/mykey.pem'))
   ctx.npn_protocols = [DRAFT]
 
   server = OpenSSL::SSL::SSLServer.new(server, ctx)
 end
 
 loop do
   sock = server.accept
-  puts "New TCP connection!"
+  puts 'New TCP connection!'
 
   conn = HTTP2::Server.new
   conn.on(:frame) do |bytes|
     # puts "Writing bytes: #{bytes.unpack("H*").first}"
     sock.write bytes
@@ -43,12 +43,12 @@
 
   conn.on(:stream) do |stream|
     log = Logger.new(stream.id)
     req, buffer = {}, ''
 
-    stream.on(:active) { log.info "cliend opened new stream" }
-    stream.on(:close)  { log.info "stream closed" }
+    stream.on(:active) { log.info 'cliend opened new stream' }
+    stream.on(:close)  { log.info 'stream closed' }
 
     stream.on(:headers) do |h|
       req = Hash[*h.flatten]
       log.info "request headers: #{h}"
     end
@@ -57,39 +57,39 @@
       log.info "payload chunk: <<#{d}>>"
       buffer << d
     end
 
     stream.on(:half_close) do
-      log.info "client closed its end of the stream"
+      log.info 'client closed its end of the stream'
 
       response = nil
-      if req[":method"] == "POST"
+      if req[':method'] == 'POST'
         log.info "Received POST request, payload: #{buffer}"
         response = "Hello HTTP 2.0! POST payload: #{buffer}"
       else
-        log.info "Received GET request"
-        response = "Hello HTTP 2.0! GET request"
+        log.info 'Received GET request'
+        response = 'Hello HTTP 2.0! GET request'
       end
 
       stream.headers({
-        ":status" => "200",
-        "content-length" => response.bytesize.to_s,
-        "content-type" => "text/plain"
+        ':status' => '200',
+        'content-length' => response.bytesize.to_s,
+        'content-type' => 'text/plain',
       }, end_stream: false)
 
       # split response into multiple DATA frames
-      stream.data(response.slice!(0,5), end_stream: false)
+      stream.data(response.slice!(0, 5), end_stream: false)
       stream.data(response)
     end
   end
 
-  while !sock.closed? && !sock.eof?
+  while !sock.closed? && !(sock.eof? rescue true) # rubocop:disable Style/RescueModifier
     data = sock.readpartial(1024)
     # puts "Received bytes: #{data.unpack("H*").first}"
 
     begin
       conn << data
-    rescue Exception => e
+    rescue => e
       puts "Exception: #{e}, #{e.message} - closing socket."
       sock.close
     end
   end
 end