em-midori 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4238511fe308c3529be24fbad1cd44b3e436cc
-  data.tar.gz: 9a01e07793ec3b2f72fd2e43f2609aba482798dd
+  metadata.gz: 94ba1f04f2fa2a1c67fb02452a7e876a4539055a
+  data.tar.gz: f0f7755bfc1d858f8b96a59bd4d85448063b0e18
 SHA512:
-  metadata.gz: 336b392c12a61aafa8538d3d6cad03e7c7c1559432faf4dc879d4dfc16dd0bff2a69822a20e52f79f2fc1fb7198d6bf05111cccf4f57aecf866673ec1f94be4e
-  data.tar.gz: 4714ff8b26be8dcf63fea4f8386cc7c1d0ed200f64058dd9707f945470bc34e024c1b2c2e22ed3c9b0252f4153bfe65324f2ad6b914ebac709da431e32f95768
+  metadata.gz: '019ee08cb1214e64468b04d134399815237c792470916af7590293c321b2400b76a9190c73a163625529d542c768ec6a9e953a0b8192b032d6fa12a86fbf5581'
+  data.tar.gz: eb8310f650a6963f3ffd54c4544e7d6e9ad850dde10f89f00f87761d13c0a18f0eaa606cdd9800b2abc01f4bd07d73818be643f111ade90ea05137a63bb7de81

data/lib/midori/connection.rb

@@ -27,7 +27,7 @@ class Midori::Connection
         receive_data(monitor)
       end
       if monitor.writable?
-        if !@data.empty?
+        if !@data == ''
           # :nocov:
           # Leave for corner cases
           monitor.io.write_nonblock(@data)

data/lib/midori/core_ext/event_loop.rb

@@ -31,6 +31,7 @@ module EventLoop
     # @yield what to run when io callbacks
     # @return [nil] nil
     def register(io, interest=(:rw), &callback)
+      config if @selector.nil?
       if @queue[io.to_i].nil?
         @queue[io.to_i] = Array.new
         register_raw(io, interest, callback)

data/lib/midori/request.rb

@@ -13,20 +13,28 @@
 class Midori::Request
   attr_accessor :ip, :port,
                 :protocol, :method, :path, :query_string,
-                :header, :body, :parsed, :params
+                :header, :body, :parsed, :body_parsed, :params
 
   # Init Request
   def initialize
     @parsed = false
+    @body_parsed = false
     @is_websocket = false
     @is_eventsource = false
     @parser = Http::Parser.new
     @params = {}
+    @body = ''
     @parser.on_headers_complete = proc do
       @protocol = @parser.http_version
       @method = @parser.http_method
       @path = @parser.request_url
       @header = @parser.headers
+
+      @query_string = @path.match(/\?(.*?)$/)
+      @query_string = @query_string[1] unless @query_string.nil?
+      @path.gsub!(/\?(.*?)$/, '')
+      @method = @method.to_sym
+      @parsed = true
       :stop
     end
   end
@@ -35,12 +43,25 @@ class Midori::Request
   # @param [String] data
   # @return [nil] nil
   def parse(data)
-    offset = @parser << data
-    @body = data[offset..-1]
-    @query_string = @path.match(/\?(.*?)$/)
-    @query_string = @query_string[1] unless @query_string.nil?
-    @path.gsub!(/\?(.*?)$/, '')
+    # Call parser if header not parsed
+    if @parsed
+      @body += data
+    else
+      offset = @parser << data
+      @body += data[offset..-1] if @parsed
+    end
+
+    # Set body parsed if body reaches content length
+    if (@header['Content-Length'].to_i || 0) <= @body.bytesize
+      @body_parsed = true
+      pre_proceed
+    end
+    nil
+  end
 
+  # Preproceed the request after parsed
+  # @return [nil] nil
+  def pre_proceed
     # Deal with WebSocket
     if @header['Upgrade'] == 'websocket' && @header['Connection'] == 'Upgrade'
       @method = :WEBSOCKET
@@ -54,15 +75,21 @@ class Midori::Request
     end
 
     @method = @method.to_sym
-    @parsed = true
+    nil
   end
 
-  # Syntactic sugar for whether a request is parsed
+  # Syntactic sugar for whether a request header is parsed
   # @return [Boolean] parsed or not
   def parsed?
     @parsed
   end
 
+  # Syntactic sugar for whether a request body is parsed
+  # @return [Boolean] parsed or not
+  def body_parsed?
+    @body_parsed
+  end
+
   # Syntactic sugar for whether a request is a websocket request
   # @return [Boolean] websocket or not
   def websocket?

data/lib/midori/server.rb

@@ -34,26 +34,25 @@ module Midori::Server
           @request.ip = ip
           @request.port = port
           data = monitor.io.read_nonblock(16_384)
-          if @request.parsed?
+          if @request.parsed? && @request.body_parsed?
             websocket_request(StringIO.new(data))
           else
-            receive_new_request(data)
+            @request.parse(data)
+            receive_new_request if @request.parsed && @request.body_parsed?
           end
           now_time = Time.now
           @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
-        rescue
+        rescue => e
           close_connection
-          @logger.warn "#{@request.ip} - - Reached an EOF Error".yellow
+          @logger.warn "#{@request.ip} - - #{e.backtrace.join("\n")}".yellow
         end
       end)
     end.call
   end
 
   # Logic of receiving new request
-  # @param [String] data raw data
-  def receive_new_request(data)
+  def receive_new_request
     begin
-      @request.parse(data)
       @response = @api.receive(request, self)
       call_event(:open) if @request.websocket?
     rescue Midori::Exception::NotFound => e

data/lib/midori/version.rb

@@ -1,5 +1,5 @@
 # Midori Module
 module Midori
   # Current Version Code
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r