Use Hi::Logger in App and Server

lib/hi/app.rb

@@ -1,29 +1,28 @@
-require 'awesome_print'
 require 'hi/request'
+require 'hi/logger'
 
 module Hi
   class App
-    attr_reader :port
+    attr_reader :port, :logger
 
     DEFAULT_PORT = 3000
 
-    def initialize(port = nil)
+    def initialize(port = nil, logger = Hi::Logger.new)
       @port = (port = port.to_i) > 0 ? port : DEFAULT_PORT
+      @logger = logger
     end
 
     def call(env)
-      log Hi::Request.new(env).to_h
+      request = Hi::Request.new(env).to_h
+
+      log "#{request[:request_method]} #{request[:url]} (#{Time.now})"
+      log request
 
       [ 200, { 'Content-Type' => 'text/plain' }, ['hi'] ]
     end
 
-    private
-
-    def log(request)
-      unless ENV['RACK_ENV'] == 'test'
-        ap "#{request[:request_method]} #{request[:url]} (#{Time.now})"
-        ap request
-      end
+    def log(message)
+      logger.log message
     end
   end
 end

lib/hi/server.rb

@@ -13,11 +13,11 @@ def initialize(app)
     end
 
     def start(port = app.port, attempts = 1)
-      log "Starting server on port #{port}...\n\n"
+      app.log "Starting server on port #{port}...\n\n"
       start! port
     rescue RuntimeError => e
       if attempts < MAX_ATTEMPTS
-        log "\nUnable to start server, trying random port instead."
+        app.log "\nUnable to start server, trying random port instead."
         start random_port, attempts + 1
       else
         raise CantStartServerError.new(e)
@@ -33,9 +33,5 @@ def start!(port)
     def random_port
       1000 + Random.rand(9000)
     end
-
-    def log(message)
-      puts message unless ENV['RACK_ENV'] == 'test'
-    end
   end
 end