em-midori 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f1764aac74f15dee72578e5dcc216e5afe34be
-  data.tar.gz: 82d47b7a7b1a1eb822bd8ee3eba631d8527dcfb1
+  metadata.gz: 5026a74972dc1290c62c3fcc076c881164527ead
+  data.tar.gz: b93b97c69b109b6e28b9d05d46be862ff13447a5
 SHA512:
-  metadata.gz: b27d592dbb83a83fd75e83825ecb24d8aed3548a641df1a97b4d659b461600c6db19cc421bb12bd1c3c19f250bd1fcb6012c2046838941a569f5d474313b73bb
-  data.tar.gz: b32db3e3fc35dff0f2f4669c435fbfe03bb46a6f2fee5e8e74f587b8c50dca7f0f20a1fdeb2eb97f68a5364010008379d7434f13487711212f950b6828c4612e
+  metadata.gz: 885500b149d1153fededb86c8610be89361c2a3992d0f1a2ace635226121137f9beb5c32c9a519998ffeaff210f25b2a14d47176a5b031e487e8d36d7019d17d
+  data.tar.gz: 6d1563e43233277c2d41ef1bdb732e1131714449f67b0505d64777a6228d15804564b7e158b2a709cd8c9455588c0316ddd2a10b026bca213831a976f43b1e0c

data/lib/midori/connection.rb

@@ -30,20 +30,12 @@ class Midori::Connection
   end
 
   def send_data(data)
-    if @monitor.writable?
-      @socket.write_nonblock(data)
-    else
-      @data << data
-    end
+    @monitor.writable? ? @socket.write_nonblock(data) : @data << data
   end
 
   def close_connection
-    begin
-      EventLoop.unregister @socket
-      @socket.close
-    rescue => e
-      puts e
-    end
+    EventLoop.unregister @socket
+    @socket.close
   end
 
   def close_connection_after_writing

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

@@ -0,0 +1,91 @@
+safe_require 'sequel', 'gem install sequel'
+require 'sequel/adapters/mysql2'
+
+module Sequel
+  module Mysql2
+    class Database
+      # Execute the given SQL on the given connection.  If the :type
+      # option is :select, yield the result of the query, otherwise
+      # yield the connection if a block is given.
+      def _execute(conn, sql, opts) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
+        begin
+          # :nocov:
+          stream = opts[:stream]
+          if NativePreparedStatements
+            if (args = opts[:arguments])
+              args = args.map{|arg| bound_variable_value(arg)}
+            end
+
+            case sql
+              when ::Mysql2::Statement
+                stmt = sql
+              when Dataset
+                sql = sql.sql
+                close_stmt = true
+                stmt = conn.prepare(sql)
+            end
+          end
+
+          r = log_connection_yield((log_sql = opts[:log_sql]) ? sql + log_sql : sql, conn, args) do
+            if stmt
+              conn.query_options.merge!(cache_rows: true,
+                                        database_timezone: timezone,
+                                        application_timezone: Sequel.application_timezone,
+                                        stream: stream,
+                                        cast_booleans: convert_tinyint_to_bool)
+              stmt.execute(*args)
+              # :nocov:
+            else
+              socket = IO::open(conn.socket)
+              await(Promise.new do |resolve|
+                EventLoop.register(socket, :w) do
+                  EventLoop.unregister(socket)
+                  conn.query(sql,
+                             database_timezone: timezone,
+                             application_timezone: Sequel.application_timezone,
+                             stream: stream,
+                             async: true)
+                  resolve.call
+                end
+              end)
+              await(Promise.new do |resolve|
+                EventLoop.register(socket, :r) do
+                  EventLoop.unregister(socket)
+                  resolve.call(conn.async_result)
+                end
+              end)
+            end
+          end
+
+          # :nocov:
+          if opts[:type] == :select
+            if r
+              if stream
+                begin
+                  r2 = yield r
+                ensure
+                  # If r2 is nil, it means the block did not exit normally,
+                  # so the rest of the results must be drained to prevent
+                  # "commands out of sync" errors.
+                  r.each{} unless r2
+                end
+              else
+                yield r
+              end
+            end
+          elsif block_given?
+            yield conn
+          end
+        rescue ::Mysql2::Error => e
+          raise_error(e)
+        ensure
+          if stmt
+            conn.query_options.replace(conn.instance_variable_get(:@sequel_default_query_options))
+            stmt.close if close_stmt
+          end
+          # :nocov:
+        end
+      end
+    end
+  end
+end

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

@@ -13,8 +13,8 @@ class Sequel::Postgres::Adapter
         socket_object = IO.for_fd(socket)
         await(Promise.new do |resolve|
           EventLoop.register(socket_object, :w) do
-            EventLoop.unregister(socket_object)
-            until is_busy
+            unless is_busy
+              EventLoop.unregister(socket_object)
               send_query(sql)
               resolve.call
             end

data/lib/midori/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-midori
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -78,6 +78,7 @@ files:
 - lib/midori/exception.rb
 - lib/midori/extension/file.rb
 - lib/midori/extension/hiredis.rb
+- lib/midori/extension/sequel/mysql2.rb
 - lib/midori/extension/sequel/postgres.rb
 - lib/midori/middleware.rb
 - lib/midori/request.rb