ruby_wolf 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 698a7c16587b3bd2d1359bd4e6392666346c29af
-  data.tar.gz: 7dd6c7e7936651dd78cdf0480ff50915a863630f
+  metadata.gz: 03a1ec8b4a81dec0caa042067573f74ea59b294d
+  data.tar.gz: bfb6eded8e2f5e1a36b1f38ef6cd19f4a5aafbba
 SHA512:
-  metadata.gz: 728ca882ea7fda050bc126ec75cce59f08c48e66ee48de32c6932235d3390cdafbfb9340bc8bbcc06660279cc1dc0ef8485b0a832800b291f41b3aaf67d832bf
-  data.tar.gz: 33a07bd9e0597fac9fb58cbf03632383b1a4beaae64ca9efca69431936e1e902df457fd38612ed7b5136a406019d1a2ea231db8dee5f1da2413ac1b6d11e125f
+  metadata.gz: 5f532b43a8b05fe7b53468f2a81cfceb97fda03f05e16b18e2abf14c3d9b38b3fb26fb77f6791cea9ac0410f3403d980d7cf9cbd2a58a96b96e563b00c6bb328
+  data.tar.gz: 8f8c7aec4adb099866f76e89592bf97b35a47143b69bc3e7b9aa6f80d1569e848f8842970dd73234142a3d5ceaa5e192de785732a9069f414948661bb654b0bd

data/lib/ruby_wolf/handler.rb

@@ -2,28 +2,36 @@ require 'http/parser'
 
 module RubyWolf
   class Handler
-
-    attr_reader :app, :env, :connection, :response, :callback, :body, :headers, :status
+    attr_reader :app, :env, :connection, :response
 
     def initialize(app, connection, &callback)
       @app = app
-      @connection = connection
-      @callback = callback
       @env = {}
+      @connection = connection
       @response = ''
+
+      @callback = callback
     end
 
     def process
       prepare_rack_env
-      generate_response
-      callback.call(response) if callback
-      response
+      log_request
+      process_request
+      compose_response
+      log_response
+
+      @callback.call(response) if @callback
+      @response
     end
 
     private
 
     def prepare_rack_env
-      @env = ENV.to_h.merge(
+      @connection.headers.each do |key, value|
+        @env[rack_key(key)] = value
+      end
+
+      @env = @env.merge(
         'rack.version' => ::Rack::VERSION,
         'rack.errors' => STDERR,
         'rack.multithread'  => false,
@@ -31,69 +39,66 @@ module RubyWolf
         'rack.runonce'      => true,
         'rack.url_scheme'   => ENV['HTTPS'] ? 'https' : 'http',
 
-        'REQUEST_METHOD' => connection.method,
-        'REQUEST_PATH' => connection.path,
-        'PATH_INFO' => connection.path,
-        'QUERY_STRING' => connection.query,
+        'REQUEST_METHOD' => @connection.method,
+        'REQUEST_PATH' => @connection.path,
+        'PATH_INFO' => @connection.path,
+        'QUERY_STRING' => @connection.query,
 
         'SERVER_PROTOCOL' => 'HTTP/1.1',
         'SERVER_NAME' => 'Ruby Wolf',
         'HTTP_VERSION' => 'HTTP/1.1',
-        'HTTP_HOST' => connection.headers['Host'],
-        'HTTP_USER_AGENT' => connection.headers['User-Agent'],
-        'HTTP_ACCEPT' => connection.headers['Accept'],
-        'CONTENT_LENGTH' => connection.headers['Content-Length'],
-        'CONTENT_TYPE' => connection.headers['Content-Type'],
 
-        'rack.input' => StringIO.new(connection.read_chunk)
+        'rack.input' => StringIO.new(@connection.read_chunk)
       )
-      log_request
     end
 
-    def generate_response
-      @status, @headers, @body = app.call(env)
-      compose_response
-      log_response
+    def process_request
+      @status, @headers, @body = @app.call(env)
+    rescue => e
+      message = "Error while processing the request: #{e.message}\n#{e.backtrace.join("\n")}"
+      @status = 500
+      @body = [message]
+      @headers = [
+        ['Content-Length', message.bytesize],
+        ['Content-Type', 'text/plain; charset=utf-8']
+      ]
+      RubyWolf.logger.error(message)
     end
 
     def compose_response
-      @response += "HTTP/1.1 #{status} #{RubyWolf::CRLF}"
-      headers.each do |key, value|
+      @response += "HTTP/1.1 #{@status} #{RubyWolf::CRLF}"
+      @headers.each do |key, value|
         @response += "#{key}: #{value}#{RubyWolf::CRLF}"
       end
 
       @response += RubyWolf::CRLF
-      body.each do |part|
+      @body.each do |part|
         @response += part
       end
     ensure
-      body.close if body.respond_to? :close
+      @body.close if @body.respond_to? :close
     end
 
     private
 
     def log_request
-      RubyWolf.logger.info(
-        [
-          'HTTP/1.1',
-          connection.method,
-          request_path
-        ].join(' ')
-      )
+      RubyWolf.logger.info("HTTP/1.1 #{@connection.method} #{request_path}")
     end
 
     def log_response
-      RubyWolf.logger.info(
-        "Response HTTP/1.1 #{status}"
-      )
+      RubyWolf.logger.info("Response HTTP/1.1 #{@status}")
     end
 
     def request_path
-      if connection.query
-        "#{connection.path}?#{connection.query}"
+      if @connection.query
+        "#{@connection.path}?#{@connection.query}"
       else
-        connection.path
+        @connection.path
       end
     end
+
+    def rack_key(key)
+      "HTTP_#{key.upcase.gsub(/[^0-9A-Z]/, '_')}"
+    end
   end
 end

data/lib/ruby_wolf/logger.rb

@@ -2,31 +2,39 @@ require 'logger'
 
 module RubyWolf
   class Logger < ::Logger
-    def info(contents = "")
+    def initialize(*args)
+      super(*args)
+      @formatter = proc do |severity, datetime, _progname, msg|
+        date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
+        "[#{severity.to_s[0]}] [#{date_format}] #{msg}\n"
+      end
+    end
+
+    def info(contents = '')
       pre_process(contents) do |content|
         super(content)
       end
     end
 
-    def warn(contents = "")
+    def warn(contents = '')
       pre_process(contents) do |content|
         super(content)
       end
     end
 
-    def debug(contents = "")
+    def debug(contents = '')
       pre_process(contents) do |content|
         super(content)
       end
     end
 
-    def error(contents = "")
+    def error(contents = '')
       pre_process(contents) do |content|
         super(content)
       end
     end
 
-    def fatal(contents = "")
+    def fatal(contents = '')
       pre_process(contents) do |content|
         super(content)
       end

data/lib/ruby_wolf/version.rb

@@ -1,3 +1,3 @@
 module RubyWolf
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wolf
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Nguyễn Quang Minh