GeoRuby 1.3.2 → 1.3.3

data/lib/geo_ruby/simple_features/geometry.rb

@@ -7,7 +7,7 @@ module GeoRuby#:nodoc:
     #Objects of class Geometry should not be instantiated.
     class Geometry
       #SRID of the geometry
-      attr_accessor :srid
+      attr_reader :srid #writer defined below
       #Flag indicating if the z ordinate of the geometry is meaningful
       attr_accessor :with_z
       #Flag indicating if the m ordinate of the geometry is meaningful
@@ -56,7 +56,7 @@ module GeoRuby#:nodoc:
         if @with_m and allow_m
           type = type | M_MASK
         end
-        if @srid != DEFAULT_SRID and allow_srid
+        if allow_srid
           type = type | SRID_MASK
           ewkb << [type,@srid].pack("VV")
         else
@@ -84,7 +84,7 @@ module GeoRuby#:nodoc:
 
       #Outputs the geometry as an EWKT string.
       def as_ewkt(allow_srid=true,allow_z=true,allow_m=true)
-        if @srid!=DEFAULT_SRID and allow_srid #the default SRID is not output like in PostGIS
+        if allow_srid
           ewkt="SRID=#{@srid};"
         else
           ewkt=""

data/lib/geo_ruby/simple_features/line_string.rb

@@ -127,7 +127,7 @@ module GeoRuby
       #it won't be used by GE anyway: clampToGround is the default)
       def kml_representation(options = {}) #:nodoc: 
         result = "<LineString#{options[:id_attr]}>\n"
-        result += options[:geom_data]
+        result += options[:geom_data] if options[:geom_data]
         result += "<coordinates>"
         result += kml_poslist(options)
         result += "</coordinates>\n"
@@ -135,11 +135,16 @@ module GeoRuby
       end
       
       def kml_poslist(options) #:nodoc: 
-        if options[:allow_z]
-          map {|point| "#{point.x},#{point.y},#{options[:fixed_z] || point.z || 0}" }.join(" ")
+         pos_list = if options[:allow_z]
+           map {|point| "#{point.x},#{point.y},#{options[:fixed_z] || point.z || 0}" }
         else
-          map {|point| "#{point.x},#{point.y}" }.join(" ")
+          map {|point| "#{point.x},#{point.y}" }
         end
+	if(options[:reverse])
+	   pos_list.reverse.join(" ")
+	else
+	   pos_list.join(" ")
+	end
       end
       
       #Creates a new line string. Accept an array of points as argument

data/lib/geo_ruby/simple_features/point.rb

@@ -177,7 +177,7 @@ module GeoRuby
       #it won't be used by GE anyway: clampToGround is the default)
       def kml_representation(options = {}) #:nodoc: 
         result = "<Point#{options[:id_attr]}>\n"
-        result += options[:geom_data]
+        result += options[:geom_data] if options[:geom_data]
         result += "<coordinates>#{x},#{y}"
         result += ",#{options[:fixed_z] || z ||0}" if options[:allow_z]
         result += "</coordinates>\n"

data/lib/geo_ruby/simple_features/polygon.rb

@@ -109,7 +109,7 @@ module GeoRuby
       #it won't be used by GE anyway: clampToGround is the default)
       def kml_representation(options = {})
         result = "<Polygon#{options[:id_attr]}>\n"
-        result += options[:geom_data]
+        result += options[:geom_data] if options[:geom_data]
         rings.each_with_index do |ring, i|
           if i == 0
             boundary = "outerBoundaryIs"

data/rakefile.rb

@@ -24,7 +24,7 @@ spec = Gem::Specification::new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name = 'GeoRuby'
-  s.version = "1.3.2"
+  s.version = "1.3.3"
   s.summary = "Ruby data holder for OGC Simple Features"
   s.description = <<EOF
 GeoRuby is intended as a holder for data returned from PostGIS and MySQL Spatial queries. The data model roughly follows the OGC "Simple Features for SQL" specification (see www.opengis.org/docs/99-049.pdf), although without any kind of advanced functionalities (such as geometric operators or reprojections)

data/test/test_georss_kml.rb

@@ -211,5 +211,21 @@ class TestGeorssKml < Test::Unit::TestCase
 
   end
 
+   def test_to_kml_for_point_does_not_raise_type_error_if_geom_data_not_provided
+    point = Point.from_coordinates([1.6,2.8],123)
+    assert_nothing_raised(TypeError) { point.kml_representation }
+  end
+  
+  def test_to_kml_for_polygon_does_not_raise_type_error_if_geom_data_not_provided
+    polygon =  Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]],256)
+    
+    assert_nothing_raised(TypeError) { polygon.kml_representation }
+  end
+  
+  def test_to_kml_for_line_string_does_not_raise_type_error_if_geom_data_not_provided
+    ls = LineString.from_coordinates([[5.7,12.45],[67.55,54]],256)
+    assert_nothing_raised(TypeError) { ls.kml_representation }
+  end
+
 
 end

data/test/test_shp_write.rb

@@ -53,7 +53,7 @@ class TestShp < Test::Unit::TestCase
     
     assert_equal(2,shpfile.record_count)
     shpfile.close
-    #rm_all_shp(File.dirname(__FILE__) + '/data/polyline2')
+    rm_all_shp(File.dirname(__FILE__) + '/data/polyline2')
   end
 
   def test_polygon

data/test/test_simple_features.rb

@@ -476,7 +476,7 @@ class TestSimpleFeatures < Test::Unit::TestCase
     assert_equal("SRID=256;MULTIPOLYGON(((12.4 -45.3,45.4 41.6,4.456 1.0698,12.4 -45.3),(2.4 5.3,5.4 1.4263,14.46 1.06,2.4 5.3)),((0 0,4 0,4 4,0 4,0 0),(1 1,3 1,3 3,1 3,1 1)))",multi_polygon.as_ewkt)
 
      multi_polygon = MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3,2],[45.4,41.6,3],[4.456,1.0698,4],[12.4,-45.3,2]],[[2.4,5.3,1],[5.4,1.4263,3.44],[14.46,1.06,4.5],[2.4,5.3,1]]],DEFAULT_SRID,true),Polygon.from_coordinates([[[0,0,5.6],[4,0,5.4],[4,4,1],[0,4,23],[0,0,5.6]],[[1,1,2.3],[3,1,4],[3,3,5],[1,3,6],[1,1,2.3]]],DEFAULT_SRID,true)],DEFAULT_SRID,true)
-    assert_equal("MULTIPOLYGON(((12.4 -45.3 2,45.4 41.6 3,4.456 1.0698 4,12.4 -45.3 2),(2.4 5.3 1,5.4 1.4263 3.44,14.46 1.06 4.5,2.4 5.3 1)),((0 0 5.6,4 0 5.4,4 4 1,0 4 23,0 0 5.6),(1 1 2.3,3 1 4,3 3 5,1 3 6,1 1 2.3)))",multi_polygon.as_ewkt)
+    assert_equal("SRID=-1;MULTIPOLYGON(((12.4 -45.3 2,45.4 41.6 3,4.456 1.0698 4,12.4 -45.3 2),(2.4 5.3 1,5.4 1.4263 3.44,14.46 1.06 4.5,2.4 5.3 1)),((0 0 5.6,4 0 5.4,4 4 1,0 4 23,0 0 5.6),(1 1 2.3,3 1 4,3 3 5,1 3 6,1 1 2.3)))",multi_polygon.as_ewkt)
     
   end
   

data/tools/lib/spatial_adapter/init.rb

@@ -1,10 +1,14 @@
 class SpatialAdapterNotCompatibleError < StandardError
 end
 
-if ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)
+
+case ActiveRecord::Base.connection.adapter_name
+when 'MySQL'
   require 'mysql_spatial_adapter'
-elsif ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+when 'PostgreSQL'
   require 'post_gis_adapter'
-else
+ else
   raise SpatialAdapterNotCompatibleError.new("Only MySQL and PostgreSQL are currently supported by the spatial adapter plugin.")
-end
+ end
+
+

data/tools/lib/spatial_adapter/lib/mysql_spatial_adapter.rb

@@ -52,17 +52,47 @@ ActiveRecord::Base.class_eval do
         end
       end.join(' AND ')
     end
+    def self.get_rails2_conditions(attrs)
+      attrs.map do |attr, value|
+        attr = attr.to_s
+        if columns_hash[attr].is_a?(SpatialColumn)
+         if value.is_a?(Array)
+            #using some georuby utility : The multipoint has a bbox whose corners are the 2 points passed as parameters : [ pt1, pt2]
+            attrs[attr.to_sym]=MultiPoint.from_coordinates(value)
+          elsif value.is_a?(Envelope)
+            attrs[attr.to_sym]=MultiPoint.from_points([value.lower_corner,value.upper_corner])
+          end
+          "MBRIntersects(?, #{table_name}.#{connection.quote_column_name(attr)}) " 
+        else
+          #original stuff
+          # Extract table name from qualified attribute names.
+          if attr.include?('.')
+            table_name, attr = attr.split('.', 2)
+            table_name = connection.quote_table_name(table_name)
+          else
+            table_name = quoted_table_name
+          end
+          "#{table_name}.#{connection.quote_column_name(attr)} #{attribute_condition(value)}"
+        end
+      end.join(' AND ')
+    end
     if ActiveRecord::VERSION::STRING == "1.15.1"
       def self.sanitize_sql_hash(attrs)
         conditions = get_conditions(attrs)
         replace_bind_variables(conditions, attrs.values)
       end
-    else
+    elsif ActiveRecord::VERSION::STRING.starts_with?("1.15")
       #For Rails >= 1.2
       def self.sanitize_sql_hash(attrs)
         conditions = get_conditions(attrs)
         replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
       end
+    else
+      #For Rails >= 2
+      def self.sanitize_sql_hash_for_conditions(attrs)
+        conditions = get_rails2_conditions(attrs)
+        replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
+      end
     end
   end
 end

data/tools/lib/spatial_adapter/lib/post_gis_adapter.rb

@@ -3,6 +3,7 @@ require 'geo_ruby'
 require 'common_spatial_adapter'
 
 include GeoRuby::SimpleFeatures
+include SpatialAdapter
 
 #tables to ignore in migration : relative to PostGIS management of geometric columns
 ActiveRecord::SchemaDumper.ignore_tables << "spatial_ref_sys" << "geometry_columns"
@@ -41,14 +42,16 @@ ActiveRecord::Base.class_eval do
       [ conditions.join(" AND "), *arguments[0...attribute_names.length] ]
     end
   else
+    #Vit Ondruch & Tilmann Singer 's patch
     def self.get_conditions(attrs)
       attrs.map do |attr, value|
+        attr = attr.to_s
         if columns_hash[attr].is_a?(SpatialColumn)
           if value.is_a?(Array)
-            attrs[attr]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
+            attrs[attr.to_sym]= "BOX3D(" + value[0].join(" ") + "," + value[1].join(" ") + ")"
             "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value[2] || DEFAULT_SRID} ) " 
           elsif value.is_a?(Envelope)
-            attrs[attr]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
+            attrs[attr.to_sym]= "BOX3D(" + value.lower_corner.text_representation + "," + value.upper_corner.text_representation + ")"
             "#{table_name}.#{connection.quote_column_name(attr)} && SetSRID(?::box3d, #{value.srid} ) " 
           else
             "#{table_name}.#{connection.quote_column_name(attr)} && ? " 
@@ -63,11 +66,17 @@ ActiveRecord::Base.class_eval do
         conditions = get_conditions(attrs)
         replace_bind_variables(conditions, attrs.values)
       end
-    else
+    elsif ActiveRecord::VERSION::STRING.starts_with?("1.15")
       def self.sanitize_sql_hash(attrs)
         conditions = get_conditions(attrs)
         replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
       end
+    else
+      #For Rails >= 2
+      def self.sanitize_sql_hash_for_conditions(attrs)
+        conditions = get_conditions(attrs)
+        replace_bind_variables(conditions, expand_range_bind_variables(attrs.values))
+      end
     end
   end
 end
@@ -194,13 +203,31 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     column_definitions(table_name).collect do |name, type, default, notnull|
       if type =~ /geometry/i and raw_geom_infos[name]
         raw_geom_info = raw_geom_infos[name]
-        
-        ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name,default_value(default),raw_geom_info.type,notnull == "f",raw_geom_info.srid,raw_geom_info.with_z,raw_geom_info.with_m)
+        if ActiveRecord::VERSION::STRING >= "2.0.0"
+          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default,raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+        else
+          ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn.new(name, default_value(default), raw_geom_info.type, notnull == "f", raw_geom_info.srid, raw_geom_info.with_z, raw_geom_info.with_m)
+        end
       else
-        ActiveRecord::ConnectionAdapters::Column.new(name, default_value(default), translate_field_type(type),notnull == "f")
+        if ActiveRecord::VERSION::STRING >= "2.0.0"
+          ActiveRecord::ConnectionAdapters::Column.new(name, ActiveRecord::ConnectionAdapters::PostgreSQLColumn.extract_value_from_default( default), type,notnull == "f")
+        else
+          #Vit Ondruch & Tilmann Singer 's patch
+          ActiveRecord::ConnectionAdapters::Column.new(name, default_value(default), translate_field_type(type),notnull == "f")
+        end
       end
     end
   end
+
+  #Pete Deffendol's patch
+  alias :original_disable_referential_integrity :disable_referential_integrity
+  def disable_referential_integrity(&block) #:nodoc:
+    ignore_tables = %w{ geometry_columns spatial_ref_sys }
+    execute(tables.select { |name| !ignore_tables.include?(name) }.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+    yield
+  ensure
+    execute(tables.select { |name| !ignore_tables.include?(name)}.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+  end
       
   private
          
@@ -284,7 +311,7 @@ module ActiveRecord
       attr_reader :geom_columns
       
       def column(name, type, options = {})
-        unless @base.geometry_data_types[type].nil?
+        unless @base.geometry_data_types[type.to_sym].nil?
           geom_column = PostgreSQLColumnDefinition.new(@base,name, type)
           geom_column.null = options[:null]
           geom_column.srid = options[:srid] || -1
@@ -297,6 +324,17 @@ module ActiveRecord
           super(name,type,options)
         end
       end
+      
+      SpatialAdapter.geometry_data_types.keys.each do |column_type|
+        class_eval <<-EOV
+          def #{column_type}(*args)
+            options = args.extract_options!
+            column_names = args
+            
+            column_names.each { |name| column(name, '#{column_type}', options) }
+          end
+        EOV
+      end      
     end
 
     class PostgreSQLColumnDefinition < ColumnDefinition
@@ -357,3 +395,4 @@ module ActiveRecord
     end
   end
 end
+

data/tools/lib/spatial_adapter/test/access_postgis_test.rb

@@ -11,12 +11,12 @@ class AccessPostgisTest < Test::Unit::TestCase
     pt = TablePoint.new(:data => "Test", :geom => Point.from_x_y(1.2,4.5))
     assert(pt.save)
     
-    pt = TablePoint.find_first
+    pt = TablePoint.find(:first)
     assert(pt)
     assert_equal("Test",pt.data)
     assert_equal(Point.from_x_y(1.2,4.5),pt.geom)
     
-    pts = TablePoint.find_all
+    pts = TablePoint.find(:all)
     pts.each do |pt|
       assert(pt.geom.is_a?(Point))
     end
@@ -27,7 +27,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pt = TableKeywordColumnPoint.new(:location => Point.from_x_y(1.2,4.5))
     assert(pt.save)
     
-    pt = TableKeywordColumnPoint.find_first
+    pt = TableKeywordColumnPoint.find(:first)
     assert(pt)
     assert_equal(Point.from_x_y(1.2,4.5),pt.location)
 
@@ -37,7 +37,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     ls = TableLineString.new(:value => 3, :geom => LineString.from_coordinates([[1.4,2.5],[1.5,6.7]]))
     assert(ls.save)
     
-    ls = TableLineString.find_first
+    ls = TableLineString.find(:first)
     assert(ls)
     assert_equal(3,ls.value)
     assert_equal(LineString.from_coordinates([[1.4,2.5],[1.5,6.7]]),ls.geom)
@@ -48,7 +48,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pg = TablePolygon.new(:geom => Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]]))
     assert(pg.save)
 
-    pg = TablePolygon.find_first
+    pg = TablePolygon.find(:first)
     assert(pg)
     assert_equal(Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]]),pg.geom)
   end
@@ -57,7 +57,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     mp = TableMultiPoint.new(:geom => MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]]))
     assert(mp.save)
 
-    mp = TableMultiPoint.find_first
+    mp = TableMultiPoint.find(:first)
     assert(mp)
     assert_equal(MultiPoint.from_coordinates([[12.4,-123.3],[-65.1,123.4],[123.55555555,123]]),mp.geom)
   end
@@ -66,7 +66,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     ml = TableMultiLineString.new(:geom => MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]])]))
     assert(ml.save)
 
-    ml = TableMultiLineString.find_first
+    ml = TableMultiLineString.find(:first)
     assert(ml)
     assert_equal(MultiLineString.from_line_strings([LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012]]),LineString.from_coordinates([[1.5,45.2],[-54.12312,-0.012],[45.123,123.3]])]),ml.geom)
   end
@@ -75,7 +75,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     mp = TableMultiPolygon.new( :geom => MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]]),Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]])]))
     assert(mp.save)
 
-    mp = TableMultiPolygon.find_first
+    mp = TableMultiPolygon.find(:first)
     assert(mp)
     assert_equal(MultiPolygon.from_polygons([Polygon.from_coordinates([[[12.4,-45.3],[45.4,41.6],[4.456,1.0698],[12.4,-45.3]],[[2.4,5.3],[5.4,1.4263],[14.46,1.06],[2.4,5.3]]]),Polygon.from_coordinates([[[0,0],[4,0],[4,4],[0,4],[0,0]],[[1,1],[3,1],[3,3],[1,3],[1,1]]])]),mp.geom)
   end
@@ -84,7 +84,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     gm = TableGeometry.new(:geom => LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]]))
     assert(gm.save)
 
-    gm = TableGeometry.find_first
+    gm = TableGeometry.find(:first)
     assert(gm)
     assert_equal(LineString.from_coordinates([[12.4,-45.3],[45.4,41.6],[4.456,1.0698]]),gm.geom)
   end
@@ -93,7 +93,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     gc = TableGeometryCollection.new(:geom => GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4),LineString.from_coordinates([[5.7,12.45],[67.55,54]])]))
     assert(gc.save)
 
-    gc = TableGeometryCollection.find_first
+    gc = TableGeometryCollection.find(:first)
     assert(gc)
     assert_equal(GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4),LineString.from_coordinates([[5.7,12.45],[67.55,54]])]),gc.geom)
   end
@@ -102,7 +102,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pt = Table3dzPoint.new(:data => "Hello!",:geom => Point.from_x_y_z(-1.6,2.8,-3.4))
     assert(pt.save)
 
-    pt = Table3dzPoint.find_first
+    pt = Table3dzPoint.find(:first)
     assert(pt)
     assert_equal(Point.from_x_y_z(-1.6,2.8,-3.4),pt.geom)
   end
@@ -111,7 +111,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pt = Table3dmPoint.new(:geom => Point.from_x_y_m(-1.6,2.8,-3.4))
     assert(pt.save)
 
-    pt = Table3dmPoint.find_first
+    pt = Table3dmPoint.find(:first)
     assert(pt)
     assert_equal(Point.from_x_y_m(-1.6,2.8,-3.4),pt.geom)
   end
@@ -120,7 +120,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pt = Table4dPoint.new(:geom => Point.from_x_y_z_m(-1.6,2.8,-3.4,15))
     assert(pt.save)
 
-    pt = Table4dPoint.find_first
+    pt = Table4dPoint.find(:first)
     assert(pt)
     assert_equal(Point.from_x_y_z_m(-1.6,2.8,-3.4,15),pt.geom)
   end
@@ -129,7 +129,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     ls = TableSridLineString.new(:geom => LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],123))
     assert(ls.save)
 
-    ls = TableSridLineString.find_first
+    ls = TableSridLineString.find(:first)
     assert(ls)
     ls_e = LineString.from_coordinates([[1.4,2.5],[1.5,6.7]],123)
     assert_equal(ls_e,ls.geom)
@@ -140,7 +140,7 @@ class AccessPostgisTest < Test::Unit::TestCase
     pg = TableSrid4dPolygon.new(:geom => Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],123,true,true))
     assert(pg.save)
 
-    pg = TableSrid4dPolygon.find_first
+    pg = TableSrid4dPolygon.find(:first)
     assert(pg)
     pg_e = Polygon.from_coordinates([[[0,0,2,-45.1],[4,0,2,5],[4,4,2,4.67],[0,4,2,1.34],[0,0,2,-45.1]],[[1,1,2,12.3],[3,1,2,123],[3,3,2,12.2],[1,3,2,12],[1,1,2,12.3]]],123,true,true)
     assert_equal(pg_e,pg.geom)

data/tools/lib/spatial_adapter/test/common/common_mysql.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'rubygems'
-require_gem 'activerecord'
+require 'activerecord'
 
 ActiveRecord::Base.establish_connection(YAML.load_file(File.dirname(__FILE__) +  '/../db/database_mysql.yml'))
 

data/tools/lib/spatial_adapter/test/common/common_postgis.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'rubygems'
-require_gem 'activerecord'
+require 'activerecord'
 
 
 ActiveRecord::Base.establish_connection(YAML.load_file(File.dirname(__FILE__) + '/../db/database_postgis.yml'))