Ruby 1.9.1 compat

Author: methodmissing

Rakefile

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'rake'
 require 'rake/testtask'
 require 'test/helper'

lib/active_record/connection_adapters/mysqlplus_adapter.rb

@@ -11,7 +11,7 @@
 
 begin 
   require_library_or_gem('fastthread')
-rescue => LoadError
+rescue LoadError
   $stderr.puts "'gem install fastthread' for better performance"
 end  
 

lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb

@@ -121,7 +121,7 @@ def find_every_with_defer(options) #:nodoc:
           records
         end
 
-        def preload_deferred_includes( include_associations, options )
+        def preload_deferred_includes( include_associations, options ) #:nodoc:
           options[:defer] ? (Array(include_associations) << :defer) : include_associations
         end
 

lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/result.rb

@@ -15,7 +15,7 @@ def initialize( &deferrable )
       # back in on completion.
       #
       def defer!( deferrable )
-        @result = Thread.new( deferrable ) do |deferrable|
+        @result = ::Thread.new( deferrable ) do |deferrable|
           begin
             deferrable.call 
           rescue => exception
@@ -38,7 +38,7 @@ def method_missing(*args, &block)
       # Re-raise any Exceptions from the background Thread.
       #
       def validate!
-        raise @_result if @_result.is_a?( Exception )
+        raise @_result if @_result.is_a?( ::Exception )
       end
 
     end    

test/deferrable/macro_test.rb

@@ -1,11 +1,12 @@
 require "#{File.dirname(__FILE__)}/../helper"
+
 Mysqlplus::Test.prepare!
 
-class MacroTest < ActiveRecord::TestCase
+class MacroTest < ActiveSupport::TestCase
 
   def teardown
     ActiveRecord::Base.clear_all_connections!
-    ActiveRecord::Base.establish_connection(Mysqlplus::Test::CONNECTION)
+    ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC )
     super
   end
 

test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'mocha'
 require 'active_support'
 require 'active_support/test_case'
 require 'activerecord'
@@ -8,11 +9,11 @@
 module Mysqlplus
   class Test
 
-    CONNECTION = { :adapter  => 'mysqlplus',
-                   :username => 'root',
-                   :database => 'mysql',
-                   :pool => 5,
-                   :warmup => true }
+    CONNECTION_SPEC = { :adapter  => 'mysqlplus',
+                        :username => 'root',
+                        :database => 'mysql',
+                        :pool => 5,
+                        :warmup => true }
 
     MODELS_DIR = "#{File.dirname(__FILE__)}/models".freeze
 
@@ -46,7 +47,7 @@ def test_files
       private
 
       def connect!
-        ::ActiveRecord::Base.establish_connection( CONNECTION )
+        ::ActiveRecord::Base.establish_connection( CONNECTION_SPEC )
       end
 
       def require_models