Merge pull request #580 from marshall-lee/fix_509

Reimplement #509, add self-explaining specs

Author: sodabrew

lib/mysql2/em.rb

@@ -10,6 +10,7 @@ module Watcher
         def initialize(client, deferable)
           @client = client
           @deferable = deferable
+          @is_watching = true
         end
 
         def notify_readable
@@ -22,11 +23,19 @@ def notify_readable
             @deferable.succeed(result)
           end
         end
+
+        def watching?
+          @is_watching
+        end
+
+        def unbind
+          @is_watching = false
+        end
       end
 
       def close(*args)
         if @watch
-          @watch.detach
+          @watch.detach if @watch.watching?
         end
         super(*args)
       end

spec/em/em_spec.rb

@@ -108,6 +108,27 @@
         callbacks_run.should == [:errback]
       end
     end
+
+    it "should not raise error when closing client with no query running" do
+      callbacks_run = []
+      EM.run do
+        client = Mysql2::EM::Client.new DatabaseCredentials['root']
+        defer = client.query("select sleep(0.025)")
+        defer.callback do |result|
+          callbacks_run << :callback
+        end
+        defer.errback do |err|
+          callbacks_run << :errback
+        end
+        EM.add_timer(0.1) do
+          callbacks_run.should == [:callback]
+          lambda {
+            client.close
+          }.should_not raise_error(/invalid binding to detach/)
+          EM.stop_event_loop
+        end
+      end
+    end
   end
 rescue LoadError
   puts "EventMachine not installed, skipping the specs that use it"