em-midori 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ba1f04f2fa2a1c67fb02452a7e876a4539055a
-  data.tar.gz: f0f7755bfc1d858f8b96a59bd4d85448063b0e18
+  metadata.gz: 3925b4b9ef7e976cc1e1af24b2979a0e3a276f06
+  data.tar.gz: 6b8a7e0d0300709096247aed4755a285d128cf94
 SHA512:
-  metadata.gz: '019ee08cb1214e64468b04d134399815237c792470916af7590293c321b2400b76a9190c73a163625529d542c768ec6a9e953a0b8192b032d6fa12a86fbf5581'
-  data.tar.gz: eb8310f650a6963f3ffd54c4544e7d6e9ad850dde10f89f00f87761d13c0a18f0eaa606cdd9800b2abc01f4bd07d73818be643f111ade90ea05137a63bb7de81
+  metadata.gz: 449941b9d262ef8a1e8727524976e3af90effde6efc56d043258b37db1eb3a932dc16c6ff701ccd18911dbd23d9c0c821441d687ccabc9e811a5c91b197cf419
+  data.tar.gz: 512051dcf9e5d764ba1c46b4cc1f817189b91d65875b08472a2337cdbe3da6d9aac72124e49da4b71b6a43ca3e607382d862ed9b699f6ae2aa3cc30cb7bc72dd

data/lib/midori/extension/redic.rb

@@ -0,0 +1,88 @@
+##
+# Meta-programming hiredis for redis async extension
+module Hiredis
+  require 'hiredis/connection'
+  # Overwrite with ruby implementation to hook IO
+  require 'hiredis/ruby/connection'
+  require 'hiredis/ruby/reader'
+  # Redis Connection
+  Connection = Ruby::Connection
+  # Redis Result Reader
+  Reader = Ruby::Reader
+
+  ##
+  # Meta-programming hiredis for redis async extension
+  module Ruby
+    ##
+    # Meta-programming hiredis for redis async extension
+    class Connection
+      # Do redis query
+      # @param [String] data generated string data
+      def query(args)
+        await(Promise.new do |resolve|
+          read_flag = false
+          data = pre_write(args)
+          written = 0
+          EventLoop.register(@sock, :rw) do |monitor|
+            if read_flag && monitor.readable?
+              # Reading
+              _read(resolve, @sock)
+            end
+            if !read_flag && monitor.writable?
+              # Writing
+              written += @sock.write_nonblock(data[written..-1])
+              read_flag = true if written == string_size(data)
+            end
+          end
+        end)
+      end
+
+      private
+        def pre_write(args)
+          command = []
+          command << "*#{args.size}"
+          args.each do |arg|
+            arg = arg.to_s
+            command << "$#{string_size arg}"
+            command << arg
+          end
+          data = command.join(COMMAND_DELIMITER) + COMMAND_DELIMITER
+          data.force_encoding('binary') if data.respond_to?(:force_encoding)
+          data
+        end
+
+        def _read(resolve, sock)
+          @reader.feed @sock.read_nonblock(1024)
+          reply = @reader.gets
+          if reply
+            EventLoop.deregister(sock)
+            resolve.call(reply)
+          end
+        end
+    end
+  end
+end
+
+require 'redic'
+
+class Redic
+  class Client
+    def connect
+      establish_connection unless connected?
+      if block_given?
+        @semaphore.synchronize do
+          yield
+        end
+      end
+    end
+
+    def call(*args)
+      @connection.query(*args)
+    end
+  end
+
+  def call(*args)
+    @client.connect
+    @client.call(args)
+  end
+end

data/lib/midori/request.rb

@@ -8,7 +8,8 @@
 # @attr [String] query_string request query string
 # @attr [Hash] header request header
 # @attr [String] body request body
-# @attr [Boolean] parsed whether the request parsed
+# @attr [Boolean] parsed whether the request header parsed
+# @attr [Boolean] body_parsed whether the request body parsed
 # @attr [Hash] params params in the url
 class Midori::Request
   attr_accessor :ip, :port,

data/lib/midori/runner.rb

@@ -2,8 +2,9 @@
 # Abstract runner class to control instance of Midori Server
 # @attr [String] bind the address to bind
 # @attr [Integer] port the port to bind
+# @attr [Logger] logger midori logger
 class Midori::Runner
-  attr_reader :bind, :port
+  attr_reader :bind, :port, :logger
 
   # Define status of a runner
   # @param [Class] api inherited from [Midori::API]

data/lib/midori/server.rb

@@ -28,7 +28,6 @@ module Midori::Server
     lambda do
       async_fiber(Fiber.new do
         begin
-          start_time = Time.now
           _sock_domain, remote_port, _remote_hostname, remote_ip = monitor.io.peeraddr
           port, ip = remote_port, remote_ip
           @request.ip = ip
@@ -40,8 +39,6 @@ module Midori::Server
             @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 => e
           close_connection
           @logger.warn "#{@request.ip} - - #{e.backtrace.join("\n")}".yellow
@@ -53,7 +50,10 @@ module Midori::Server
   # Logic of receiving new request
   def receive_new_request
     begin
+      start_time = Time.now
       @response = @api.receive(request, self)
+      now_time = Time.now
+      @logger.info "#{@request.ip} - - \"#{@request.method} #{@request.path} HTTP/#{@request.protocol.join('.')}\" #{@response.status} #{sprintf("%.6f", now_time.to_f - start_time.to_f)}".green
       call_event(:open) if @request.websocket?
     rescue Midori::Exception::NotFound => e
       @response = Midori::Sandbox.capture(e)

data/lib/midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -80,8 +80,8 @@ files:
 - lib/midori/eventsource.rb
 - lib/midori/exception.rb
 - lib/midori/extension/file.rb
-- lib/midori/extension/hiredis.rb
 - lib/midori/extension/net.rb
+- lib/midori/extension/redic.rb
 - lib/midori/extension/sequel/mysql2.rb
 - lib/midori/extension/sequel/postgres.rb
 - lib/midori/middleware.rb

data/lib/midori/extension/hiredis.rb

@@ -1,59 +0,0 @@
-##
-# Meta-programming hiredis for redis async extension
-module Hiredis
-  require 'hiredis/connection'
-  # Overwrite with ruby implementation to hook IO
-  require 'hiredis/ruby/connection'
-  require 'hiredis/ruby/reader'
-  # Redis Connection
-  Connection = Ruby::Connection
-  # Redis Result Reader
-  Reader = Ruby::Reader
-
-  ##
-  # Meta-programming hiredis for redis async extension
-  module Ruby
-    ##
-    # Meta-programming hiredis for redis async extension
-    class Connection
-      # write message directly
-      # @param [IO] _sock raw socket
-      # @param [String] data generated string data
-      # @param [Float] _timeout operation timeout
-      def _write(_sock, data, _timeout)
-        await(Promise.new do |resolve|
-          data.force_encoding('binary') if data.respond_to?(:force_encoding)
-          written = 0
-          EventLoop.register(@sock, :w) do
-            written += @sock.write_nonblock(data[written..-1])
-            if written == string_size(data)
-              EventLoop.deregister(@sock)
-              resolve.call
-            end
-          end
-        end)
-      end
-
-      # read from redis socket
-      # @return [String] reply
-      def read
-        raise 'not connected' unless connected?
-        await(Promise.new do |resolve|
-          EventLoop.register(@sock, :r) do
-            @reader.feed @sock.read_nonblock(1024)
-            reply = @reader.gets
-            if reply
-              EventLoop.deregister(@sock)
-              resolve.call(reply)
-            end
-          end
-        end)
-      rescue ::EOFError
-        # :nocov:
-        # Error Handler Copied from HiRedis driver itself
-        raise Errno::ECONNRESET
-        # :nocov:
-      end
-    end
-  end
-end