em-mysqlplus 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/em-mysqlplus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-mysqlplus}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Grigorik", "Aman Gupta"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-10-03}
   s.description = %q{Async MySQL driver for Ruby/Eventmachine}
   s.email = %q{ilya@igvita.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{em-mysqlplus}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Async MySQL driver for Ruby/Eventmachine}
   s.test_files = [
     "spec/activerecord_spec.rb",
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.9"])
     else
       s.add_dependency(%q<eventmachine>, [">= 0.12.9"])

data/lib/active_record/connection_adapters/em_mysqlplus_adapter.rb

@@ -15,16 +15,21 @@ module ActiveRecord
       end
 
       def connect
-        @connection = EventMachine::MySQL.new({
-                                                :host => @hostname,
-                                                :port => @port,
-                                                :database => @config[:database],
-                                                :password => @config[:password],
-                                                :socket   => @config[:socket]
-        })
-
-        configure_connection
-        @connection
+        if EM.reactor_running?
+          @connection = EventMachine::MySQL.new({
+                                                  :host => @hostname,
+                                                  :port => @port,
+                                                  :user => @config[:username],
+                                                  :database => @config[:database],
+                                                  :password => @config[:password],
+                                                  :socket   => @config[:socket]
+          })
+
+          configure_connection
+          @connection
+        else
+          super
+        end
       end
 
     end
@@ -44,7 +49,18 @@ module ActiveRecord
         raise ArgumentError, "No database specified. Missing argument: database."
       end
 
-      ConnectionAdapters::EmMysqlAdapter.new(nil, logger, [host, port], [database, username, password], config)
+      if EM.reactor_running?
+        ConnectionAdapters::EmMysqlAdapter.new(nil, logger, [host, port], [database, username, password], config)
+      else
+        mysql = Mysql.init
+        if config[:sslca] || config[:sslkey]
+          mysql.ssl_set(config[:sslkey], config[:sslcert], config[:sslca], config[:sslcapath], config[:sslcipher])
+        end
+
+        default_flags = Mysql.const_defined?(:CLIENT_MULTI_RESULTS) ? Mysql::CLIENT_MULTI_RESULTS : 0
+        options = [host, username, password, database, port, nil, default_flags]
+        ConnectionAdapters::MysqlAdapter.new(mysql, logger, options, config)
+      end
     end
   end
-end
+end

data/lib/active_record/patches.rb

@@ -22,7 +22,7 @@ module ActiveRecord
             fiber.resume(false)
           end
           @queue << fiber
-          returning Fiber.yield do
+          Fiber.yield.tap do
             x.cancel
           end
         end

data/lib/em-mysqlplus/connection.rb

@@ -37,6 +37,7 @@ module EventMachine
       if item = @current
         sql, cblk, eblk, retries = item
         result = @mysql.get_result
+        result = @mysql.affected_rows if result.nil?
 
         # kick off next query in the background
         # as we process the current results
@@ -80,18 +81,22 @@ module EventMachine
       # reconnects to happen after all the unbinds have been processed
 
       @connected = false
+      EM.next_tick { reconnect }
+    end
 
-      EM.add_timer(0) do
-        @processing = false
-        @mysql = @conn.connect_socket(@opts)
-        @fd = @mysql.socket
+    def reconnect
+      @processing = false
+      @mysql = @conn.connect_socket(@opts)
+      @fd = @mysql.socket
 
-        @signature = EM.attach_fd(@mysql.socket, true)
-        EM.set_notify_readable @signature, true
-        EM.instance_variable_get('@conns')[@signature] = self
-        @connected = true
-        next_query
-      end
+      @signature = EM.attach_fd(@mysql.socket, true)
+      EM.set_notify_readable(@signature, true)
+      EM.instance_variable_get('@conns')[@signature] = self
+      @connected = true
+      next_query
+
+    rescue Mysql::Error => e
+      EM.add_timer(1) { reconnect }
     end
 
     def execute(sql, cblk = nil, eblk = nil, retries = 0)
@@ -123,6 +128,8 @@ module EventMachine
     end
 
     def close
+      return unless @connected
+
       detach
       @mysql.close
       @connected = false

data/spec/activerecord_spec.rb

@@ -48,4 +48,10 @@ describe "ActiveRecord Driver for EM-MySQLPlus" do
       }
     }
   end
+
+  it "should fallback to blocking driver outside of EM loop" do
+      ActiveRecord::Base.establish_connection
+      r = Widget.find_by_sql("select sleep(0.01)")
+      r.size.should == 1
+  end
 end

data/spec/database.yml

@@ -1,5 +1,5 @@
 test:
   adapter: em_mysqlplus
   database: widgets
-  user: root
+  username: root
   pool: 3

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ilya Grigorik
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -04:00
+date: 2010-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -65,6 +66,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -72,6 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -81,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: em-mysqlplus
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Async MySQL driver for Ruby/Eventmachine