Several fixes for Rails 3.2

Author: dazuma

Rakefile

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
-# MySQL2 Spatial ActiveRecord Adapter Rakefile
-# 
+#
+# Generic Gem Rakefile
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# Copyright 2010-2012 Daniel Azuma
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -18,7 +18,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,9 +34,11 @@
 ;
 
 
-RAKEFILE_CONFIG = {
-  :product_visible_name => 'MySQL2 Spatial ActiveRecord Adapter',
-}
+# Load config if present
+
+config_path_ = ::File.expand_path('rakefile_config.rb', ::File.dirname(__FILE__))
+load(config_path_) if ::File.exists?(config_path_)
+RAKEFILE_CONFIG = {} unless defined?(::RAKEFILE_CONFIG)
 
 
 # Gemspec
@@ -45,12 +47,11 @@ require 'rubygems'
 gemspec_ = eval(::File.read(::Dir.glob('*.gemspec').first))
 release_gemspec_ = eval(::File.read(::Dir.glob('*.gemspec').first))
 release_gemspec_.version = gemspec_.version.to_s.sub(/\.build\d+$/, '')
-RAKEFILE_CONFIG = {} unless defined?(::RAKEFILE_CONFIG)
 
 
 # Platform info
 
-dlext_ = ::Config::CONFIG['DLEXT']
+dlext_ = ::RbConfig::CONFIG['DLEXT']
 
 platform_ =
   case ::RUBY_DESCRIPTION
@@ -147,9 +148,9 @@ end
 clean_files_ = [doc_directory_, pkg_directory_, tmp_directory_] +
   ::Dir.glob('ext/**/Makefile*') +
   ::Dir.glob('ext/**/*.{o,class,log,dSYM}') +
-  ::Dir.glob("**/*.{#{dlext_},rbc,jar}") +
+  ::Dir.glob("**/*.{bundle,so,dll,rbc,jar}") +
   (::RAKEFILE_CONFIG[:extra_clean_files] || [])
-task :clean do  
+task :clean do
   clean_files_.each{ |path_| rm_rf path_ }
 end
 
@@ -184,13 +185,15 @@ end
 
 # Gem release tasks
 
-task :build_gem do
+task :build_other
+
+task :build_gem => :build_other do
   ::Gem::Builder.new(gemspec_).build
   mkdir_p(pkg_directory_)
   mv "#{gemspec_.name}-#{gemspec_.version}.gem", "#{pkg_directory_}/"
 end
 
-task :build_release do
+task :build_release => :build_other do
   ::Gem::Builder.new(release_gemspec_).build
   mkdir_p(pkg_directory_)
   mv "#{release_gemspec_.name}-#{release_gemspec_.version}.gem", "#{pkg_directory_}/"
@@ -205,7 +208,7 @@ end
 
 # Unit test task
 
-task :test => :build_ext do
+task :test => [:build_ext, :build_other] do
   $:.unshift(::File.expand_path('lib', ::File.dirname(__FILE__)))
   if ::ENV['TESTCASE']
     test_files_ = ::Dir.glob("test/#{::ENV['TESTCASE']}.rb")

lib/active_record/connection_adapters/mysql2spatial_adapter/main_adapter.rb

@@ -49,6 +49,15 @@ class MainAdapter < ConnectionAdapters::Mysql2Adapter
         NATIVE_DATABASE_TYPES = Mysql2Adapter::NATIVE_DATABASE_TYPES.merge(:spatial => {:name => "geometry"})
 
 
+        def initialize(*args_)
+          super
+          # Rails 3.2 way of defining the visitor: do so in the constructor
+          if defined?(@visitor) && @visitor
+            @visitor = ::Arel::Visitors::MySQL2Spatial.new(self)
+          end
+        end
+        
+        
         def set_rgeo_factory_settings(factory_settings_)
           @rgeo_factory_settings = factory_settings_
         end

lib/active_record/connection_adapters/mysql2spatial_adapter/spatial_column.rb

@@ -43,7 +43,15 @@ module ConnectionAdapters
     module Mysql2SpatialAdapter
 
 
-      class SpatialColumn < ConnectionAdapters::Mysql2Column
+      # ActiveRecord 3.2 uses ConnectionAdapters::Mysql2Adapter::Column
+      # whereas 3.0 and 3.1 use ConnectionAdapters::Mysql2Column
+      column_base_class_ = defined?(ConnectionAdapters::Mysql2Adapter::Column) ?
+        ConnectionAdapters::Mysql2Adapter::Column : ConnectionAdapters::Mysql2Column
+      
+      class SpatialColumn < column_base_class_
+        
+        
+        FACTORY_SETTINGS_CACHE = {}
 
 
         def initialize(factory_settings_, table_name_, name_, default_, sql_type_=nil, null_=true)
@@ -54,6 +62,7 @@ def initialize(factory_settings_, table_name_, name_, default_, sql_type_=nil, n
           if type == :spatial
             @limit = {:type => @geometric_type.type_name.underscore}
           end
+          FACTORY_SETTINGS_CACHE[factory_settings_.object_id] = factory_settings_
         end
 
 
@@ -82,7 +91,8 @@ def type_cast(value_)
         def type_cast_code(var_name_)
           if type == :spatial
             "::ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter::SpatialColumn.convert_to_geometry("+
-              "#{var_name_}, self.class.rgeo_factory_settings, self.class.table_name, #{name.inspect})"
+              "#{var_name_}, ::ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter::SpatialColumn::"+
+              "FACTORY_SETTINGS_CACHE[#{@factory_settings.object_id}], #{@table_name.inspect}, #{name.inspect})"
           else
             super
           end

rakefile_config.rb

@@ -0,0 +1,38 @@
+# -----------------------------------------------------------------------------
+#
+# MySQL2 Spatial Adapter Rakefile configuration
+#
+# -----------------------------------------------------------------------------
+# Copyright 2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+RAKEFILE_CONFIG = {
+  :product_visible_name => 'MySQL2 Spatial ActiveRecord Adapter',
+}