spatial_adapter 1.2.0 → 1.3.0

data/spec/postgresql/migration_spec.rb

@@ -9,12 +9,12 @@ describe "Spatially-enabled Migrations" do
     postgis_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
@@ -23,7 +23,7 @@ describe "Spatially-enabled Migrations" do
             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.type.should == :string
@@ -33,7 +33,7 @@ describe "Spatially-enabled Migrations" do
         geom_column.with_m.should == false
         geom_column.srid.should == -1
       end
-      
+
       it "should create #{type.to_s} geographic columns" do
         ActiveRecord::Schema.define do
           create_table :migrated_geometry_models, :force => true do |t|
@@ -41,9 +41,9 @@ describe "Spatially-enabled Migrations" do
             t.column :geom, type, :geographic => true
           end
         end
-      
+
         geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
-        
+
         geom_column.should be_a(SpatialAdapter::SpatialColumn)
         geom_column.type.should == :string
         geom_column.geometry_type.should == type
@@ -53,8 +53,8 @@ describe "Spatially-enabled Migrations" do
         #geom_column.srid.should == 4326 # SRID is currently irrelevant for geography columns
       end
     end
-    
-  
+
+
     it "should create 3d (xyz) geometry columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -62,15 +62,15 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_z => true
         end
       end
-      
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.with_z.should == true
       geom_column.with_m.should == false
       geom_column.srid.should == -1
     end
-    
-    
+
+
     it "should create 3d (xym) geometry columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -78,7 +78,7 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_m => true
         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 == :point
@@ -87,8 +87,8 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_m.should == true
       geom_column.srid.should == -1
     end
-    
-    
+
+
     it "should create 4d (xyzm) geometry columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -96,7 +96,7 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_z => true, :with_m => true
         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 == :point
@@ -105,7 +105,7 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_m.should == true
       geom_column.srid.should == -1
     end
-    
+
     it "should create 3d (xyz) geographic columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -113,15 +113,15 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_z => true, :geographic => true
         end
       end
-      
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.should be_geographic
       geom_column.with_z.should == true
       geom_column.with_m.should == false
     end
-    
-    
+
+
     it "should create 3d (xym) geographic columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -129,7 +129,7 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_m => true, :geographic => true
         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 == :point
@@ -138,8 +138,8 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_z.should == false
       geom_column.with_m.should == true
     end
-    
-    
+
+
     it "should create 4d (xyzm) geographic columns" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -147,7 +147,7 @@ describe "Spatially-enabled Migrations" do
           t.point   :geom, :with_z => true, :with_m => true, :geographic => true
         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 == :point
@@ -156,8 +156,8 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_z.should == true
       geom_column.with_m.should == true
     end
-    
-    
+
+
     it "should create geometry columns with specified SRID" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -165,7 +165,7 @@ describe "Spatially-enabled Migrations" do
           t.geometry :geom, :srid => 4326
         end
       end
-    
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -184,17 +184,17 @@ describe "Spatially-enabled Migrations" do
         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.type.should == :string
@@ -204,12 +204,12 @@ describe "Spatially-enabled Migrations" do
         geom_column.srid.should == -1
       end
     end
-  
+
     it "should add 3d (xyz) geometry columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_z => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -218,13 +218,13 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_m.should == false
       geom_column.srid.should == -1
     end
-  
-  
+
+
     it "should add 3d (xym) geometry columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_m => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -233,13 +233,13 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_m.should == true
       geom_column.srid.should == -1
     end
-  
-  
+
+
     it "should add 4d (xyzm) geometry columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_z => true, :with_m => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -248,12 +248,12 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_m.should == true
       geom_column.srid.should == -1
     end
-  
+
     it "should add 3d (xyz) geography columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_z => true, :geographic => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -262,13 +262,13 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_z.should == true
       geom_column.with_m.should == false
     end
-  
-  
+
+
     it "should add 3d (xym) geography columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_m => true, :geographic => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -277,13 +277,13 @@ describe "Spatially-enabled Migrations" do
       geom_column.with_z.should == false
       geom_column.with_m.should == true
     end
-  
-  
+
+
     it "should add 4d (xyzm) geography columns" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :point, :with_z => true, :with_m => true, :geographic => true
       end
-  
+
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.type.should == :string
@@ -297,7 +297,7 @@ describe "Spatially-enabled Migrations" do
       ActiveRecord::Schema.define do
         add_column :migrated_geometry_models, :geom, :geometry, :srid => 4326
       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 == :geometry
@@ -307,12 +307,12 @@ describe "Spatially-enabled Migrations" do
       geom_column.srid.should == 4326
     end
   end
-  
+
   describe "removing columns" do
     after :each do
       @connection.drop_table "migrated_geometry_models"
     end
-  
+
     SpatialAdapter.geometry_data_types.keys.each do |type|
       it "should remove #{type.to_s} columns using DropGeometryColumn" do
         ActiveRecord::Schema.define do
@@ -321,7 +321,7 @@ describe "Spatially-enabled Migrations" do
             t.send(type, :geom)
           end
         end
-  
+
         @connection.should_receive(:execute).with(/DropGeometryColumn(.*migrated_geometry_models.*geom)/)
         ActiveRecord::Schema.define do
           remove_column :migrated_geometry_models, :geom
@@ -346,7 +346,7 @@ describe "Spatially-enabled Migrations" do
         @connection.should_receive(:execute).with(anything())
       end
     end
-    
+
     it "should still remove non-spatial columns using ALTER TABLE DROP COLUMN" do
       ActiveRecord::Schema.define do
         create_table :migrated_geometry_models, :force => true do |t|
@@ -362,4 +362,4 @@ describe "Spatially-enabled Migrations" do
       @connection.should_receive(:execute).with(anything())
     end
   end
-end
+end

data/spec/postgresql/models_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'shared_examples'
+require 'shared/common_model_actions_spec'
 require 'spatial_adapter/postgresql'
 require 'db/postgis_raw'
 require 'models/common'
@@ -9,68 +9,70 @@ describe "Spatially-enabled Models" do
     postgis_connection
     @connection = ActiveRecord::Base.connection
   end
-  
+
+  it_should_behave_like 'common model actions'
+
   describe "inserting records" do
     it 'should save Point objects' do
       model = PointModel.new(:extra => 'test', :geom => GeometryFactory.point)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save LineString objects' do
       model = LineStringModel.new(:extra => 'test', :geom => GeometryFactory.line_string)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.line_string.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save Polygon objects' do
       model = PolygonModel.new(:extra => 'test', :geom => GeometryFactory.polygon)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.polygon.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiPoint objects' do
       model = MultiPointModel.new(:extra => 'test', :geom => GeometryFactory.multi_point)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiLineString objects' do
       model = MultiLineStringModel.new(:extra => 'test', :geom => GeometryFactory.multi_line_string)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_line_string.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiPolygon objects' do
       model = MultiPolygonModel.new(:extra => 'test', :geom => GeometryFactory.multi_polygon)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_polygon.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save GeometryCollection objects' do
       model = GeometryCollectionModel.new(:extra => 'test', :geom => GeometryFactory.geometry_collection)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.geometry_collection.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save Geometry objects' do
       model = GeometryModel.new(:extra => 'test', :geom => GeometryFactory.point)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 3D Point (with Z coord) objects' do
       model = PointzModel.new(:extra => 'test', :geom => GeometryFactory.pointz)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.pointz.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 3D Point (with M coord) objects' do
       model = PointmModel.new(:extra => 'test', :geom => GeometryFactory.pointm)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.pointm.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 4D Point objects' do
       model = Point4Model.new(:extra => 'test', :geom => GeometryFactory.point4)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point4.as_hex_ewkb))
@@ -82,61 +84,61 @@ describe "Spatially-enabled Models" do
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save LineString geography objects' do
       model = GeographyLineStringModel.new(:extra => 'test', :geom => GeometryFactory.line_string)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.line_string.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save Polygon geography objects' do
       model = GeographyPolygonModel.new(:extra => 'test', :geom => GeometryFactory.polygon)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.polygon.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiPoint geography objects' do
       model = GeographyMultiPointModel.new(:extra => 'test', :geom => GeometryFactory.multi_point)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiLineString geography objects' do
       model = GeographyMultiLineStringModel.new(:extra => 'test', :geom => GeometryFactory.multi_line_string)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_line_string.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save MultiPolygon geography objects' do
       model = GeographyMultiPolygonModel.new(:extra => 'test', :geom => GeometryFactory.multi_polygon)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.multi_polygon.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save GeometryCollection geography objects' do
       model = GeographyGeometryCollectionModel.new(:extra => 'test', :geom => GeometryFactory.geometry_collection)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.geometry_collection.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save Geography objects' do
       model = GeographyModel.new(:extra => 'test', :geom => GeometryFactory.point)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 3D Point (with Z coord) geography objects' do
       model = GeographyPointzModel.new(:extra => 'test', :geom => GeometryFactory.pointz)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.pointz.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 3D Point (with M coord) geography objects' do
       model = GeographyPointmModel.new(:extra => 'test', :geom => GeometryFactory.pointm)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.pointm.as_hex_ewkb))
       model.save.should == true
     end
-  
+
     it 'should save 4D Point geography objects' do
       model = GeographyPoint4Model.new(:extra => 'test', :geom => GeometryFactory.point4)
       @connection.should_receive(:select_value).with(Regexp.new(GeometryFactory.point4.as_hex_ewkb))
@@ -144,19 +146,17 @@ describe "Spatially-enabled Models" do
     end
   end
 
-  include CommonModelActions
-  
-  describe "finding records" do    
+  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
     end
-  
+
     it 'should retrieve 3D Point (with M coord) objects' do
       model = GeographyPointmModel.create(:extra => 'test', :geom => GeometryFactory.pointm)
       GeographyPointmModel.find(model.id).geom.should == GeometryFactory.pointm
     end
-  
+
     it 'should retrieve 4D Point objects' do
       model = GeographyPoint4Model.create(:extra => 'test', :geom => GeometryFactory.point4)
       GeographyPoint4Model.find(model.id).geom.should == GeometryFactory.point4
@@ -166,52 +166,52 @@ describe "Spatially-enabled Models" do
       model = GeographyPointModel.create(:extra => 'test', :geom => GeometryFactory.point)
       GeographyPointModel.find(model.id).geom.should == GeometryFactory.point
     end
-  
+
     it 'should retrieve LineString geography objects' do
       model = GeographyLineStringModel.create(:extra => 'test', :geom => GeometryFactory.line_string)
       GeographyLineStringModel.find(model.id).geom.should == GeometryFactory.line_string
     end
-  
+
     it 'should retrieve Polygon geography objects' do
       model = GeographyPolygonModel.create(:extra => 'test', :geom => GeometryFactory.polygon)
       GeographyPolygonModel.find(model.id).geom.should == GeometryFactory.polygon
     end
-  
+
     it 'should retrieve MultiPoint geography objects' do
       model = GeographyMultiPointModel.create(:extra => 'test', :geom => GeometryFactory.multi_point)
       GeographyMultiPointModel.find(model.id).geom.should == GeometryFactory.multi_point
     end
-  
+
     it 'should retrieve MultiLineString geography objects' do
       model = GeographyMultiLineStringModel.create(:extra => 'test', :geom => GeometryFactory.multi_line_string)
       GeographyMultiLineStringModel.find(model.id).geom.should == GeometryFactory.multi_line_string
     end
-  
+
     it 'should retrieve MultiPolygon geography objects' do
       model = GeographyMultiPolygonModel.create(:extra => 'test', :geom => GeometryFactory.multi_polygon)
       GeographyMultiPolygonModel.find(model.id).geom.should == GeometryFactory.multi_polygon
     end
-  
+
     it 'should retrieve GeometryCollection geography objects' do
       model = GeographyGeometryCollectionModel.create(:extra => 'test', :geom => GeometryFactory.geometry_collection)
       GeographyGeometryCollectionModel.find(model.id).geom.should == GeometryFactory.geometry_collection
     end
-  
+
     it 'should retrieve Geometry geography objects' do
       model = GeographyModel.create(:extra => 'test', :geom => GeometryFactory.point)
       GeographyModel.find(model.id).geom.should == GeometryFactory.point
     end
-  
+
     it 'should retrieve 3D Point (with Z coord) geography objects' do
       model = GeographyPointzModel.create(:extra => 'test', :geom => GeometryFactory.pointz)
       GeographyPointzModel.find(model.id).geom.should == GeometryFactory.pointz
     end
-  
+
     it 'should retrieve 3D Point (with M coord) geography objects' do
       model = GeographyPointmModel.create(:extra => 'test', :geom => GeometryFactory.pointm)
       GeographyPointmModel.find(model.id).geom.should == GeometryFactory.pointm
     end
-  
+
     it 'should retrieve 4D Point geography objects' do
       model = GeographyPoint4Model.create(:extra => 'test', :geom => GeometryFactory.point4)
       GeographyPoint4Model.find(model.id).geom.should == GeometryFactory.point4

data/spec/postgresql/schema_dumper_spec.rb

@@ -20,18 +20,18 @@ describe "Spatially-enabled Schema Dumps" do
       end
     end
 
-    File.open('schema.rb', "w") do |file|
+    File.open('schema.rb', "w:UTF-8") do |file|
       ActiveRecord::SchemaDumper.dump(@connection, file)
     end
-    
+
     # Drop the original tables
     @connection.drop_table "migrated_geometry_models"
     @connection.drop_table "migrated_geography_models"
-    
+
     # Load the dumped schema
     load('schema.rb')
   end
-  
+
   after :all do
     # delete the schema file
     File.delete('schema.rb')
@@ -40,10 +40,10 @@ describe "Spatially-enabled Schema Dumps" do
     @connection.drop_table "migrated_geometry_models"
     @connection.drop_table "migrated_geography_models"
   end
-  
+
   it "should preserve spatial attributes of geometry 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)
@@ -53,10 +53,10 @@ describe "Spatially-enabled Schema Dumps" do
     geom_column.with_m.should == true
     geom_column.srid.should == 4326
   end
-  
+
   it "should preserve spatial attributes of geography tables" do
     columns = @connection.columns("migrated_geography_models")
-    
+
     columns.should have(3).items
     geom_column = columns.select{|c| c.name == 'geom'}.first
     geom_column.should be_a(SpatialAdapter::SpatialColumn)
@@ -66,14 +66,14 @@ describe "Spatially-enabled Schema Dumps" do
     geom_column.with_m.should == true
     geom_column.should be_geographic
   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
+end

data/spec/postgresql_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+require 'postgresql/connection_adapter_spec'
+require 'postgresql/migration_spec'
+require 'postgresql/models_spec'
+require 'postgresql/schema_dumper_spec'

data/spec/{shared_examples.rb → shared/common_model_actions_spec.rb}

@@ -1,5 +1,5 @@
-share_as :CommonModelActions do
-  describe 'finding records' do
+shared_examples_for 'common model actions' do
+  context '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