spatial_adapter 1.2.0 → 1.3.0

data/lib/spatial_adapter/version.rb

@@ -0,0 +1,3 @@
+module SpatialAdapter
+  VERSION = '1.3.0'
+end

data/lib/spatial_adapter.rb

@@ -16,7 +16,7 @@ include GeoRuby::SimpleFeatures
 
 module SpatialAdapter
   # Translation of geometric data types
-  def geometry_data_types
+  def self.geometry_data_types
     {
       :point => { :name => "POINT" },
       :line_string => { :name => "LINESTRING" },
@@ -28,14 +28,10 @@ module SpatialAdapter
       :geometry => { :name => "GEOMETRY"}
     }
   end
-  
+
   class NotCompatibleError < ::StandardError
   end
 end
 
-require 'spatial_adapter/common/raw_geom_info'
-require 'spatial_adapter/common/spatial_column'
-require 'spatial_adapter/common/schema_definitions'
-require 'spatial_adapter/common/schema_dumper'
-require 'spatial_adapter/common/table_definition'
+require 'spatial_adapter/common'
 require 'spatial_adapter/railtie' if defined?(Rails::Railtie)

data/spatial_adapter.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'spatial_adapter/version'
+
+Gem::Specification.new do |s|
+  s.name = %q{spatial_adapter}
+  s.version = SpatialAdapter::VERSION
+
+  s.platform = $platform || RUBY_PLATFORM[/java/] || Gem::Platform::RUBY
+
+  s.authors = ["Pete Deffendol", "Guilhem Vellut"]
+  s.email = %q{pete@fragility.us}
+  s.homepage = %q{http://github.com/fragility/spatial_adapter}
+  s.summary = "spatial_adapter-#{SpatialAdapter::VERSION}"
+  s.description = %q{Provides enhancements to ActiveRecord to handle spatial
+    datatypes in PostgreSQL and MySQL.}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE"]
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  if s.platform.to_s == 'ruby'
+    s.add_development_dependency 'pg'
+    s.add_development_dependency 'mysql'
+    s.add_development_dependency 'mysql2', '<= 0.2.13'
+  end
+
+  if s.platform.to_s == 'java'
+    s.add_development_dependency 'activerecord-jdbcmysql-adapter'
+  end
+
+  s.add_dependency 'activerecord', '>= 2.2.2', '< 3.1.0'
+  s.add_dependency 'GeoRuby', '>= 1.3.0'
+end

data/spec/db/jdbcmysql_raw.rb

@@ -0,0 +1,70 @@
+jdbcmysql_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(100),
+    	more_extra varchar(100),
+    	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(100),
+    	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(100),
+    	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(100),
+    	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(100),
+    	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(100),
+    	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(100),
+    	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(100),
+    	geom geometry
+    ) ENGINE=MyISAM"
+end

data/spec/db/mysql2_raw.rb

@@ -5,8 +5,8 @@ ActiveRecord::Schema.define() do
   execute "create table point_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
-    	more_extra varchar(255),
+    	extra varchar(100),
+    	more_extra varchar(100),
     	geom  point not null
     ) ENGINE=MyISAM"
   execute "create spatial index index_point_models_on_geom on point_models (geom)"
@@ -16,7 +16,7 @@ ActiveRecord::Schema.define() do
   execute "create table line_string_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom linestring
     ) ENGINE=MyISAM"
     
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define() do
   execute "create table polygon_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom polygon
     ) ENGINE=MyISAM"
     
@@ -32,7 +32,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_point_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multipoint
     ) ENGINE=MyISAM"
     
@@ -40,7 +40,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_line_string_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multilinestring
     ) ENGINE=MyISAM"
     
@@ -48,7 +48,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_polygon_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multipolygon
     ) ENGINE=MyISAM"
     
@@ -56,7 +56,7 @@ ActiveRecord::Schema.define() do
   execute "create table geometry_collection_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom geometrycollection
     ) ENGINE=MyISAM"
     
@@ -64,7 +64,7 @@ ActiveRecord::Schema.define() do
   execute "create table geometry_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom geometry
     ) ENGINE=MyISAM"
 end

data/spec/db/mysql_raw.rb

@@ -5,8 +5,8 @@ ActiveRecord::Schema.define() do
   execute "create table point_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
-    	more_extra varchar(255),
+    	extra varchar(100),
+    	more_extra varchar(100),
     	geom  point not null
     ) ENGINE=MyISAM"
   execute "create spatial index index_point_models_on_geom on point_models (geom)"
@@ -16,7 +16,7 @@ ActiveRecord::Schema.define() do
   execute "create table line_string_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom linestring
     ) ENGINE=MyISAM"
     
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define() do
   execute "create table polygon_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom polygon
     ) ENGINE=MyISAM"
     
@@ -32,7 +32,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_point_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multipoint
     ) ENGINE=MyISAM"
     
@@ -40,7 +40,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_line_string_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multilinestring
     ) ENGINE=MyISAM"
     
@@ -48,7 +48,7 @@ ActiveRecord::Schema.define() do
   execute "create table multi_polygon_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom multipolygon
     ) ENGINE=MyISAM"
     
@@ -56,7 +56,7 @@ ActiveRecord::Schema.define() do
   execute "create table geometry_collection_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom geometrycollection
     ) ENGINE=MyISAM"
     
@@ -64,7 +64,7 @@ ActiveRecord::Schema.define() do
   execute "create table geometry_models
     (
     	id int(11) DEFAULT NULL auto_increment PRIMARY KEY,
-    	extra varchar(255),
+    	extra varchar(100),
     	geom geometry
     ) ENGINE=MyISAM"
 end

data/spec/jdbcmysql_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'shared/mysql_connection_adapter_spec'
+require 'shared/mysql_migration_spec'
+require 'shared/mysql_schema_dumper_spec'
+require 'shared/mysql_models_spec'
+require 'shared/common_model_actions_spec'
+require 'spatial_adapter/jdbcmysql'
+require 'db/jdbcmysql_raw'
+require 'models/common'
+
+describe ActiveRecord::ConnectionAdapters::MysqlAdapter do
+  it_should_behave_like 'common model actions'
+  it_should_behave_like 'a modified mysql adapter' do
+    let(:establish){ jdbcmysql_connection }
+  end
+  it_should_behave_like 'spatially enabled migrations' do
+    let(:establish){ jdbcmysql_connection }
+  end
+  it_should_behave_like 'spatially enabled schema dump' do
+    let(:establish){ jdbcmysql_connection }
+  end
+  it_should_behave_like 'spatially enabled models' do
+    let(:establish){ jdbcmysql_connection }
+  end
+end

data/spec/mysql2_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'shared/mysql_connection_adapter_spec'
+require 'shared/mysql_migration_spec'
+require 'shared/mysql_schema_dumper_spec'
+require 'shared/mysql_models_spec'
+require 'shared/common_model_actions_spec'
+require 'spatial_adapter/mysql2'
+require 'db/mysql2_raw'
+require 'models/common'
+
+describe ActiveRecord::ConnectionAdapters::Mysql2Adapter do
+  it_should_behave_like 'common model actions'
+  it_should_behave_like 'a modified mysql adapter' do
+    let(:establish){ mysql2_connection }
+    let(:column) do
+      ActiveRecord::ConnectionAdapters::Mysql2Column
+    end
+    let(:spatial_column) do
+      ActiveRecord::ConnectionAdapters::SpatialMysql2Column
+    end
+  end
+  it_should_behave_like 'spatially enabled migrations' do
+    let(:establish){ mysql2_connection }
+  end
+  it_should_behave_like 'spatially enabled schema dump' do
+    let(:establish){ mysql2_connection }
+  end
+  it_should_behave_like 'spatially enabled models' do
+    let(:establish){ mysql2_connection }
+  end
+end

data/spec/mysql_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'shared/mysql_connection_adapter_spec'
+require 'shared/mysql_migration_spec'
+require 'shared/mysql_schema_dumper_spec'
+require 'shared/mysql_models_spec'
+require 'shared/common_model_actions_spec'
+require 'spatial_adapter/mysql'
+require 'db/mysql_raw'
+require 'models/common'
+
+describe ActiveRecord::ConnectionAdapters::MysqlAdapter do
+  it_should_behave_like 'common model actions'
+  it_should_behave_like 'a modified mysql adapter'
+  it_should_behave_like 'spatially enabled migrations'
+  it_should_behave_like 'spatially enabled schema dump'
+  it_should_behave_like 'spatially enabled models'
+end

data/spec/postgresql/connection_adapter_spec.rb

@@ -8,66 +8,66 @@ describe "Modified PostgreSQLAdapter" do
     postgis_connection
     @connection = ActiveRecord::Base.connection
   end
-  
+
   describe '#postgis_version' do
     it 'should report a version number if PostGIS is installed' do
       @connection.should_receive(:select_value).with('SELECT postgis_full_version()').and_return('POSTGIS="1.5.0" GEOS="3.2.0-CAPI-1.6.0" PROJ="Rel. 4.7.1, 23 September 2009" LIBXML="2.7.6" USE_STATS')
       @connection.postgis_version.should_not be_nil
     end
-    
+
     it 'should report nil if PostGIS is not installed' do
       @connection.should_receive(:select_value).with('SELECT postgis_full_version()').and_raise(ActiveRecord::StatementInvalid)
       @connection.postgis_version.should be_nil
     end
   end
-  
+
   describe '#postgis_major_version' do
     it 'should be the first component of the version number' do
       @connection.stub!(:postgis_version).and_return('1.5.0')
       @connection.postgis_major_version.should == 1
     end
-    
+
     it 'should be nil if PostGIS is not installed' do
       @connection.stub!(:postgis_version).and_return(nil)
       @connection.postgis_major_version.should be_nil
     end
   end
-  
+
   describe '#postgis_minor_version' do
     it 'should be the second component of the version number' do
       @connection.stub!(:postgis_version).and_return('1.5.0')
       @connection.postgis_minor_version.should == 5
     end
-    
+
     it 'should be nil if PostGIS is not installed' do
       @connection.stub!(:postgis_version).and_return(nil)
       @connection.postgis_minor_version.should be_nil
     end
   end
-  
+
   describe '#spatial?' do
     it 'should be true if PostGIS is installed' do
       @connection.should_receive(:select_value).with('SELECT postgis_full_version()').and_return('POSTGIS="1.5.0" GEOS="3.2.0-CAPI-1.6.0" PROJ="Rel. 4.7.1, 23 September 2009" LIBXML="2.7.6" USE_STATS')
       @connection.should be_spatial
     end
-    
+
     it 'should be false if PostGIS is not installed' do
       @connection.should_receive(:select_value).with('SELECT postgis_full_version()').and_raise(ActiveRecord::StatementInvalid)
       @connection.should_not be_spatial
     end
   end
-  
+
   describe '#supports_geographic?' do
     it "should be true for PostGIS version 1.5.0" do
       @connection.stub!(:postgis_version).and_return('1.5.0')
       @connection.supports_geographic?.should == true
     end
-    
+
     it "should be true for PostGIS newer than 1.5.0" do
       @connection.stub!(:postgis_version).and_return('1.5.1')
       @connection.supports_geographic?.should == true
     end
-    
+
     it "should be true for PostGIS older than 1.5.0" do
       @connection.stub!(:postgis_version).and_return('1.4.0')
       @connection.supports_geographic?.should == false
@@ -82,24 +82,24 @@ describe "Modified PostgreSQLAdapter" do
         column.geometry_type.should == :point
         column.should_not be_geographic
       end
-      
+
       it "should be a geographic SpatialPostgreSQLColumn if column is a geography data type" do
         column = GeographyPointModel.columns.select{|c| c.name == 'geom'}.first
         column.should be_a(ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn)
         column.geometry_type.should == :point
         column.should be_geographic
       end
-      
+
       it "should be PostgreSQLColumn if column is not a spatial data type" do
         PointModel.columns.select{|c| c.name == 'extra'}.first.should be_a(ActiveRecord::ConnectionAdapters::PostgreSQLColumn)
       end
     end
-    
+
     describe "@geometry_type" do
       it "should be :point for geometry 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 geometry columns restricted to LINESTRING types" do
         LineStringModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :line_string
       end
@@ -115,23 +115,23 @@ describe "Modified PostgreSQLAdapter" do
       it "should be :multi_line_string for geometry 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 geometry 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 geometry 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 geometry columns not restricted to a type" do
         GeometryModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :geometry
       end
-      
+
       it "should be :point for geography columns restricted to POINT types" do
         GeographyPointModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :point
       end
-      
+
       it "should be :line_string for geography columns restricted to LINESTRING types" do
         GeographyLineStringModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :line_string
       end
@@ -147,51 +147,51 @@ describe "Modified PostgreSQLAdapter" do
       it "should be :multi_line_string for geography columns restricted to MULTILINESTRING types" do
         GeographyMultiLineStringModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :multi_line_string
       end
-      
+
       it "should be :multi_polygon for geography columns restricted to MULTIPOLYGON types" do
         GeographyMultiPolygonModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :multi_polygon
       end
-      
+
       it "should be :geometry_collection for geography columns restricted to GEOMETRYCOLLECTION types" do
         GeographyGeometryCollectionModel.columns.select{|c| c.name == 'geom'}.first.geometry_type.should == :geometry_collection
       end
-      
+
       it "should be :geometry for geography columns not restricted to a type" do
         GeographyModel.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 GiST index on a geometry column" do
       @indexes.select{|i| i.name == 'index_point_models_on_geom'}.first.spatial.should == true
     end
-    
+
     it "should be marked as spatial if a GiST index on a geography column" do
       @indexes = @connection.indexes('geography_point_models')
       @indexes.select{|i| i.name == 'index_geography_point_models_on_geom'}.first.spatial.should == true
     end
-    
+
     it "should not be marked as spatial if not a GiST index" do
       @indexes.select{|i| i.name == 'index_point_models_on_extra'}.first.spatial.should == false
     end
-    
+
     it "should not be marked as spatial if a GiST index on a non-geometry column" do
       @connection.execute(<<-SQL)
         create table non_spatial_models
@@ -206,22 +206,17 @@ describe "Modified PostgreSQLAdapter" do
       @indexes.select{|i| i.name == 'index_non_spatial_models_on_location'}.first.spatial.should == false
       @connection.execute 'drop table non_spatial_models'
     end
-  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(/using gist/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(/using gist/i)
       @connection.add_index('geometry_models', 'extra')
     end
   end
-end
+end