em-midori 0.0.9.3 → 0.0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10e7c12fb4c851be82d6b1ebf1a5edbdfa8c3b77
-  data.tar.gz: 1e8c9cfe8c4cb0416f8e4f2f84ac2160e1825096
+  metadata.gz: e0d4d25a2e0b11d17de9055f366c3b25180e715e
+  data.tar.gz: 9b24a8c14b08619784257e9ff51262551a6c4253
 SHA512:
-  metadata.gz: a97cb0557f0865a4198415d9d72f3abf36b0b1929dda53b5fdcd0470c36d9ca99372da9deb3db60a510100052d36ae5e768456be6674d9ead089b4404d0f1e81
-  data.tar.gz: 7041791083c422d4b7929bcbb9fb97a43c37d82890333b61eba09a60fae44c355f2bd79c74c56b4dc44c0839d47e3793181f4e94b0a831a457899661218b35fd
+  metadata.gz: 1a5ba3204e2ce3337a61a5f5d6bae3efcfbf2616f852ad94960431f863e43322bece69d1df7886b896091ab0403ff32e2099575041d0c46061447d00cbbfa990
+  data.tar.gz: f9bfafd37017da3d73ac3aaf7aaa24b1abd68806d7daf660dc3d19cf40b92f37ab99feb9a2264b6bd159b7d7d613ea7d83b2b0e619492eff76e1fb7ba4adc80a

data/lib/em-midori.rb

@@ -3,6 +3,7 @@ require 'stringio'
 require 'eventmachine'
 require 'fiber'
 require 'logger'
+require 'http/parser'
 
 require_relative 'em-midori/version'
 require_relative 'em-midori/string'

data/lib/em-midori/api.rb

@@ -180,7 +180,7 @@ class Midori::API
           result = -> { clean_room.instance_exec(*matched, &route.function) }.call
           clean_room.body = result if body_accept.include?(result.class)
           response = clean_room.raw_response
-          middlewares.reverse.each { |middleware| response = middleware.after(request, response) }
+          middlewares.reverse_each { |middleware| response = middleware.after(request, response) }
           return response
         end
       end

data/lib/em-midori/const.rb

@@ -35,7 +35,7 @@ module Midori::Const
     415 => '415 Unsupported Media Type',
     416 => '416 Requested range not satisfiable',
     417 => '417 Expectation Failed',
-    451 => '451 ',
+    451 => '451 Unavailable For Legal Reasons',
     500 => '500 Internal Server Error',
     501 => '501 Not Implemented',
     502 => '502 Bad Gateway',

data/lib/em-midori/em_midori.rb

@@ -11,6 +11,7 @@ module Midori
   # @return [nil] nil
   def self.run(api = Midori::API, ip = '127.0.0.1', port = 8081, logger = ::Logger.new(STDOUT))
     @logger = logger
+    EventMachine.set_simultaneous_accept_count(40)
     EventMachine.run do
       @logger.info "Midori #{Midori::VERSION} is now running on #{ip}:#{port}".blue
       @midori_server = EventMachine.start_server ip, port, Midori::Server, api, logger

data/lib/em-midori/request.rb

@@ -18,26 +18,24 @@ class Midori::Request
     @parsed = false
     @is_websocket = false
     @is_eventsource = false
+    @parser = Http::Parser.new
+    @parser.on_headers_complete = proc do
+      @protocol = @parser.http_version
+      @method = @parser.http_method
+      @path = @parser.request_url
+      @header = @parser.headers
+      :stop
+    end
   end
 
   # Init an request with StringIO data
-  # @param [StringIO+] data Request data
   def parse(data)
-    @header = {}
 
-    # Parse request
-    line = data.gets.split
-    @protocol = line[2]
-    @method = line[0]
-    @query_string = line[1].match(/\?(.*?)$/)
+    offset = @parser << data
+    @body = data[offset..-1]
+    @query_string = @path.match(/\?(.*?)$/)
     @query_string = @query_string[1] unless @query_string.nil?
-    @path = line[1].gsub(/\?(.*?)$/, '')
-
-    # Parse header
-    while (line = data.gets) != "\r\n"
-      line = line.split
-      @header[line[0][0..-2]] = line[1..-1].join(' ')
-    end
+    @path.gsub!(/\?(.*?)$/, '')
 
     # Deal with WebSocket
     if @header['Upgrade'] == 'websocket' && @header['Connection'] == 'Upgrade'
@@ -51,8 +49,6 @@ class Midori::Request
       @is_eventsource = true
     end
 
-    # Parse body
-    @body = data.read
     @parsed = true
   end
 

data/lib/em-midori/server.rb

@@ -20,20 +20,21 @@ module Midori::Server
   # Logics of receiving data
   # @param [String] data raw data
   def receive_data(data)
-    ->() { async_internal(Fiber.new do
-      start_time = Time.now
-      data = StringIO.new(data)
-      port, ip = Socket.unpack_sockaddr_in(get_peername)
-      @request.ip = ip
-      @request.port = port
-      if @request.parsed?
-        websocket_request(data)
-      else
-        receive_new_request(data)
-      end
-      now_time = Time.now
-      @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} #{@request.protocol}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(5)}".green
-    end) }.call
+    lambda do
+      async_internal(Fiber.new do
+                       start_time = Time.now
+                       port, ip = Socket.unpack_sockaddr_in(get_peername)
+                       @request.ip = ip
+                       @request.port = port
+                       if @request.parsed?
+                         websocket_request(StringIO.new(data))
+                       else
+                         receive_new_request(data)
+                       end
+                       now_time = Time.now
+                       @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path}\" #{@response.status} #{(now_time.to_f - start_time.to_f).round(6)}".green
+                     end)
+    end.call
   end
 
   # Logics of receiving new request
@@ -57,17 +58,17 @@ module Midori::Server
   end
 
   # Logics of receiving WebSocket request
-  # @param [String] data raw data
+  # @param [StringIO] data raw data
   def websocket_request(data)
     @websocket.decode(data)
     case @websocket.opcode
-      when 0x1, 0x2
-        call_event(:message, [@websocket.msg])
-      when 0x9
-        @websocket.pong(@websocket.msg)
-        call_event(:ping)
-      when 0xA
-        call_event(:pong)
+    when 0x1, 0x2
+      call_event(:message, [@websocket.msg])
+    when 0x9
+      @websocket.pong(@websocket.msg)
+      call_event(:ping)
+    when 0xA
+      call_event(:pong)
     end
   rescue Midori::Error::FrameEnd => _e
     call_event(:close)
@@ -87,6 +88,6 @@ module Midori::Server
   # @param [Symbol] event event name
   # @param [Array] args arg list
   def call_event(event, args = [])
-    (-> { @websocket.instance_exec(*args, &@websocket.events[event]) }.call) unless @websocket.events[event].nil?
+    -> { @websocket.instance_exec(*args, &@websocket.events[event]) }.call unless @websocket.events[event].nil?
   end
 end

data/lib/em-midori/version.rb

@@ -1,4 +1,4 @@
 module Midori
   # Current Version Code
-  VERSION = '0.0.9.3'.freeze
+  VERSION = '0.0.9.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.0.9.3
+  version: 0.0.9.4
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -30,6 +30,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.2.0.0
+- !ruby/object:Gem::Dependency
+  name: http_parser.rb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: EM Midori is an EventMachine-based Web Framework written in pure Ruby,
   providing high performance and proper abstraction.
 email: business@heckpsi.com