em-midori 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44777e7d5978bba6e8fd91c8cc640ef40270a7f3
-  data.tar.gz: dd69a2679cf440bc4ea7a29f52b6e0652d917b7c
+  metadata.gz: d8f1764aac74f15dee72578e5dcc216e5afe34be
+  data.tar.gz: 82d47b7a7b1a1eb822bd8ee3eba631d8527dcfb1
 SHA512:
-  metadata.gz: f9716b1feb7f5f7609eae2c662bff23b1bc4900024f02124faf4b4200803a9e91dec19f851d2a68a5504c0ae4bb2a731aa0fd35c88401b0fa59adebb8597e73e
-  data.tar.gz: ddbb5d354658e519d9a8c4c29b134e24e28e1fa2e0ff2d2b35878f08fc9047b7510fade34e331699b827115359869e65acf6e5569d2010ee75a0a7d21ee840c7
+  metadata.gz: b27d592dbb83a83fd75e83825ecb24d8aed3548a641df1a97b4d659b461600c6db19cc421bb12bd1c3c19f250bd1fcb6012c2046838941a569f5d474313b73bb
+  data.tar.gz: b32db3e3fc35dff0f2f4669c435fbfe03bb46a6f2fee5e8e74f587b8c50dca7f0f20a1fdeb2eb97f68a5364010008379d7434f13487711212f950b6828c4612e

data/lib/midori.rb

@@ -11,7 +11,6 @@ require_relative 'midori/core_ext/configurable'
 require_relative 'midori/core_ext/string'
 require_relative 'midori/core_ext/event_loop'
 require_relative 'midori/core_ext/promise'
-require_relative 'midori/core_ext/promise_exception'
 require_relative 'midori/core_ext/define_class'
 require_relative 'midori/core_ext/proc'
 require_relative 'midori/core_ext/safe_require'

data/lib/midori/core_ext/promise.rb

@@ -45,8 +45,6 @@ module Kernel
   # @example
   #   result = await SQL.query('SELECT * FROM hello')
   def await(promise)
-    result = Fiber.yield promise
-    raise result.raw_exception if result.is_a?PromiseException
-    result
+    Fiber.yield promise
   end
 end

data/lib/midori/extension/file.rb

@@ -0,0 +1,40 @@
+class Midori::File
+  def initialize(*args)
+    @file = File.new(*args)
+  end
+
+  def read
+    await(Promise.new do |resolve|
+      data = ''
+      EventLoop.register(@file, :r) do
+        if @file.eof?
+          EventLoop.unregister(@file)
+          resolve.call(data)
+        else
+          data << @file.read_nonblock(16384)
+        end
+      end
+    end)
+  end
+
+  def write(data)
+    await(Promise.new do |resolve|
+      written = 0
+      EventLoop.register(@file, :w) do
+        written += @file.write_nonblock(data[written..-1])
+        if written == data.size
+          EventLoop.unregister(@file)
+          resolve.call(written)
+        end
+      end
+    end)
+  end
+
+  def raw
+    @file
+  end
+
+  def close
+    @file.close
+  end
+end

data/lib/midori/extension/hiredis.rb

@@ -0,0 +1,47 @@
+module Hiredis
+  require 'hiredis/connection'
+  # Overwrite with ruby implementation to hook IO
+  require 'hiredis/ruby/connection'
+  require 'hiredis/ruby/reader'
+  Connection = Ruby::Connection
+  Reader = Ruby::Reader
+end
+
+module Hiredis
+  module Ruby
+    class Connection
+      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.unregister(@sock)
+              resolve.call
+            end
+          end
+        end)
+      end
+
+      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.unregister(@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

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

@@ -0,0 +1,33 @@
+safe_require 'sequel', 'gem install sequel'
+require 'sequel/adapters/postgres'
+
+##
+# Midori Extension of sequel postgres through meta programming
+class Sequel::Postgres::Adapter
+  # Call a sql request asynchronously
+  # @param [String] sql sql request
+  # @param [Array] args args to send
+  # @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
+            EventLoop.unregister(socket_object)
+            until is_busy
+              send_query(sql)
+              resolve.call
+            end
+          end
+        end)
+
+        await(Promise.new do |resolve|
+          consume_input
+          EventLoop.register(socket_object, :r) do
+            EventLoop.unregister(socket_object)
+            resolve.call(get_result)
+          end
+        end)
+      end
+  end
+end

data/lib/midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -72,12 +72,13 @@ files:
 - lib/midori/core_ext/event_loop.rb
 - lib/midori/core_ext/proc.rb
 - lib/midori/core_ext/promise.rb
-- lib/midori/core_ext/promise_exception.rb
 - lib/midori/core_ext/safe_require.rb
 - lib/midori/core_ext/string.rb
 - lib/midori/eventsource.rb
 - lib/midori/exception.rb
-- lib/midori/extension/.gitkeep
+- lib/midori/extension/file.rb
+- lib/midori/extension/hiredis.rb
+- lib/midori/extension/sequel/postgres.rb
 - lib/midori/middleware.rb
 - lib/midori/request.rb
 - lib/midori/response.rb

data/lib/midori/core_ext/promise_exception.rb

@@ -1,13 +0,0 @@
-##
-# A special error as containers of errors inside [Promise]
-# @attr [StandardError] raw_exception raw exception raised
-class PromiseException < StandardError
-  attr_reader :raw_exception
-
-  # Init PromiseException
-  # @param [StandardError] raw_exception raw exception raised
-  def initialize(raw_exception)
-    super(nil)
-    @raw_exception = raw_exception
-  end
-end