activerecord-mysqlspatial-adapter 0.4.0 → 0.4.1

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.1 / 2012-02-22
+
+* Some compatibility fixes for Rails 3.2. (Reported by Nicholas Zaillian and Ryan Williams with implementation help from Radek Paviensky.) The mysql gem issue remains, however, and I do not know of a workaround. Use activerecord-mysql2-adapter for now if you need Rails >= 3.1 support.
+* Now requires rgeo-activerecord 0.4.3.
+
 === 0.4.0 / 2011-08-15
 
 * Various fixes towards Rails 3.1 compatibility. However, this adapter is not yet actually Rails 3.1 compatible because of a bug in the mysql gem. Use activerecord-mysql2-adapter for now if you need Rails 3.1 support.

data/README.rdoc

@@ -94,10 +94,12 @@ write more complex queries in SQL.
 
 == Installation And Configuration
 
-IMPORTANT: This adapter is currently *not* compatible with Rails 3.1.
-This is due to an apparent bug in the mysql gem (as of version 2.8.1),
-which does not appear to recognize MYSQL_TYPE_GEOMETRY in the binary
-protocol.
+IMPORTANT: This adapter is currently *not* compatible with Rails version
+3.1 and later. This is due to an apparent bug in the mysql gem (as of
+version 2.8.1), which does not appear to recognize MYSQL_TYPE_GEOMETRY in
+the binary protocol. I'm not aware of a workaround for this issue right
+now. Please use mysql2 and activerecord-mysql2spatial-adapter if you are
+using MySQL spatial and Rails 3.1 or later.
 
 === Installing The Adapter Gem
 
@@ -107,8 +109,8 @@ This adapter has the following requirements:
 * MySQL server 5.0 or later required for spatial extensions.
 * \ActiveRecord 3.0.3 or later. Earlier versions will not work.
 * mysql gem 2.8 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:
 
@@ -170,7 +172,7 @@ Contact the author at dazuma at gmail dot com.
 The MysqlSpatial 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

data/Version

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/active_record/connection_adapters/mysqlspatial_adapter.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # MysqlSpatial 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 @@ require 'active_record/connection_adapters/mysql_adapter'
 # connection adapter into ActiveRecord.
 
 module ActiveRecord
-  
-  
+
+
   # ActiveRecord looks for the mysqlspatial_connection factory method in
   # this class.
-  
+
   class Base
-    
-    
+
+
     # Create a mysqlspatial connection adapter.
-    
+
     def self.mysqlspatial_connection(config_)
       unless defined?(::Mysql)
         begin
@@ -71,25 +71,25 @@ module ActiveRecord
       options_ = [config_[:host], config_[:username] ? config_[:username].to_s : 'root', config_[:password].to_s, config_[:database], config_[:port], config_[:socket], default_flags_]
       ::ActiveRecord::ConnectionAdapters::MysqlSpatialAdapter::MainAdapter.new(mysql_, logger, options_, config_)
     end
-    
-    
+
+
   end
-  
-  
+
+
   # All ActiveRecord adapters go in this namespace.
   module ConnectionAdapters
-    
+
     # The MysqlSpatial adapter
     module MysqlSpatialAdapter
-      
+
       # The name returned by the adapter_name method of this adapter.
       ADAPTER_NAME = 'MysqlSpatial'.freeze
-      
+
     end
-    
+
   end
-  
-  
+
+
 end
 
 

data/lib/active_record/connection_adapters/mysqlspatial_adapter/arel_tosql.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # MysqlSpatial 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 MySQLSpatial < 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 @@ module Arel
           standard_name_
         end
       end
-      
+
     end
-    
+
     VISITORS['mysqlspatial'] = ::Arel::Visitors::MySQLSpatial
-    
+
   end
 end
 

data/lib/active_record/connection_adapters/mysqlspatial_adapter/main_adapter.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # MysqlSpatial 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,38 +37,47 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module MysqlSpatialAdapter
-      
-      
+
+
       class MainAdapter < ConnectionAdapters::MysqlAdapter
-        
-        
+
+
         NATIVE_DATABASE_TYPES = MysqlAdapter::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::MySQLSpatial.new(self)
+          end
+        end
+
+
         def set_rgeo_factory_settings(factory_settings_)
           @rgeo_factory_settings = factory_settings_
         end
-        
-        
+
+
         def adapter_name
           MysqlSpatialAdapter::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})"
@@ -76,8 +85,8 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def substitute_at(column_, index_)
           if column_.spatial?
             ::Arel.sql('GeomFromText(?,?)')
@@ -85,8 +94,8 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def type_cast(value_, column_)
           if column_.spatial? && ::RGeo::Feature::Geometry.check_type(value_)
             ::RGeo::WKRep::WKTGenerator.new.generate(value_)
@@ -94,8 +103,8 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def exec_stmt(sql_, name_, binds_)
           real_binds_ = []
           binds_.each do |bind_|
@@ -108,8 +117,8 @@ module ActiveRecord
           end
           super(sql_, name_, real_binds_)
         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)
@@ -118,8 +127,8 @@ module ActiveRecord
           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_))
@@ -131,8 +140,8 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def columns(table_name_, name_=nil)
           result_ = execute("SHOW FIELDS FROM #{quote_table_name(table_name_)}", :skip_logging)
           columns_ = []
@@ -143,8 +152,8 @@ module ActiveRecord
           result_.free
           columns_
         end
-        
-        
+
+
         def indexes(table_name_, name_=nil)
           indexes_ = []
           current_index_ = nil
@@ -162,15 +171,15 @@ module ActiveRecord
           result_.free
           indexes_
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

data/lib/active_record/connection_adapters/mysqlspatial_adapter/spatial_column.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # MysqlSpatial 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,15 +37,23 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module MysqlSpatialAdapter
-      
-      
-      class SpatialColumn < ConnectionAdapters::MysqlColumn
-        
-        
+
+
+      # ActiveRecord 3.2 uses ConnectionAdapters::MysqlAdapter::Column
+      # whereas 3.0 and 3.1 use ConnectionAdapters::MysqlColumn
+      column_base_class_ = defined?(ConnectionAdapters::MysqlAdapter::Column) ?
+        ConnectionAdapters::MysqlAdapter::Column : ConnectionAdapters::MysqlColumn
+
+      class SpatialColumn < column_base_class_
+
+
+        FACTORY_SETTINGS_CACHE = {}
+
+
         def initialize(factory_settings_, table_name_, name_, default_, sql_type_=nil, null_=true)
           @factory_settings = factory_settings_
           @table_name = table_name_
@@ -54,22 +62,23 @@ module ActiveRecord
           if type == :spatial
             @limit = {:type => @geometric_type.type_name.underscore}
           end
+          FACTORY_SETTINGS_CACHE[factory_settings_.object_id] = factory_settings_
         end
-        
-        
+
+
         attr_reader :geometric_type
-        
-        
+
+
         def spatial?
           type == :spatial
         end
-        
-        
+
+
         def klass
           type == :spatial ? ::RGeo::Feature::Geometry : super
         end
-        
-        
+
+
         def type_cast(value_)
           if type == :spatial
             SpatialColumn.convert_to_geometry(value_, @factory_settings, @table_name, name)
@@ -77,25 +86,26 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def type_cast_code(var_name_)
           if type == :spatial
             "::ActiveRecord::ConnectionAdapters::MysqlSpatialAdapter::SpatialColumn.convert_to_geometry("+
-              "#{var_name_}, self.class.rgeo_factory_settings, self.class.table_name, #{name.inspect})"
+              "#{var_name_}, ::ActiveRecord::ConnectionAdapters::MysqlSpatialAdapter::SpatialColumn::"+
+              "FACTORY_SETTINGS_CACHE[#{@factory_settings.object_id}], #{@table_name.inspect}, #{name.inspect})"
           else
             super
           end
         end
-        
-        
+
+
         private
-        
+
         def simplified_type(sql_type_)
           sql_type_ =~ /geometry|point|linestring|polygon/i ? :spatial : super
         end
-        
-        
+
+
         def self.convert_to_geometry(input_, factory_settings_, table_name_, column_)
           case input_
           when ::RGeo::Feature::Geometry
@@ -122,15 +132,15 @@ module ActiveRecord
             nil
           end
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

data/lib/active_record/connection_adapters/mysqlspatial_adapter/version.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # MysqlSpatial 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
@@ -41,22 +41,22 @@ end
 
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module MysqlSpatialAdapter
-      
-      
+
+
       # Current version of MysqlSpatialAdapter as a frozen string
       VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../../Version').strip.freeze
-      
+
       # Current version of MysqlSpatialAdapter as a Versionomy object, if the
       # Versionomy gem is available; otherwise equal to VERSION_STRING.
       VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
-      
-      
+
+
     end
-    
+
   end
-  
+
 end

data/test/tc_basic.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the MysqlSpatial ActiveRecord adapter
-# 
+#
 # -----------------------------------------------------------------------------
 # 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
@@ -41,15 +41,15 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module MysqlSpatialAdapter  # :nodoc:
       module Tests  # :nodoc:
-        
+
         class TestBasic < ::Test::Unit::TestCase  # :nodoc:
-          
+
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           include AdapterTestHelper
-          
+
           define_test_methods do
-            
-            
+
+
             def populate_ar_class(content_)
               klass_ = create_ar_class
               case content_
@@ -60,13 +60,13 @@ module RGeo
               end
               klass_
             end
-            
-            
+
+
             def test_version
               assert_not_nil(::ActiveRecord::ConnectionAdapters::MysqlSpatialAdapter::VERSION)
             end
-            
-            
+
+
             def test_create_simple_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -75,8 +75,8 @@ module RGeo
               assert_equal(::RGeo::Feature::Geometry, klass_.columns.last.geometric_type)
               assert(klass_.cached_attributes.include?('latlon'))
             end
-            
-            
+
+
             def test_create_point_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -85,8 +85,8 @@ module RGeo
               assert_equal(::RGeo::Feature::Point, klass_.columns.last.geometric_type)
               assert(klass_.cached_attributes.include?('latlon'))
             end
-            
-            
+
+
             def test_create_geometry_with_index
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test, :options => 'ENGINE=MyISAM') do |t_|
@@ -97,8 +97,8 @@ module RGeo
               end
               assert(klass_.connection.indexes(:spatial_test).last.spatial)
             end
-            
-            
+
+
             def test_set_and_get_point
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -107,8 +107,8 @@ module RGeo
               assert_equal(@factory.point(1, 2), obj_.latlon)
               assert_equal(3785, obj_.latlon.srid)
             end
-            
-            
+
+
             def test_set_and_get_point_from_wkt
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -117,8 +117,8 @@ module RGeo
               assert_equal(@factory.point(1, 2), obj_.latlon)
               assert_equal(1000, obj_.latlon.srid)
             end
-            
-            
+
+
             def test_save_and_load_point
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -129,8 +129,8 @@ module RGeo
               assert_equal(@factory.point(1, 2), obj2_.latlon)
               assert_equal(3785, obj2_.latlon.srid)
             end
-            
-            
+
+
             def test_save_and_load_point_from_wkt
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -141,8 +141,8 @@ module RGeo
               assert_equal(@factory.point(1, 2), obj2_.latlon)
               assert_equal(1000, obj2_.latlon.srid)
             end
-            
-            
+
+
             def test_readme_example
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test, :options => 'ENGINE=MyISAM') do |t_|
@@ -164,8 +164,8 @@ module RGeo
               rec_.shape = loc_
               assert_equal(true, ::RGeo::Geos.is_geos?(rec_.shape))
             end
-            
-            
+
+
             def test_create_simple_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -174,8 +174,8 @@ module RGeo
               assert_equal(::RGeo::Feature::Geometry, klass_.columns.last.geometric_type)
               assert(klass_.cached_attributes.include?('latlon'))
             end
-            
-            
+
+
             def test_create_point_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -184,8 +184,8 @@ module RGeo
               assert_equal(::RGeo::Feature::Point, klass_.columns.last.geometric_type)
               assert(klass_.cached_attributes.include?('latlon'))
             end
-            
-            
+
+
             def test_create_geometry_using_limit
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -194,12 +194,12 @@ module RGeo
               assert_equal(::RGeo::Feature::LineString, klass_.columns.last.geometric_type)
               assert(klass_.cached_attributes.include?('geom'))
             end
-            
-            
+
+
           end
-          
+
         end
-        
+
       end
     end
   end

data/test/tc_spatial_queries.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Tests for the MysqlSpatial ActiveRecord adapter
-# 
+#
 # -----------------------------------------------------------------------------
 # 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
@@ -41,15 +41,15 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module MysqlSpatialAdapter  # :nodoc:
       module Tests  # :nodoc:
-        
+
         class TestSpatialQueries < ::Test::Unit::TestCase  # :nodoc:
-          
+
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           include AdapterTestHelper
-          
+
           define_test_methods do
-            
-            
+
+
             def populate_ar_class(content_)
               klass_ = create_ar_class
               case content_
@@ -64,8 +64,8 @@ module RGeo
               end
               klass_
             end
-            
-            
+
+
             def test_query_point
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -77,8 +77,8 @@ module RGeo
               obj3_ = klass_.where(:latlon => @factory.point(2, 2)).first
               assert_nil(obj3_)
             end
-            
-            
+
+
             def _test_query_point_wkt
               klass_ = populate_ar_class(:latlon_point)
               obj_ = klass_.new
@@ -90,11 +90,11 @@ module RGeo
               obj3_ = klass_.where(:latlon => 'POINT(2 2)').first
               assert_nil(obj3_)
             end
-            
-            
+
+
             if ::RGeo::ActiveRecord.spatial_expressions_supported?
-              
-              
+
+
               def test_query_st_length
                 klass_ = populate_ar_class(:path_linestring)
                 obj_ = klass_.new
@@ -106,19 +106,19 @@ module RGeo
                 obj3_ = klass_.where(klass_.arel_table[:path].st_length.gt(3)).first
                 assert_nil(obj3_)
               end
-              
-              
+
+
             else
-              
+
               puts "WARNING: The current Arel does not support named functions. Spatial expression tests skipped."
-              
+
             end
-            
-            
+
+
           end
-          
+
         end
-        
+
       end
     end
   end

metadata

@@ -1,49 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activerecord-mysqlspatial-adapter
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.1
   prerelease: 
-  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rgeo-activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155892340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
+      - !ruby/object:Gem::Version
+        version: 0.4.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2155892340
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &2155891100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :runtime
-  version_requirements: *id002
-description: This is an ActiveRecord connection adapter for MySQL Spatial Extensions. It is based on the stock MySQL adapter, but provides built-in support for spatial columns. It uses the RGeo library to represent spatial data in Ruby.
+  prerelease: false
+  version_requirements: *2155891100
+description: This is an ActiveRecord connection adapter for MySQL Spatial Extensions.
+  It is based on the stock MySQL adapter, but provides built-in support for spatial
+  columns. It uses the RGeo library to represent spatial data in Ruby.
 email: dazuma@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.rdoc
 - README.rdoc
-files: 
+files:
 - lib/active_record/connection_adapters/mysqlspatial_adapter/arel_tosql.rb
 - lib/active_record/connection_adapters/mysqlspatial_adapter/main_adapter.rb
 - lib/active_record/connection_adapters/mysqlspatial_adapter/spatial_column.rb
@@ -56,31 +55,29 @@ files:
 - Version
 homepage: http://virtuoso.rubyforge.org/activerecord-mysqlspatial-adapter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: virtuoso
-rubygems_version: 1.8.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: An ActiveRecord adapter for MySQL Spatial Extensions, based on RGeo and the mysql gem.
-test_files: 
+summary: An ActiveRecord adapter for MySQL Spatial Extensions, based on RGeo and the
+  mysql gem.
+test_files:
 - test/tc_basic.rb
 - test/tc_spatial_queries.rb