em-midori 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad463d2a5c54f9995812d347d0f428752414d77
-  data.tar.gz: 9a9ea6eb52f59bf540e7dc37d24a6581393a439d
+  metadata.gz: d890861f5486fd8c8ecd3dff2a3780a26af42340
+  data.tar.gz: 1d6ddf047c3534998eb6637cfbe387d56f1e86f2
 SHA512:
-  metadata.gz: bf12420ff582c13a143a872462284f3232472decff29a686286d931eb5fac60371182a313e0327c41281eea5a8a673913dd59eeebf560a8ecc99a4245aeaca9b
-  data.tar.gz: b40da8f51f4c39e5b9dd46a5944c17b0672425ffa5869a14a5880df85d0ce9bd92c19daa7433131624e4b93308ecf69d09f8c0e5afb3c0edcc3b4111957c3066
+  metadata.gz: 2664bb10cda5ab00f264bd91e633315ab2f05fb44218050597fc61c34890fa00bf042d3a476e24711415b9eb8d28e2a4b94f2225bb307f1f1e77c1fffde468d6
+  data.tar.gz: 884cce78c3c28f9014823b45d03529082d7ff4c6832be0bfaa490265a08a7a05ad2b3ed7d5447074edbb6d3e06d32a0006004116afece1b442511f417583d33e

data/.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.rb]
+indent_style = space
+indent_size = 2

data/em-midori.sublime-project

@@ -0,0 +1,16 @@
+{
+  "folders":
+  [
+    {
+      "path": ".",
+      "folder_exclude_patterns": [".resources", "coverage"],
+      "file_exclude_patterns": ["em-midori-*.gem","*.sublime-workspace","logo.png",".DS_Store","CONTRIBUTOR_COVENANT_CODE_OF_CONDUCT.md"]
+    }
+  ],
+	"settings":
+	{
+		"tab_size": 2,
+		"translate_tabs_to_spaces": true,
+		"trim_trailing_white_space_on_save": true
+	}
+}

data/lib/midori/connection.rb

@@ -39,6 +39,8 @@ class Midori::Connection
   def close_connection
     EventLoop.deregister @socket
     @socket.close
+  rescue Errno::EBADF
+    # Connection finished in advance
   end
 
   def close_connection_after_writing

data/lib/midori/core_ext/event_loop.rb

@@ -4,28 +4,52 @@ module EventLoop
   class << self
     SELECTOR = NIO::Selector.new
     TIMERS = []
+    IOS = Hash.new
+    QUEUE = Hash.new
 
     def add_timer(timer)
       timer.start_time = Time.now.to_f + timer.time
       TIMERS << timer
     end
 
-    def register(io, interest=(:rw), &callback)
-      monitor = SELECTOR.register(io, interest)
-      monitor.value = {
+    def register(io, interest=(:rw), timeout=nil, resolve=nil, &callback)
+      if QUEUE[io.to_i].nil?
+        QUEUE[io.to_i] = Array.new
+        register_raw(io, interest, timeout, resolve, callback)
+      else
+        QUEUE[io.to_i] << [io, interest, timeout, resolve, callback]
+      end
+    end
+
+    def register_raw(io, interest=(:rw), timeout=nil, resolve=nil, callback)
+      SELECTOR.register(io, interest)
+      timer = nil
+      unless timeout.nil?
+        timer = EventLoop::Timer.new(timeout) do
+          EventLoop.deregister(io)
+          resolve.call(TimeoutError) unless resolve.nil?
+        end
+        EventLoop.add_timer(timer)
+      end
+
+      IOS[io] = {
+          timer: timer ? timer : nil,
           callback: callback,
       }
-
     end
 
     def deregister(io)
+      fd = io.to_i
       SELECTOR.deregister(io)
+      IOS.delete(io)
+      next_register = QUEUE[fd].shift
+      next_register.nil? ? QUEUE.delete(fd) : register_raw(*next_register)
     end
 
     def run_once
-      SELECTOR.select(0.2) do |monitor| # Timeout for 1 secs
-        monitor.value[:timer].stop unless monitor.value[:timer].nil?
-        monitor.value[:callback].call(monitor)
+      SELECTOR.select(0.2) do |monitor| # Timeout for 0.2 secs
+        TIMERS.delete(IOS[monitor.io][:timer]) unless IOS[monitor.io][:timer].nil?
+        IOS[monitor.io][:callback].call(monitor)
       end
       EventLoop.timer_once
     end

data/lib/midori/core_ext/promise.rb

@@ -45,6 +45,17 @@ module Kernel
   # @example
   #   result = await SQL.query('SELECT * FROM hello')
   def await(promise)
-    Fiber.yield promise
+    result = Fiber.yield promise
+    if result.is_a? PromiseException
+      raise result.payload
+    end
+    result
   end
 end
+
+class PromiseException < Exception
+  attr_reader :payload
+  def initialize(payload)
+    @payload = payload
+  end
+end

data/lib/midori/extension/net.rb

@@ -3,8 +3,9 @@ require 'net/protocol'
 class Net::BufferedIO
   def wait_io(interest)
     await(Promise.new do |resolve|
-      EventLoop.register(@io.to_io, interest) do
-        EventLoop.deregister(@io.to_io)
+      io = @io.to_io
+      EventLoop.register(io, interest) do
+        EventLoop.deregister(io)
         resolve.call(self)
       end
     end)

data/lib/midori/extension/sequel/mysql2.rb

@@ -1,6 +1,8 @@
 safe_require 'sequel', 'gem install sequel'
 require 'sequel/adapters/mysql2'
 
+MYSQL_SOCKETS = {}
+
 module Sequel
   module Mysql2
     class Database
@@ -36,22 +38,31 @@ module Sequel
               stmt.execute(*args)
               # :nocov:
             else
-              socket = IO::open(conn.socket)
-              await(Promise.new do |resolve|
-                EventLoop.register(socket, :w) do
-                  EventLoop.deregister(socket)
-                  conn.query(sql,
-                             database_timezone: timezone,
-                             application_timezone: Sequel.application_timezone,
-                             stream: stream,
-                             async: true)
-                  resolve.call
-                end
-              end)
+              if MYSQL_SOCKETS[conn.socket].nil?
+                MYSQL_SOCKETS[conn.socket] = IO::open(conn.socket)
+              end
+              socket = MYSQL_SOCKETS[conn.socket]
               await(Promise.new do |resolve|
-                EventLoop.register(socket, :r) do
-                  EventLoop.deregister(socket)
-                  resolve.call(conn.async_result)
+                count = 0
+                EventLoop.register(socket, :rw, 2, resolve) do
+                  if (count == 0)
+                    # Writable
+                    count += 1
+                    conn.query(sql,
+                               database_timezone: timezone,
+                               application_timezone: Sequel.application_timezone,
+                               stream: stream,
+                               async: true)
+                  else
+                    # Readable
+                    begin
+                      EventLoop.deregister(socket)
+                      resolve.call(conn.async_result)
+                    rescue ::Mysql2::Error => e
+                      resolve.call(PromiseException.new(e))
+                      next
+                    end
+                  end
                 end
               end)
             end

data/lib/midori/extension/sequel/postgres.rb

@@ -1,6 +1,8 @@
 safe_require 'sequel', 'gem install sequel'
 require 'sequel/adapters/postgres'
 
+POSTGRES_SOCKETS = {}
+
 ##
 # Midori Extension of sequel postgres through meta programming
 class Sequel::Postgres::Adapter
@@ -10,24 +12,30 @@ class Sequel::Postgres::Adapter
   # @return [Array] sql query result
   def execute_query(sql, args)
       @db.log_connection_yield(sql, self, args) do
-        socket_object = IO.for_fd(socket)
-        await(Promise.new do |resolve|
-          EventLoop.register(socket_object, :w) do
-            unless is_busy
-              EventLoop.deregister(socket_object)
-              send_query(sql)
-              resolve.call
+        if POSTGRES_SOCKETS[self].nil?
+          POSTGRES_SOCKETS[self] = IO::open(socket)
+        end
+        socket_object = POSTGRES_SOCKETS[self]
+        result = await(Promise.new do |resolve|
+          count = 0
+          EventLoop.register(socket_object, :rw) do
+            begin
+              if (count == 0)
+                # Writable
+                unless is_busy
+                  send_query(sql)
+                  count += 1
+                end
+              else
+                # Readable
+                EventLoop.deregister(socket_object)
+                resolve.call(get_result)
+              end
+            rescue => e
+              resolve.call(PromiseException.new(e))
             end
           end
         end)
-
-        await(Promise.new do |resolve|
-          consume_input
-          EventLoop.register(socket_object, :r) do
-            EventLoop.deregister(socket_object)
-            resolve.call(get_result)
-          end
-        end)
       end
   end
 end

data/lib/midori/runner.rb

@@ -13,6 +13,7 @@ class Midori::Runner
     @bind = configure.bind
     @port = configure.port
     @api = ((api.is_a?Midori::APIEngine) ? api : Midori::APIEngine.new(api, configure.route_type))
+    @before = configure.before
   end
 
   # Get Midori server whether running
@@ -33,6 +34,9 @@ class Midori::Runner
       connection = Midori::Connection.new(socket)
       connection.server_initialize(@api, @logger)
     end
+    async_fiber(Fiber.new do
+      @before.call
+    end)
     EventLoop.start
     nil
   end

data/lib/midori/server.rb

@@ -43,7 +43,7 @@ module Midori::Server
           @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
           close_connection
-          @logger.error "#{@request.ip} - - Reached an EOF Error".red
+          @logger.warn "#{@request.ip} - - Reached an EOF Error".yellow
         end
       end)
     end.call

data/lib/midori/version.rb

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

data/tutorial/essentials/installation.md

@@ -37,7 +37,7 @@ It's hard to say that if it is possible for running on other ruby implementation
 
 ```
 $ gem install em-midori
-Successfully installed em-midori-0.1.7
+Successfully installed em-midori-0.1.12
 1 gem installed
 ```
 
@@ -50,7 +50,7 @@ $ ruby -r "midori" -e "class A < Midori::API;end;Midori::Runner.new(A).start"
 If you see the following message, then everything now works fine.
 
 ```
-Midori 0.1.7 is now running on 127.0.0.1:8080
+Midori 0.1.12 is now running on 127.0.0.1:8080
 ```
 
 ## Use Bundler

data/tutorial/essentials/routing.md

@@ -2,7 +2,7 @@
 
 ## Basic Usage
 
-Routes should be defined inside a class inherited from `Midori::API`. Midori doesn't support defining routes  globally like sinatra to avoid scope pollution, which affects a lot in scaling project.
+Routes should be defined inside a class inherited from `Midori::API`. Midori doesn't support defining routes globally like sinatra to avoid scope pollution, which affects a lot in scaling project.
 
 In midori, a route is an HTTP method with a URL-matching pattern. Each route is associated with a block:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: midori_http_parser
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - LICENSE
+- em-midori.sublime-project
 - lib/midori.rb
 - lib/midori/api.rb
 - lib/midori/api_engine.rb
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: High performance ruby web framework