midori-contrib 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ac8d9faf8ee2376a7f357a76db44ac8ce962329
-  data.tar.gz: 191d2c51018b09cd62cbf79c315c2147ca032afc
+  metadata.gz: 24ed1cf3359843568ec7431474d376c138897ee1
+  data.tar.gz: 71af4af1b3f865c8335e3a394d858a0188227b50
 SHA512:
-  metadata.gz: 5902d0c3e451d32ead116df690e9415f479eb60fb2ec751e5b3f67e51641a979de967f2a28942f150064e75ff5ef094d968a6697d5e924f849c453743ab66f34
-  data.tar.gz: da8bf901d5abb6600fc9164e6509a46e0ac6526472e0f7cb1e1b79570494ed064825de32db658f95666be6555aed68974a141f3309ffd311dd7b052224614022
+  metadata.gz: 78d6d9c77b55f20b8fb9eeba07624f5ffcc7cd25fb6a1466a6879971319eda2d9080f0c44f58238b1a00d1d84cabe1ca491ff87831cdfd803d14643092a9dd60
+  data.tar.gz: bc9ed3c3916549f2bac2ea37fbb6603a957f04440edb8e065591e5b1a5f64296f149637a891e20debd8a2c8a096e05eb53a0ad1b3f702729c1786fac07624daf

data/lib/midori-contrib.rb

@@ -3,7 +3,7 @@ module Midori
   # Midori Contrib Module
   module Contrib
     # Current Version Code
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end
 

data/lib/midori-contrib/sequel/mysql2.rb

@@ -11,6 +11,26 @@ module Sequel
   module Mysql2
     # Midori Extension of sequel MySQL through meta programming
     class Database
+      alias_method :_execute_block, :_execute
+
+      # 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.
+      # @param [Mysql2::Client] conn connection to database
+      # @param [String] sql sql query
+      # @param [Hash] opts optional options
+      # @return [Mysql2::Result] MySQL results
+      def _execute(conn, sql, opts, &block)
+        # _execute_nonblock(conn, sql, opts, &block)
+        if Fiber.current == EventLoop.root_fiber
+          # Block usage
+          return _execute_block(conn, sql, opts, &block)
+        else
+          # Nonblock usage
+          return _execute_nonblock(conn, sql, opts, &block)
+        end
+      end
+
       # 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.
@@ -18,7 +38,7 @@ module Sequel
       # @param [String] sql sql query
       # @param [Hash] opts optional options
       # @return [Mysql2::Result] MySQL results
-      def _execute(conn, sql, opts) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def _execute_nonblock(conn, sql, opts) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         begin
           # :nocov:
           stream = opts[:stream]

data/lib/midori-contrib/sequel/postgres.rb

@@ -11,7 +11,19 @@ class Sequel::Postgres::Adapter
   # @param [String] sql sql request
   # @param [Array] args args to send
   # @return [Array] sql query result
+  alias_method :execute_query_block, :execute_query
+
   def execute_query(sql, args)
+    if Fiber.current == EventLoop.root_fiber
+      # Block usage
+      return execute_query_block(sql, args)
+    else
+      # Nonblock usage
+      return execute_query_nonblock(sql, args)
+    end
+  end
+
+  def execute_query_nonblock(sql, args)
     @db.log_connection_yield(sql, self, args) do
       if POSTGRES_SOCKETS[self].nil?
         POSTGRES_SOCKETS[self] = IO::open(socket)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: midori-contrib
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: midori.rb
+  name: murasaki
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.2'
 description: Various extensions officially supported for midori
 email: business@heckpsi.com
 executables: []