em-synchrony 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da875d80b703df6b9a5edcb8af8a005347e53a4a
-  data.tar.gz: 978abcb2c127704ef62362e97aac92fe71804f1c
+  metadata.gz: 28e9e5eb599e7f7d72c090f0626fffb94a641c67
+  data.tar.gz: 379c553f5e1ac9d2f0086c1e47f5cb7980c1b6e7
 SHA512:
-  metadata.gz: b5b91b1d7b354a8ada8805d96eb16ff9ca5e66d1d0c76d259b27d0f1fc051fecb02c22856e7a5fbfa58fe04223923d2380db5ea543ebe253d4f59d1460fa9789
-  data.tar.gz: 62c7e7ffa573dd30654b92f0642a61905e2b071d8e5f312eaf0b52321754fcacfd9b59ef669b5fecfb56b16f43165c12b81d684c0d2b32a13c0d05242f42ccfd
+  metadata.gz: bd97677133f1c266ffbdbd25a3cfedb8f263fc7e3715ac1bc0c88b8d963c2ae224e71c4a53d4436ae2ea49447bcc0499a92a662e29080f1093a00a637745f3ed
+  data.tar.gz: d80f260c6f3261eb3cc0ff6db2eacc0ee9613a7e5f35ab248f1dc12a346ba722a24ef5717a0bcca02138dca401ca84d0fa3283274ec9466f8ad0d464b400e54f

data/.travis.yml

@@ -23,6 +23,9 @@ matrix:
       script: "bundle exec rspec spec/activerecord_spec.rb"
     - env: "activerecord=4.2.0"
       script: "bundle exec rspec spec/activerecord_spec.rb"
+    - rvm: 2.3.1
+      env: "activerecord=5.0.0"
+      script: "bundle exec rspec spec/activerecord_spec.rb"
   allow_failures:
     - env: "activerecord=3.2.21"
     - env: "activerecord=4.2.0"

data/em-synchrony.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-synchrony"
-  s.version     = "1.0.5"
+  s.version     = "1.0.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -41,7 +41,7 @@ module ActiveRecord
         include EM::Synchrony::ActiveRecord::Client
       end
 
-      if ::ActiveRecord.version >= Gem::Version.new('4.2')
+      if Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new('4.2')
         require 'em-synchrony/activerecord_4_2'
         include EM::Synchrony::ActiveRecord::Adapter_4_2
       else

data/lib/em-synchrony/activerecord.rb

@@ -7,9 +7,17 @@ require 'em-synchrony/thread'
 module ActiveRecord
   module ConnectionAdapters
     class ConnectionPool
-      def connection
-        _fibered_mutex.synchronize do
-          @reserved_connections[current_connection_id] ||= checkout
+      if Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.0')
+        def connection
+          _fibered_mutex.synchronize do
+            @thread_cached_conns[connection_cache_key(Thread.current)] ||= checkout
+          end
+        end
+      else
+        def connection
+          _fibered_mutex.synchronize do
+            @reserved_connections[current_connection_id] ||= checkout
+          end
         end
       end
 

data/lib/em-synchrony/kernel.rb

@@ -10,18 +10,18 @@ module Kernel
   end
 
   # Monkey-patch
-  def sleep(sleep_time)
+  def sleep(*args)
     if Kernel.em_synchrony_sleep_hook &&
        EM.reactor_thread? &&
        !Thread.current[:em_synchrony_sleep_hook_called]
       begin
         Thread.current[:em_synchrony_sleep_hook_called] = true
-        Kernel.em_synchrony_sleep_hook.call(sleep_time)
+        Kernel.em_synchrony_sleep_hook.call(args[0])
       ensure
         Thread.current[:em_synchrony_sleep_hook_called] = false
       end
     else
-      orig_sleep(sleep_time)
+      orig_sleep(*args)
     end
   end
 end

data/spec/activerecord_spec.rb

@@ -1,6 +1,7 @@
 require "spec/helper/all"
 require "em-synchrony/activerecord"
 require "em-synchrony/fiber_iterator"
+require "logger"
 
 # mysql < spec/widgets.sql
 

data/spec/kernel_override_spec.rb

@@ -14,6 +14,18 @@ describe EventMachine::Synchrony do
         EM::Synchrony.on_sleep { fail 'should not happen' }
         expect { sleep(0.01) }.not_to raise_error
       end
+
+      it 'works when calling with no arguments' do
+        t = Thread.new do
+          expect { sleep }.to_not raise_error
+        end
+        while t.status
+          if t.status == 'sleep'
+            t.run
+          end
+        end
+        t.join
+      end
       context 'with synchrony in another thread'do
         before do
           @thread = Thread.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ilya Grigorik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fiber aware EventMachine libraries
@@ -155,4 +155,3 @@ test_files:
 - spec/thread_spec.rb
 - spec/timer_spec.rb
 - spec/widgets.sql
-has_rdoc: