ruby_wolf 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d13bd7de3c5cca903738aefbe18c1d9e512a49
-  data.tar.gz: e92866e154a80c358571348ebedbcc3fa7c0038b
+  metadata.gz: d60914f1d8dd41e9242834687e19f41409036932
+  data.tar.gz: 8a51798908bce2046da3d23bd7845af237df05d9
 SHA512:
-  metadata.gz: 18c7b7288ab955e023beaf8de4a58fd763d68712fbe1b3589280b8c9899ee621a20bab20d1c6c666644597d1522428958a4397b373175c50a37586cf75ebb55b
-  data.tar.gz: 238eadfe11529cae062586465abf71ec3b72df78d4f5cf24a8822265663158c9d2e67d4b132c6682643a7b4309e536d1ff1d61194432809ca80602d84ec61b08
+  metadata.gz: 5fc70290442f8fef6ff599bd3d21f2421851e8dd384a5cdb37333c765958d95d92a6f7bf040c24019d16984fe0cba16fc37a0b4fd4ed191b5f2eb28e08bac0de
+  data.tar.gz: 9ebfa97ef988cbe019d2a11e707d21f8245d0f8339e3ac580fdb7bea5065d493598d5fc7b525894e658c435e18785c7fd9c5574abdb753cddff49b8b749e7aec

data/lib/ruby_wolf/connection.rb

@@ -1,13 +1,14 @@
 module RubyWolf
   class Connection
-    attr_reader :socket, :read_data, :write_data
+    attr_reader :socket, :read_chunk, :write_chunk, :headers, :body, :path, :query, :method
 
     def initialize(socket)
       @socket = socket
-      @read_data = ''
-      @write_data = ''
-
+      @read_chunk = ''
+      @write_chunk = ''
       @reading = true
+
+      @headers = {}
     end
 
     def need_to_read?
@@ -15,23 +16,27 @@ module RubyWolf
     end
 
     def read
-      @read_data << socket.read_nonblock(RubyWolf::READ_SIZE)
-      @reading = false if @read_data.end_with?(RubyWolf::CRLF)
+      @read_chunk << socket.read_nonblock(RubyWolf::READ_SIZE)
+      if @content_length.nil?
+        read_headers
+      else
+        read_body
+      end
     rescue EOFError
       @reading = false
     end
 
     def enqueue_write(data)
-      @write_data += data
+      @write_chunk += data
     end
 
     def write
-      writen = socket.write_nonblock(@write_data)
-      @write_data[0..writen] = ''
+      writen = socket.write_nonblock(@write_chunk)
+      @write_chunk = @write_chunk.byteslice(writen, @write_chunk.bytesize)
     end
 
     def need_to_write?
-      !@write_data.length.zero?
+      !@write_chunk.bytesize.zero?
     end
 
     def to_io
@@ -41,5 +46,36 @@ module RubyWolf
     def close
       @socket.close
     end
+
+    private
+
+    def read_headers
+      header_ending = @read_chunk.index(RubyWolf::HEADER_ENDING)
+      return if header_ending.nil?
+
+      headers_chunk = @read_chunk.slice!(
+        0, header_ending + RubyWolf::HEADER_ENDING.size
+      )
+      parse_headers(headers_chunk)
+      @content_length = @headers['Content-Length'].to_i
+      read_body
+    end
+
+    def parse_headers(headers_chunk)
+      parser = Http::Parser.new
+      parser.on_headers_complete = proc do
+        @headers = parser.headers
+        @method = parser.http_method
+        uri = URI.parse(parser.request_url)
+        @path = uri.path
+        @query = uri.query
+        :stop
+      end
+      parser << headers_chunk
+    end
+
+    def read_body
+      @reading = false if @read_chunk.bytesize >= @content_length
+    end
   end
 end

data/lib/ruby_wolf/handler.rb

@@ -15,7 +15,6 @@ module RubyWolf
 
     def process
       prepare_rack_env
-      parse_request
       generate_response
       callback.call(response) if callback
       response
@@ -24,37 +23,36 @@ module RubyWolf
     private
 
     def prepare_rack_env
-      @env = ENV.to_h
-      @env.delete 'HTTP_CONTENT_LENGTH'
-      url_scheme = %w(yes on 1).include?(ENV[::Rack::HTTPS]) ? 'https' : 'http'
-      @env.update(
-        ::Rack::RACK_VERSION      => ::Rack::VERSION,
-        ::Rack::RACK_INPUT        => STDIN,
-        ::Rack::RACK_ERRORS       => STDERR,
-        ::Rack::RACK_MULTITHREAD  => false,
-        ::Rack::RACK_MULTIPROCESS => true,
-        ::Rack::RACK_RUNONCE      => true,
-        ::Rack::RACK_URL_SCHEME   => url_scheme,
-        ::Rack::SERVER_PROTOCOL   => 'HTTP/1.1'
-      )
-    end
+      @env = ENV.to_h.merge(
+        'rack.version' => ::Rack::VERSION,
+        'rack.errors' => STDERR,
+        'rack.multithread'  => false,
+        'rack.multiprocess' => true,
+        'rack.runonce'      => true,
+        'rack.url_scheme'   => ENV['HTTPS'] ? 'https' : 'http',
 
-    def parse_request
-      parser = Http::Parser.new
-      parser.on_headers_complete = proc do
-        env[::Rack::HTTP_VERSION] = parser.http_version
-        env[::Rack::REQUEST_METHOD] = parser.http_method
+        '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)
+      )
 
-        uri = URI.parse(parser.request_url)
-        env[::Rack::REQUEST_PATH] = uri.path
-        env[::Rack::QUERY_STRING] = uri.query
-      end
-      parser << connection.read_data
       RubyWolf.log(
         [
-          "HTTP/#{env[::Rack::HTTP_VERSION].join('.')}",
-          env[::Rack::REQUEST_METHOD],
-          "#{env[::Rack::REQUEST_PATH]}?#{env[::Rack::QUERY_STRING]}"
+          'HTTP/1.1',
+          connection.method,
+          "#{connection.path}?#{connection.query}"
         ].join(' ')
       )
     end
@@ -62,13 +60,13 @@ module RubyWolf
     def generate_response
       status, headers, body = app.call(env)
       RubyWolf.log(
-        "Response #{env[::Rack::SERVER_PROTOCOL]} #{status}"
+        "Response HTTP/1.1 #{status}"
       )
       compose_response(status, headers, body)
     end
 
     def compose_response(status, headers, body)
-      @response += "#{env[::Rack::SERVER_PROTOCOL]} #{status} #{RubyWolf::CRLF}"
+      @response += "HTTP/1.1 #{status} #{RubyWolf::CRLF}"
       headers.each do |key, value|
         @response += "#{key}: #{value}#{RubyWolf::CRLF}"
       end

data/lib/ruby_wolf/version.rb

@@ -1,3 +1,3 @@
 module RubyWolf
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/ruby_wolf.rb

@@ -12,6 +12,7 @@ require 'ruby_wolf/cli'
 module RubyWolf
   MAIN_PID = Process.pid
   CRLF = "\r\n".freeze
+  HEADER_ENDING = "\r\n\r\n".freeze
   READ_SIZE = 16 * 1024
 
   def self.logger

data/ruby_wolf.gemspec

@@ -20,9 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = ['ruby_wolf']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'rspec', '~>3.5.0', '>=3.5.0'
-  spec.add_development_dependency 'byebug', '~>9.0.0', '>=8.0.0'
+  spec.add_development_dependency 'rspec', '~>3.5', '>=3.5.0'
+  spec.add_development_dependency 'byebug', '~>9.0', '>=9.0.0'
 
-  spec.add_runtime_dependency 'rack', '~>2.0.0', '>=2.0.0'
-  spec.add_runtime_dependency 'http_parser.rb', '~>0.6.0', '>=0.6.0'
+  spec.add_runtime_dependency 'http_parser.rb', '~>0.6', '>=0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wolf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nguyễn Quang Minh
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
@@ -36,47 +36,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: '9.0'
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
       - !ruby/object:Gem::Version
         version: 9.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 8.0.0
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 9.0.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
@@ -86,7 +66,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0