Code formatting updates; rdoc updates towards next version

Author: dazuma

History.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.2 / 2012-02-22
+
+* Some compatibility fixes for Rails 3.2. (Reported by Nicholas Zaillian and Ryan Williams with implementation help from Radek Paviensky.)
+* Now requires rgeo-activerecord 0.4.3.
+
 === 0.4.1 / 2011-09-07
 
 * Now requests mysql2 >= 0.2.x instead of >= 0.3.x since the latter requires Rails 3.1. (Reported by Greg Hazel)

README.rdoc

@@ -101,10 +101,10 @@ This adapter has the following requirements:
 * Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
 * MySQL server 5.0 or later required for spatial extensions.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work.
-  Should be compatible with Rails 3.1.
+  Should be compatible with Rails versions through 3.2.x.
 * mysql2 gem 0.2.13 or later.
-* rgeo gem 0.3.2 or later.
-* rgeo-activerecord gem 0.4.0 or later.
+* rgeo gem 0.3.4 or later.
+* rgeo-activerecord gem 0.4.3 or later.
 
 Install this adapter as a gem:
 
@@ -166,7 +166,7 @@ Contact the author at dazuma at gmail dot com.
 The Mysql2Spatial Adapter and its supporting libraries (including RGeo)
 are written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development of RGeo is sponsored by GeoPage, Inc. (http://www.geopage.com).
+Development is supported by Pirq. (http://www.pirq.com).
 
 This adapter implementation owes some debt to the spatial_adapter plugin
 (http://github.com/fragility/spatial_adapter). Although we made a few

Version

@@ -1 +1 @@
-0.4.1
+0.4.2

activerecord-mysql2spatial-adapter.gemspec

@@ -1,3 +1,38 @@
+# -----------------------------------------------------------------------------
+#
+# MySQL2 Spatial ActiveRecord Adapter Gemspec
+#
+# -----------------------------------------------------------------------------
+# Copyright 2011-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.
+# -----------------------------------------------------------------------------
+;
+
 ::Gem::Specification.new do |s_|
   s_.name = 'activerecord-mysql2spatial-adapter'
   s_.summary = 'An ActiveRecord adapter for MySQL Spatial Extensions, based on RGeo and the mysql2 gem.'
@@ -15,6 +50,6 @@
   s_.extra_rdoc_files = ::Dir.glob("*.rdoc")
   s_.test_files = ::Dir.glob("test/**/tc_*.rb")
   s_.platform = ::Gem::Platform::RUBY
-  s_.add_dependency('rgeo-activerecord', '~> 0.4.0')
+  s_.add_dependency('rgeo-activerecord', '~> 0.4.3')
   s_.add_dependency('mysql2', '>= 0.2.13')
 end

lib/active_record/connection_adapters/mysql2spatial_adapter.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Mysql2Spatial adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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
@@ -42,16 +42,16 @@
 # connection adapter into ActiveRecord.
 
 module ActiveRecord
-  
-  
+
+
   # ActiveRecord looks for the mysql2spatial_connection factory method in
   # this class.
-  
+
   class Base
-    
-    
+
+
     # Create a mysql2spatial connection adapter.
-    
+
     def self.mysql2spatial_connection(config_)
       config_[:username] = 'root' if config_[:username].nil?
       if ::Mysql2::Client.const_defined?(:FOUND_ROWS)
@@ -61,25 +61,25 @@ def self.mysql2spatial_connection(config_)
       options_ = [config_[:host], config_[:username], config_[:password], config_[:database], config_[:port], config_[:socket], 0]
       ::ActiveRecord::ConnectionAdapters::Mysql2SpatialAdapter::MainAdapter.new(client_, logger, options_, config_)
     end
-    
-    
+
+
   end
-  
-  
+
+
   # All ActiveRecord adapters go in this namespace.
   module ConnectionAdapters
-    
+
     # The Mysql2Spatial adapter
     module Mysql2SpatialAdapter
-      
+
       # The name returned by the adapter_name method of this adapter.
       ADAPTER_NAME = 'Mysql2Spatial'.freeze
-      
+
     end
-    
+
   end
-  
-  
+
+
 end
 
 

lib/active_record/connection_adapters/mysql2spatial_adapter/arel_tosql.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Mysql2Spatial adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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
@@ -38,17 +38,17 @@
 
 module Arel
   module Visitors
-    
+
     class MySQL2Spatial < MySQL
-      
+
       FUNC_MAP = {
         'st_wkttosql' => 'GeomFromText',
         'st_wkbtosql' => 'GeomFromWKB',
         'st_length' => 'GLength',
       }
-      
+
       include ::RGeo::ActiveRecord::SpatialToSql
-      
+
       def st_func(standard_name_)
         if (name_ = FUNC_MAP[standard_name_.downcase])
           name_
@@ -58,11 +58,11 @@ def st_func(standard_name_)
           standard_name_
         end
       end
-      
+
     end
-    
+
     VISITORS['mysql2spatial'] = ::Arel::Visitors::MySQL2Spatial
-    
+
   end
 end
 

lib/active_record/connection_adapters/mysql2spatial_adapter/main_adapter.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Mysql2Spatial adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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
@@ -37,56 +37,56 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module Mysql2SpatialAdapter
-      
-      
+
+
       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
-        
-        
+
+
         def adapter_name
           Mysql2SpatialAdapter::ADAPTER_NAME
         end
-        
-        
+
+
         def spatial_column_constructor(name_)
           ::RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS[name_]
         end
-        
-        
+
+
         def native_database_types
           NATIVE_DATABASE_TYPES
         end
-        
-        
+
+
         def quote(value_, column_=nil)
           if ::RGeo::Feature::Geometry.check_type(value_)
             "GeomFromWKB(0x#{::RGeo::WKRep::WKBGenerator.new(:hex_format => true).generate(value_)},#{value_.srid})"
           else
             super
           end
         end
-        
-        
+
+
         def type_to_sql(type_, limit_=nil, precision_=nil, scale_=nil)
           if (info_ = spatial_column_constructor(type_.to_sym))
             type_ = limit_[:type] || type_ if limit_.is_a?(::Hash)
@@ -95,8 +95,8 @@ def type_to_sql(type_, limit_=nil, precision_=nil, scale_=nil)
           end
           super(type_, limit_, precision_, scale_)
         end
-        
-        
+
+
         def add_index(table_name_, column_name_, options_={})
           if options_[:spatial]
             index_name_ = index_name(table_name_, :column => Array(column_name_))
@@ -108,8 +108,8 @@ def add_index(table_name_, column_name_, options_={})
             super
           end
         end
-        
-        
+
+
         def columns(table_name_, name_=nil)
           result_ = execute("SHOW FIELDS FROM #{quote_table_name(table_name_)}", :skip_logging)
           columns_ = []
@@ -119,8 +119,8 @@ def columns(table_name_, name_=nil)
           end
           columns_
         end
-        
-        
+
+
         def indexes(table_name_, name_=nil)
           indexes_ = []
           current_index_ = nil
@@ -137,15 +137,15 @@ def indexes(table_name_, name_=nil)
           end
           indexes_
         end
-      
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc: