spatial_adapter 1.1.2 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/spatial_adapter/mysql2.rb

@@ -0,0 +1,97 @@
+require 'spatial_adapter'
+require 'active_record/connection_adapters/mysql2_adapter'
+
+ActiveRecord::ConnectionAdapters::Mysql2Adapter.class_eval do
+  include SpatialAdapter
+
+  def supports_geographic?
+    false
+  end
+  
+  alias :original_native_database_types :native_database_types
+  def native_database_types
+    original_native_database_types.merge!(geometry_data_types)
+  end
+ 
+  alias :original_quote :quote
+  #Redefines the quote method to add behaviour for when a Geometry is encountered ; used when binding variables in find_by methods
+  def quote(value, column = nil)
+    if value.kind_of?(GeoRuby::SimpleFeatures::Geometry)
+      "GeomFromWKB(0x#{value.as_hex_wkb},#{value.srid})"
+    else
+      original_quote(value,column)
+    end
+  end
+  
+  #Redefinition of columns to add the information that a column is geometric
+  def columns(table_name, name = nil)#:nodoc:
+    sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
+    columns = []
+    result = execute(sql, name)
+    result.each do |field|
+      klass = field[1] =~ /geometry|point|linestring|polygon|multipoint|multilinestring|multipolygon|geometrycollection/i ? ActiveRecord::ConnectionAdapters::SpatialMysql2Column : ActiveRecord::ConnectionAdapters::Mysql2Column
+      columns << klass.new(field[0], field[4], field[1], field[2] == "YES")
+    end
+    columns
+  end
+
+
+  #operations relative to migrations
+
+  #Redefines add_index to support the case where the index is spatial
+  #If the :spatial key in the options table is true, then the sql string for a spatial index is created
+  def add_index(table_name,column_name,options = {})
+    index_name = options[:name] || index_name(table_name,:column => Array(column_name))
+    
+    if options[:spatial]
+      execute "CREATE SPATIAL INDEX #{index_name} ON #{table_name} (#{Array(column_name).join(", ")})"
+    else
+      super
+    end
+  end
+
+  #Check the nature of the index : If it is SPATIAL, it is indicated in the IndexDefinition object (redefined to add the spatial flag in spatial_adapter_common.rb)
+  def indexes(table_name, name = nil)#:nodoc:
+    indexes = []
+    current_index = nil
+    (execute("SHOW KEYS FROM #{table_name}", name) || []).each do |row|
+      if current_index != row[2]
+        next if row[2] == "PRIMARY" # skip the primary key
+        current_index = row[2]
+        indexes << ActiveRecord::ConnectionAdapters::IndexDefinition.new(row[0], row[2], row[1] == "0", [], row[10] == "SPATIAL")
+      end
+      indexes.last.columns << row[4]
+    end
+    indexes
+  end
+        
+  #Get the table creation options : Only the engine for now. The text encoding could also be parsed and returned here.
+  def options_for(table)
+    result = execute("show table status like '#{table}'")
+    engine = result.first[1]
+    if engine !~ /inno/i #inno is default so do nothing for it in order not to clutter the migration
+      "ENGINE=#{engine}" 
+    else
+      nil
+    end
+  end
+end
+
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SpatialMysql2Column < Mysql2Column
+      include SpatialAdapter::SpatialColumn
+      
+      #MySql-specific geometry string parsing. By default, MySql returns geometries in strict wkb format with "0" characters in the first 4 positions.
+      def self.string_to_geometry(string)
+        return string unless string.is_a?(String)
+        begin
+          GeoRuby::SimpleFeatures::Geometry.from_ewkb(string[4..-1])
+        rescue Exception => exception
+          nil
+        end
+      end
+    end
+  end
+end

data/spec/README.txt

@@ -6,7 +6,7 @@ You will need to set up empty databases for each adapter you want to test.
 
 Create an empty database "spatial_adapter" and ensure that the PostGIS extensions are loaded.  
 
-run "rake spec:postgis" to run the specs
+run "rake spec:postgresql" to run the specs
 
 == MySQL
 
@@ -14,3 +14,9 @@ Create an empty database "spatial_adapter" - the spatial extensions are already
 
 run "rake spec:mysql" to run the specs
 
+== MySQL2
+
+Create an empty database "spatial_adapter" - the spatial extensions are already available.
+
+run "rake spec:mysql2" to run the specs
+

data/spec/db/mysql2_raw.rb

@@ -0,0 +1,70 @@
+mysql2_connection
+
+ActiveRecord::Schema.define() do
+  execute "drop table if exists point_models"
+  execute "create table point_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	more_extra varchar(255),
+    	geom  point not null
+    ) ENGINE=MyISAM"
+  execute "create spatial index index_point_models_on_geom on point_models (geom)"
+  execute "create index index_point_models_on_extra on point_models (extra, more_extra)"
+    
+  execute "drop table if exists line_string_models"
+  execute "create table line_string_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom linestring
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists polygon_models"
+  execute "create table polygon_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom polygon
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists multi_point_models"
+  execute "create table multi_point_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom multipoint
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists multi_line_string_models"
+  execute "create table multi_line_string_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom multilinestring
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists multi_polygon_models"
+  execute "create table multi_polygon_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom multipolygon
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists geometry_collection_models"
+  execute "create table geometry_collection_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom geometrycollection
+    ) ENGINE=MyISAM"
+    
+  execute "drop table if exists geometry_models"
+  execute "create table geometry_models
+    (
+    	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
+    	extra varchar(255),
+    	geom geometry
+    ) ENGINE=MyISAM"
+end

data/spec/mysql/connection_adapter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'spatial_adapter/mysql'
 require 'db/mysql_raw'
 require 'models/common'

data/spec/mysql/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'spatial_adapter/mysql'
 
 class MigratedGeometryModel < ActiveRecord::Base

data/spec/mysql/models_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'shared_examples'
 require 'spatial_adapter/mysql'
 require 'db/mysql_raw'
 require 'models/common'
@@ -59,46 +60,6 @@ describe "Spatially-enabled Models" do
     end
   end
 
-  describe "finding records" do
-    it 'should retrieve Point objects' do
-      model = PointModel.create(:extra => 'test', :geom => GeometryFactory.point)
-      PointModel.find(model.id).geom.should == GeometryFactory.point
-    end
-  
-    it 'should retrieve LineString objects' do
-      model = LineStringModel.create(:extra => 'test', :geom => GeometryFactory.line_string)
-      LineStringModel.find(model.id).geom.should == GeometryFactory.line_string
-    end
-  
-    it 'should retrieve Polygon objects' do
-      model = PolygonModel.create(:extra => 'test', :geom => GeometryFactory.polygon)
-      PolygonModel.find(model.id).geom.should == GeometryFactory.polygon
-    end
-  
-    it 'should retrieve MultiPoint objects' do
-      model = MultiPointModel.create(:extra => 'test', :geom => GeometryFactory.multi_point)
-      MultiPointModel.find(model.id).geom.should == GeometryFactory.multi_point
-    end
-  
-    it 'should retrieve MultiLineString objects' do
-      model = MultiLineStringModel.create(:extra => 'test', :geom => GeometryFactory.multi_line_string)
-      MultiLineStringModel.find(model.id).geom.should == GeometryFactory.multi_line_string
-    end
-  
-    it 'should retrieve MultiPolygon objects' do
-      model = MultiPolygonModel.create(:extra => 'test', :geom => GeometryFactory.multi_polygon)
-      MultiPolygonModel.find(model.id).geom.should == GeometryFactory.multi_polygon
-    end
-  
-    it 'should retrieve GeometryCollection objects' do
-      model = GeometryCollectionModel.create(:extra => 'test', :geom => GeometryFactory.geometry_collection)
-      GeometryCollectionModel.find(model.id).geom.should == GeometryFactory.geometry_collection
-    end
-  
-    it 'should retrieve Geometry objects' do
-      model = GeometryModel.create(:extra => 'test', :geom => GeometryFactory.point)
-      GeometryModel.find(model.id).geom.should == GeometryFactory.point
-    end
-  end
+  include CommonModelActions
 end
 

data/spec/mysql/schema_dumper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'spatial_adapter/mysql'
 
 describe "Spatially-enabled Schema Dumps" do

data/spec/mysql2/connection_adapter_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+require 'spatial_adapter/mysql2'
+require 'db/mysql2_raw'
+require 'models/common'
+
+describe "Modified Mysql2Adapter" do
+  before :each do
+    mysql2_connection
+    @connection = ActiveRecord::Base.connection
+  end
+  
+  describe '#supports_geographic?' do
+    it "should be false" do
+      @connection.supports_geographic?.should == false
+    end
+  end
+
+  describe "#columns" do
+    describe "type" do
+      it "should be SpatialMysql2Column if column is a spatial data type" do
+        PointModel.columns.select{|c| c.name == 'geom'}.first.should be_a(ActiveRecord::ConnectionAdapters::SpatialMysql2Column)
+      end
+      
+      it "should be Mysql2Column if column is not a spatial data type" do
+        PointModel.columns.select{|c| c.name == 'extra'}.first.should be_a(ActiveRecord::ConnectionAdapters::Mysql2Column)
+      end
+    end
+    
+    describe "@geometry_type" do
+      it "should be :point for columns restricted to POINT types" do
+        PointModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :point
+      end
+      
+      it "should be :line_string for columns restricted to LINESTRING types" do
+        LineStringModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :line_string
+      end
+
+      it "should be :polygon for columns restricted to POLYGON types" do
+        PolygonModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :polygon
+      end
+
+      it "should be :multi_point for columns restricted to MULTIPOINT types" do
+        MultiPointModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :multi_point
+      end
+
+      it "should be :multi_line_string for columns restricted to MULTILINESTRING types" do
+        MultiLineStringModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :multi_line_string
+      end
+      
+      it "should be :multi_polygon for columns restricted to MULTIPOLYGON types" do
+        MultiPolygonModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :multi_polygon
+      end
+      
+      it "should be :geometry_collection for columns restricted to GEOMETRYCOLLECTION types" do
+        GeometryCollectionModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :geometry_collection
+      end
+      
+      it "should be :geometry for columns not restricted to a type" do
+        GeometryModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :geometry
+      end
+    end
+  end
+  
+  describe "#indexes" do
+    before :each do
+      @indexes = @connection.indexes('point_models')
+    end
+    
+    it "should return an IndexDefinition for each index on the table" do
+      @indexes.should have(2).items
+      @indexes.each do |i|
+        i.should be_a(ActiveRecord::ConnectionAdapters::IndexDefinition)
+      end
+    end
+    
+    it "should indicate the correct columns in the index" do
+      @indexes.select{|i| i.name == 'index_point_models_on_geom'}.first.columns.should == ['geom']
+      @indexes.select{|i| i.name == 'index_point_models_on_extra'}.first.columns.should == ['extra', 'more_extra']
+    end   
+    
+    it "should be marked as spatial if a spatial index" do
+      @indexes.select{|i| i.columns.include?('geom')}.first.spatial.should == true
+    end
+    
+    it "should not be marked as spatial if not a spatial index" do
+      @indexes.select{|i| i.columns.include?('extra')}.first.spatial.should == false
+    end
+  end  
+  
+  describe "#add_index" do
+    after :each do
+      @connection.should_receive(:execute).with(any_args())
+      @connection.remove_index('geometry_models', 'geom')
+    end
+    
+    it "should create a spatial index given :spatial => true" do
+      @connection.should_receive(:execute).with(/create spatial index/i)
+      @connection.add_index('geometry_models', 'geom', :spatial => true)
+    end
+    
+    it "should not create a spatial index unless specified" do
+      @connection.should_not_receive(:execute).with(/create spatial index/i)
+      @connection.add_index('geometry_models', 'extra')
+    end
+  end
+end

data/spec/mysql2/migration_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'spatial_adapter/mysql2'
+
+class MigratedGeometryModel < ActiveRecord::Base
+end
+
+describe "Spatially-enabled Migrations" do
+  before :each do
+    mysql2_connection
+    @connection = ActiveRecord::Base.connection
+  end
+  
+  describe "creating tables" do
+    after :each do
+      @connection.drop_table "migrated_geometry_models"
+    end
+    
+    SpatialAdapter.geometry_data_types.keys.each do |type|
+      it "should create #{type.to_s} columns" do
+        ActiveRecord::Schema.define do
+          create_table :migrated_geometry_models, :force => true do |t|
+            t.integer :extra
+            t.send(type, :geom)
+          end
+        end
+
+        geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
+        geom_column.should be_a(SpatialAdapter::SpatialColumn)
+        geom_column.geometry_type.should == type
+        geom_column.type.should == :string
+      end
+    end
+  end
+
+  describe "adding columns" do
+    before :each do
+      ActiveRecord::Schema.define do
+        create_table :migrated_geometry_models, :force => true do |t|
+          t.integer :extra
+        end
+      end
+    end
+    
+    after :each do
+      @connection.drop_table "migrated_geometry_models"
+    end
+
+    SpatialAdapter.geometry_data_types.keys.each do |type|
+      it "should add #{type.to_s} columns" do
+        ActiveRecord::Schema.define do
+          add_column :migrated_geometry_models, :geom, type
+        end
+
+        geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
+        geom_column.should be_a(SpatialAdapter::SpatialColumn)
+        geom_column.geometry_type.should == type
+        geom_column.type.should == :string
+        geom_column.with_z.should == false
+        geom_column.with_m.should == false
+        geom_column.srid.should == -1
+      end
+    end
+  end
+end

data/spec/mysql2/models_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'shared_examples'
+require 'spatial_adapter/mysql2'
+require 'db/mysql2_raw'
+require 'models/common'
+
+describe "Spatially-enabled Models" do
+  before :each do
+    mysql2_connection
+    @connection = ActiveRecord::Base.connection
+  end
+  
+  describe "inserting records" do
+    it 'should save Point objects' do
+      model = PointModel.new(:extra => 'test', :geom => GeometryFactory.point)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.point.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save LineString objects' do
+      model = LineStringModel.new(:extra => 'test', :geom => GeometryFactory.line_string)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.line_string.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save Polygon objects' do
+      model = PolygonModel.new(:extra => 'test', :geom => GeometryFactory.polygon)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.polygon.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save MultiPoint objects' do
+      model = MultiPointModel.new(:extra => 'test', :geom => GeometryFactory.multi_point)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.multi_point.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save MultiLineString objects' do
+      model = MultiLineStringModel.new(:extra => 'test', :geom => GeometryFactory.multi_line_string)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.multi_line_string.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save MultiPolygon objects' do
+      model = MultiPolygonModel.new(:extra => 'test', :geom => GeometryFactory.multi_polygon)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.multi_polygon.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save GeometryCollection objects' do
+      model = GeometryCollectionModel.new(:extra => 'test', :geom => GeometryFactory.geometry_collection)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.geometry_collection.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  
+    it 'should save Geometry objects' do
+      model = GeometryModel.new(:extra => 'test', :geom => GeometryFactory.point)
+      @connection.should_receive(:insert_sql).with(Regexp.new(GeometryFactory.point.as_hex_wkb), anything(), anything(), anything(), anything())
+      model.save.should == true
+    end
+  end
+
+  include CommonModelActions
+end
+

data/spec/mysql2/schema_dumper_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'spatial_adapter/mysql2'
+
+describe "Spatially-enabled Schema Dumps" do
+  before :all do
+    mysql2_connection
+    @connection = ActiveRecord::Base.connection
+
+    # Create a new table
+    ActiveRecord::Schema.define do
+      create_table :migrated_geometry_models, :options=> "ENGINE=MyISAM", :force => true do |t|
+        t.integer :extra
+        t.point   :geom, :null => false
+      end
+      add_index :migrated_geometry_models, :geom, :spatial => true, :name => 'test_spatial_index'
+    end
+
+    File.open('schema.rb', "w") do |file|
+      ActiveRecord::SchemaDumper.dump(@connection, file)
+    end
+    
+    # Drop the original table
+    @connection.drop_table "migrated_geometry_models"
+    
+    # Load the dumped schema
+    load('schema.rb')
+  end
+  
+  after :all do
+    # delete the schema file
+    File.delete('schema.rb')
+
+    # Drop the new table
+    @connection.drop_table "migrated_geometry_models"
+  end
+  
+  it "should preserve spatial attributes of tables" do
+    columns = @connection.columns("migrated_geometry_models")
+    
+    columns.should have(3).items
+    geom_column = columns.select{|c| c.name == 'geom'}.first
+    geom_column.should be_a(SpatialAdapter::SpatialColumn)
+    geom_column.geometry_type.should == :point
+    geom_column.type.should == :string
+  end
+  
+  it "should preserve spatial indexes" do
+    indexes = @connection.indexes("migrated_geometry_models")
+    
+    indexes.should have(1).item
+    
+    indexes.first.name.should == 'test_spatial_index'
+    indexes.first.columns.should == ["geom"]
+    indexes.first.spatial.should == true
+  end
+end

data/spec/postgresql/connection_adapter_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
+require 'spec_helper'
 require 'spatial_adapter/postgresql'
 require 'db/postgis_raw'
 require 'models/common'

data/spec/postgresql/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'spatial_adapter/postgresql'
 
 class MigratedGeometryModel < ActiveRecord::Base

data/spec/postgresql/models_spec.rb

@@ -1,4 +1,5 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
+require 'shared_examples'
 require 'spatial_adapter/postgresql'
 require 'db/postgis_raw'
 require 'models/common'
@@ -143,47 +144,9 @@ describe "Spatially-enabled Models" do
     end
   end
 
-  describe "finding records" do
-    it 'should retrieve Point objects' do
-      model = PointModel.create(:extra => 'test', :geom => GeometryFactory.point)
-      PointModel.find(model.id).geom.should == GeometryFactory.point
-    end
-  
-    it 'should retrieve LineString objects' do
-      model = LineStringModel.create(:extra => 'test', :geom => GeometryFactory.line_string)
-      LineStringModel.find(model.id).geom.should == GeometryFactory.line_string
-    end
-  
-    it 'should retrieve Polygon objects' do
-      model = PolygonModel.create(:extra => 'test', :geom => GeometryFactory.polygon)
-      PolygonModel.find(model.id).geom.should == GeometryFactory.polygon
-    end
-  
-    it 'should retrieve MultiPoint objects' do
-      model = MultiPointModel.create(:extra => 'test', :geom => GeometryFactory.multi_point)
-      MultiPointModel.find(model.id).geom.should == GeometryFactory.multi_point
-    end
-  
-    it 'should retrieve MultiLineString objects' do
-      model = MultiLineStringModel.create(:extra => 'test', :geom => GeometryFactory.multi_line_string)
-      MultiLineStringModel.find(model.id).geom.should == GeometryFactory.multi_line_string
-    end
-  
-    it 'should retrieve MultiPolygon objects' do
-      model = MultiPolygonModel.create(:extra => 'test', :geom => GeometryFactory.multi_polygon)
-      MultiPolygonModel.find(model.id).geom.should == GeometryFactory.multi_polygon
-    end
-  
-    it 'should retrieve GeometryCollection objects' do
-      model = GeometryCollectionModel.create(:extra => 'test', :geom => GeometryFactory.geometry_collection)
-      GeometryCollectionModel.find(model.id).geom.should == GeometryFactory.geometry_collection
-    end
-  
-    it 'should retrieve Geometry objects' do
-      model = GeometryModel.create(:extra => 'test', :geom => GeometryFactory.point)
-      GeometryModel.find(model.id).geom.should == GeometryFactory.point
-    end
+  include CommonModelActions
   
+  describe "finding records" do    
     it 'should retrieve 3D Point (with Z coord) objects' do
       model = PointzModel.create(:extra => 'test', :geom => GeometryFactory.pointz)
       PointzModel.find(model.id).geom.should == GeometryFactory.pointz

data/spec/postgresql/schema_dumper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require 'spatial_adapter/postgresql'
 
 describe "Spatially-enabled Schema Dumps" do

data/spec/shared_examples.rb

@@ -0,0 +1,43 @@
+share_as :CommonModelActions do
+  describe 'finding records' do
+    it 'should retrieve Point objects' do
+      model = PointModel.create(:extra => 'test', :geom => GeometryFactory.point)
+      PointModel.find(model.id).geom.should == GeometryFactory.point
+    end
+
+    it 'should retrieve LineString objects' do
+      model = LineStringModel.create(:extra => 'test', :geom => GeometryFactory.line_string)
+      LineStringModel.find(model.id).geom.should == GeometryFactory.line_string
+    end
+
+    it 'should retrieve Polygon objects' do
+      model = PolygonModel.create(:extra => 'test', :geom => GeometryFactory.polygon)
+      PolygonModel.find(model.id).geom.should == GeometryFactory.polygon
+    end
+
+    it 'should retrieve MultiPoint objects' do
+      model = MultiPointModel.create(:extra => 'test', :geom => GeometryFactory.multi_point)
+      MultiPointModel.find(model.id).geom.should == GeometryFactory.multi_point
+    end
+
+    it 'should retrieve MultiLineString objects' do
+      model = MultiLineStringModel.create(:extra => 'test', :geom => GeometryFactory.multi_line_string)
+      MultiLineStringModel.find(model.id).geom.should == GeometryFactory.multi_line_string
+    end
+
+    it 'should retrieve MultiPolygon objects' do
+      model = MultiPolygonModel.create(:extra => 'test', :geom => GeometryFactory.multi_polygon)
+      MultiPolygonModel.find(model.id).geom.should == GeometryFactory.multi_polygon
+    end
+
+    it 'should retrieve GeometryCollection objects' do
+      model = GeometryCollectionModel.create(:extra => 'test', :geom => GeometryFactory.geometry_collection)
+      GeometryCollectionModel.find(model.id).geom.should == GeometryFactory.geometry_collection
+    end
+
+    it 'should retrieve Geometry objects' do
+      model = GeometryModel.create(:extra => 'test', :geom => GeometryFactory.point)
+      GeometryModel.find(model.id).geom.should == GeometryFactory.point
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'spec'
 require 'geo_ruby'
-gem 'activerecord', '=2.3.5'
-#gem 'activerecord', '=3.0.0.beta3'
+gem 'activerecord', '=3.0.3'
 require 'active_record'
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
@@ -34,6 +33,18 @@ def mysql_connection
   ActiveRecord::Migration.verbose = false
 end
 
+def mysql2_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => 'mysql2',
+    :database => 'spatial_adapter',
+    :username => 'root',
+    :host => 'localhost'
+  )
+  
+  # Don't output migration logging
+  ActiveRecord::Migration.verbose = false
+end
+
 class GeometryFactory
   class << self
     def point

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Pete Deffendol
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 -06:00
+date: 2011-01-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,6 +37,7 @@ dependencies:
   name: GeoRuby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -65,19 +67,40 @@ files:
 - lib/spatial_adapter/common/spatial_column.rb
 - lib/spatial_adapter/common/table_definition.rb
 - lib/spatial_adapter/mysql.rb
+- lib/spatial_adapter/mysql2.rb
 - lib/spatial_adapter/postgresql.rb
 - lib/spatial_adapter/railtie.rb
 - rails/init.rb
+- spec/README.txt
+- spec/db/mysql2_raw.rb
+- spec/db/mysql_raw.rb
+- spec/db/postgis_raw.rb
+- spec/models/common.rb
+- spec/mysql/connection_adapter_spec.rb
+- spec/mysql/migration_spec.rb
+- spec/mysql/models_spec.rb
+- spec/mysql/schema_dumper_spec.rb
+- spec/mysql2/connection_adapter_spec.rb
+- spec/mysql2/migration_spec.rb
+- spec/mysql2/models_spec.rb
+- spec/mysql2/schema_dumper_spec.rb
+- spec/postgresql/connection_adapter_spec.rb
+- spec/postgresql/migration_spec.rb
+- spec/postgresql/models_spec.rb
+- spec/postgresql/schema_dumper_spec.rb
+- spec/shared_examples.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/fragility/spatial_adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -85,6 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -94,11 +118,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Spatial Adapter for ActiveRecord
 test_files: 
+- spec/README.txt
+- spec/db/mysql2_raw.rb
 - spec/db/mysql_raw.rb
 - spec/db/postgis_raw.rb
 - spec/models/common.rb
@@ -106,9 +132,13 @@ test_files:
 - spec/mysql/migration_spec.rb
 - spec/mysql/models_spec.rb
 - spec/mysql/schema_dumper_spec.rb
+- spec/mysql2/connection_adapter_spec.rb
+- spec/mysql2/migration_spec.rb
+- spec/mysql2/models_spec.rb
+- spec/mysql2/schema_dumper_spec.rb
 - spec/postgresql/connection_adapter_spec.rb
 - spec/postgresql/migration_spec.rb
 - spec/postgresql/models_spec.rb
 - spec/postgresql/schema_dumper_spec.rb
+- spec/shared_examples.rb
 - spec/spec_helper.rb
-- spec/README.txt