spatial_adapter 1.2.0 → 1.3.0

metadata

@@ -1,144 +1,191 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spatial_adapter
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  version: 1.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Pete Deffendol
 - Guilhem Vellut
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-08 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
+date: 2011-10-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70168907686900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70168907686900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70168907686360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70168907686360
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &70168907685840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70168907685840
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &70168907685200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70168907685200
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &70168907684660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 0.2.13
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70168907684660
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70168907684080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: GeoRuby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70168907684080
+- !ruby/object:Gem::Dependency
+  name: GeoRuby
+  requirement: &70168907683140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id002
-description: Provides enhancements to ActiveRecord to handle spatial datatypes in PostgreSQL and MySQL.
+  prerelease: false
+  version_requirements: *70168907683140
+description: ! "Provides enhancements to ActiveRecord to handle spatial\n    datatypes
+  in PostgreSQL and MySQL."
 email: pete@fragility.us
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+- MIT-LICENSE
+files:
+- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
-- VERSION
+- Rakefile
+- init.rb
 - lib/spatial_adapter.rb
+- lib/spatial_adapter/base/mysql.rb
+- lib/spatial_adapter/base/mysql/adapter.rb
+- lib/spatial_adapter/base/mysql/spatial_column.rb
+- lib/spatial_adapter/common.rb
 - lib/spatial_adapter/common/raw_geom_info.rb
 - lib/spatial_adapter/common/schema_definitions.rb
 - lib/spatial_adapter/common/schema_dumper.rb
 - lib/spatial_adapter/common/spatial_column.rb
 - lib/spatial_adapter/common/table_definition.rb
+- lib/spatial_adapter/jdbcmysql.rb
 - lib/spatial_adapter/mysql.rb
 - lib/spatial_adapter/mysql2.rb
 - lib/spatial_adapter/postgresql.rb
 - lib/spatial_adapter/railtie.rb
+- lib/spatial_adapter/version.rb
 - rails/init.rb
-- spec/README.txt
+- spatial_adapter.gemspec
+- spec/db/jdbcmysql_raw.rb
 - spec/db/mysql2_raw.rb
 - spec/db/mysql_raw.rb
 - spec/db/postgis_raw.rb
+- spec/jdbcmysql_spec.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/mysql2_spec.rb
+- spec/mysql_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/postgresql_spec.rb
+- spec/shared/common_model_actions_spec.rb
+- spec/shared/mysql_connection_adapter_spec.rb
+- spec/shared/mysql_migration_spec.rb
+- spec/shared/mysql_models_spec.rb
+- spec/shared/mysql_schema_dumper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/fragility/spatial_adapter
 licenses: []
-
 post_install_message: 
-rdoc_options: []
-
-require_paths: 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Spatial Adapter for ActiveRecord
-test_files: 
-- spec/README.txt
+summary: spatial_adapter-1.3.0
+test_files:
+- spec/db/jdbcmysql_raw.rb
 - spec/db/mysql2_raw.rb
 - spec/db/mysql_raw.rb
 - spec/db/postgis_raw.rb
+- spec/jdbcmysql_spec.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/mysql2_spec.rb
+- spec/mysql_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/postgresql_spec.rb
+- spec/shared/common_model_actions_spec.rb
+- spec/shared/mysql_connection_adapter_spec.rb
+- spec/shared/mysql_migration_spec.rb
+- spec/shared/mysql_models_spec.rb
+- spec/shared/mysql_schema_dumper_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-1.2.0

data/spec/README.txt

@@ -1,22 +0,0 @@
-= Running Tests
-
-You will need to set up empty databases for each adapter you want to test.
-
-== PostgreSQL
-
-Create an empty database "spatial_adapter" and ensure that the PostGIS extensions are loaded.  
-
-run "rake spec:postgresql" to run the specs
-
-== MySQL
-
-Create an empty database "spatial_adapter" - the spatial extensions are already available.
-
-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/mysql/connection_adapter_spec.rb

@@ -1,106 +0,0 @@
-require 'spec_helper'
-require 'spatial_adapter/mysql'
-require 'db/mysql_raw'
-require 'models/common'
-
-describe "Modified MysqlAdapter" do
-  before :each do
-    mysql_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 SpatialMysqlColumn if column is a spatial data type" do
-        PointModel.columns.select{|c| c.name == 'geom'}.first.should be_a(ActiveRecord::ConnectionAdapters::SpatialMysqlColumn)
-      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(ActiveRecord::ConnectionAdapters::MysqlColumn)
-      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/mysql/models_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-require 'shared_examples'
-require 'spatial_adapter/mysql'
-require 'db/mysql_raw'
-require 'models/common'
-
-describe "Spatially-enabled Models" do
-  before :each do
-    mysql_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/connection_adapter_spec.rb

@@ -1,106 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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