spatial_adapter 1.2.0 → 1.3.0

data/spec/shared/mysql_connection_adapter_spec.rb

@@ -0,0 +1,110 @@
+shared_examples_for 'a modified mysql adapter' do
+  let(:establish){ mysql_connection }
+  let(:column){ ActiveRecord::ConnectionAdapters::MysqlColumn }
+  let(:spatial_column){ ActiveRecord::ConnectionAdapters::SpatialMysqlColumn }
+
+  let(:connection) do
+    establish
+    ActiveRecord::Base.connection
+  end
+
+  context '#supports_geographic?' do
+    it "should be false" do
+      connection.supports_geographic?.should == false
+    end
+  end
+
+  context "#columns" do
+    context "type" do
+      it "should be SpatialMysqlColumn if column is a spatial data type" do
+        PointModel.columns.select{|c| c.name == 'geom'} \
+         .first.should be_a(spatial_column)
+      end
+
+      it "should be SpatialMysqlColumn if column is not a spatial data type" do
+        PointModel.columns.select{|c| c.name == 'extra'} \
+          .first.should be_a(column)
+      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
+
+  context "#indexes" do
+    let(:indexes){ connection.indexes('point_models') }
+
+    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
+
+  context "#add_index" do
+    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/{mysql/migration_spec.rb → shared/mysql_migration_spec.rb}

@@ -1,20 +1,19 @@
-require 'spec_helper'
-require 'spatial_adapter/mysql'
-
 class MigratedGeometryModel < ActiveRecord::Base
 end
 
-describe "Spatially-enabled Migrations" do
-  before :each do
-    mysql_connection
-    @connection = ActiveRecord::Base.connection
+shared_examples_for 'spatially enabled migrations' do
+  let(:establish){ mysql_connection }
+
+  let(:connection) do
+    establish
+    ActiveRecord::Base.connection
   end
-  
-  describe "creating tables" do
+
+  context "creating tables" do
     after :each do
-      @connection.drop_table "migrated_geometry_models"
+      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
@@ -24,7 +23,8 @@ describe "Spatially-enabled Migrations" do
           end
         end
 
-        geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
+        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
@@ -32,7 +32,7 @@ describe "Spatially-enabled Migrations" do
     end
   end
 
-  describe "adding columns" do
+  context "adding columns" do
     before :each do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -40,9 +40,9 @@ describe "Spatially-enabled Migrations" do
         end
       end
     end
-    
+
     after :each do
-      @connection.drop_table "migrated_geometry_models"
+      connection.drop_table "migrated_geometry_models"
     end
 
     SpatialAdapter.geometry_data_types.keys.each do |type|
@@ -51,7 +51,7 @@ describe "Spatially-enabled Migrations" do
           add_column :migrated_geometry_models, :geom, type
         end
 
-        geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
+        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
@@ -61,4 +61,4 @@ describe "Spatially-enabled Migrations" do
       end
     end
   end
-end
+end

data/spec/shared/mysql_models_spec.rb

@@ -0,0 +1,58 @@
+shared_examples_for 'spatially enabled models' do
+  let(:establish){ mysql_connection }
+
+  let(:connection) do
+    establish
+    ActiveRecord::Base.connection
+  end
+
+  context "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
+end

data/spec/{mysql/schema_dumper_spec.rb → shared/mysql_schema_dumper_spec.rb}

@@ -1,56 +1,53 @@
-require 'spec_helper'
-require 'spatial_adapter/mysql'
+shared_examples_for 'spatially enabled schema dump' do
+  let(:establish){ mysql_connection }
 
-describe "Spatially-enabled Schema Dumps" do
-  before :all do
-    mysql_connection
-    @connection = ActiveRecord::Base.connection
+  let(:connection) do
+    establish
+    ActiveRecord::Base.connection
+  end
 
-    # Create a new table
+  before :all do
     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'
+      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)
+    File.open('schema.rb', "w:UTF-8") do |file|
+      ActiveRecord::SchemaDumper.dump(connection, file)
     end
-    
-    # Drop the original table
-    @connection.drop_table "migrated_geometry_models"
-    
-    # Load the dumped schema
+
+    connection.drop_table "migrated_geometry_models"
+
     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"
+    connection.drop_table "migrated_geometry_models"
   end
-  
+
   it "should preserve spatial attributes of tables" do
-    columns = @connection.columns("migrated_geometry_models")
-    
+    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 = 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
+end

data/spec/spec_helper.rb

@@ -1,13 +1,5 @@
-require 'rubygems'
-require 'spec'
-require 'geo_ruby'
-gem 'activerecord', '=3.0.3'
-require 'active_record'
-
-$:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
-
-include GeoRuby::SimpleFeatures
-
+require 'bundler'
+Bundler.require(:default)
 
 def postgis_connection
   ActiveRecord::Base.establish_connection(
@@ -28,7 +20,7 @@ def mysql_connection
     :username => 'root',
     :host => 'localhost'
   )
-  
+
   # Don't output migration logging
   ActiveRecord::Migration.verbose = false
 end
@@ -40,7 +32,19 @@ def mysql2_connection
     :username => 'root',
     :host => 'localhost'
   )
-  
+
+  # Don't output migration logging
+  ActiveRecord::Migration.verbose = false
+end
+
+def jdbcmysql_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => 'jdbcmysql',
+    :database => 'spatial_adapter',
+    :username => 'root',
+    :host => 'localhost'
+  )
+
   # Don't output migration logging
   ActiveRecord::Migration.verbose = false
 end
@@ -50,39 +54,39 @@ class GeometryFactory
     def point
       Point.from_x_y(1, 2, 4326)
     end
-    
+
     def line_string
       LineString.from_coordinates([[1.4,2.5],[1.5,6.7]], 4326)
     end
-    
+
     def 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]]], 4326)
     end
-    
+
     def multi_point
       MultiPoint.from_coordinates([[12.4,-23.3],[-65.1,23.4],[23.55555555,23]], 4326)
     end
-    
+
     def multi_line_string
       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,23.3]])], 4326)
     end
-    
+
     def multi_polygon
       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]]])], 4326)
     end
-    
+
     def geometry_collection
       GeometryCollection.from_geometries([Point.from_x_y(4.67,45.4),LineString.from_coordinates([[5.7,12.45],[67.55,54]])], 4326)
     end
-    
+
     def pointz
       Point.from_x_y_z(1, 2, 3, 4326)
     end
-    
+
     def pointm
       Point.from_x_y_m(1, 2, 3, 4326)
     end
-      
+
     def point4
       Point.from_x_y_z_m(1, 2, 3, 4, 4326)
     end