spatial_adapter 1.0.0 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/spatial_adapter/common/spatial_column.rb

@@ -10,6 +10,10 @@ module SpatialAdapter
       @with_m = with_m
     end
   
+    def spatial?
+      !@geometry_type.nil?
+    end
+    
     def geographic?
       false
     end
@@ -18,10 +22,7 @@ module SpatialAdapter
     # alias_method :type_cast_without_spatial, :type_cast
     def type_cast(value)
       return nil if value.nil?
-      case type
-      when :geometry then self.class.string_to_geometry(value)
-      else super
-      end
+      spatial? ? self.class.string_to_geometry(value) : super
     end
 
     #Redefines type_cast_code to add support for geometries. 
@@ -29,28 +30,25 @@ module SpatialAdapter
     #WARNING : Since ActiveRecord keeps only the string values directly returned from the database, it translates from these to the correct types everytime an attribute is read (using the code returned by this method), which is probably ok for simple types, but might be less than efficient for geometries. Also you cannot modify the geometry object returned directly or your change will not be saved. 
     # alias_method :type_cast_code_without_spatial, :type_cast_code
     def type_cast_code(var_name)
-      case type
-      when :geometry then "#{self.class.name}.string_to_geometry(#{var_name})"
-      else super
-      end
+      spatial? ? "#{self.class.name}.string_to_geometry(#{var_name})" : super
     end
 
 
     #Redefines klass to add support for geometries
     # alias_method :klass_without_spatial, :klass
     def klass
-      case type
-      when :geometry then GeoRuby::SimpleFeatures::Geometry
-      else super
-      end
+      spatial? ? GeoRuby::SimpleFeatures::Geometry : super
     end
 
     private
 
-    #Redefines the simplified_type method to spatial columns
+    # Maps additional data types to base Rails/Arel types
+    #
+    # For Rails 3, only the types defined by Arel can be used.  We'll
+    # use :string since the database returns the columns as hex strings.
     def simplified_type(field_type)
       case field_type
-      when /geography|geometry|point|linestring|polygon|multipoint|multilinestring|multipolygon|geometrycollection/i then :geometry
+      when /geography|geometry|point|linestring|polygon|multipoint|multilinestring|multipolygon|geometrycollection/i then :string
       else super
       end
     end

data/lib/spatial_adapter/postgresql.rb

@@ -99,7 +99,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     columns(table_name).each do |col|
       if column_names.include?(col.name.to_sym)
         # Geometry columns have to be removed using DropGeometryColumn
-        if col.type == :geometry && !col.geographic?
+        if col.spatial? && !col.geographic?
           execute "SELECT DropGeometryColumn('#{table_name}','#{col.name}')"
         else
           original_remove_column(table_name, col.name)

data/spec/mysql/migration_spec.rb

@@ -27,7 +27,7 @@ describe "Spatially-enabled Migrations" do
         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 == :geometry
+        geom_column.type.should == :string
       end
     end
   end
@@ -54,7 +54,7 @@ describe "Spatially-enabled Migrations" do
         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 == :geometry
+        geom_column.type.should == :string
         geom_column.with_z.should == false
         geom_column.with_m.should == false
         geom_column.srid.should == -1

data/spec/mysql/schema_dumper_spec.rb

@@ -41,7 +41,7 @@ describe "Spatially-enabled Schema Dumps" do
     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 == :geometry
+    geom_column.type.should == :string
   end
   
   it "should preserve spatial indexes" do

data/spec/postgresql/connection_adapter_spec.rb

@@ -80,7 +80,6 @@ describe "Modified PostgreSQLAdapter" do
       it "should be a regular SpatialPostgreSQLColumn if column is a geometry data type" do
         column = PointModel.columns.select{|c| c.name == 'geom'}.first
         column.should be_a(ActiveRecord::ConnectionAdapters::SpatialPostgreSQLColumn)
-        column.type.should == :geometry
         column.geometry_type.should == :point
         column.should_not be_geographic
       end
@@ -88,7 +87,6 @@ describe "Modified PostgreSQLAdapter" do
       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.type.should == :geometry
         column.geometry_type.should == :point
         column.should be_geographic
       end

data/spec/postgresql/migration_spec.rb

@@ -26,7 +26,7 @@ describe "Spatially-enabled Migrations" do
       
         geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
         geom_column.should be_a(SpatialAdapter::SpatialColumn)
-        geom_column.type.should == :geometry
+        geom_column.type.should == :string
         geom_column.geometry_type.should == type
         geom_column.should_not be_geographic
         geom_column.with_z.should == false
@@ -45,7 +45,7 @@ describe "Spatially-enabled Migrations" do
         geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
         
         geom_column.should be_a(SpatialAdapter::SpatialColumn)
-        geom_column.type.should == :geometry
+        geom_column.type.should == :string
         geom_column.geometry_type.should == type
         geom_column.should be_geographic
         geom_column.with_z.should == false
@@ -82,7 +82,7 @@ describe "Spatially-enabled Migrations" do
       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
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.with_z.should == false
       geom_column.with_m.should == true
       geom_column.srid.should == -1
@@ -100,7 +100,7 @@ describe "Spatially-enabled Migrations" do
       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
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.with_z.should == true
       geom_column.with_m.should == true
       geom_column.srid.should == -1
@@ -133,7 +133,7 @@ describe "Spatially-enabled Migrations" do
       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
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.should be_geographic
       geom_column.with_z.should == false
       geom_column.with_m.should == true
@@ -152,7 +152,7 @@ describe "Spatially-enabled Migrations" do
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
       geom_column.geometry_type.should == :point
       geom_column.should be_geographic
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.with_z.should == true
       geom_column.with_m.should == true
     end
@@ -168,7 +168,7 @@ describe "Spatially-enabled Migrations" do
     
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.geometry_type.should == :geometry
       geom_column.with_z.should == false
       geom_column.with_m.should == false
@@ -197,7 +197,7 @@ describe "Spatially-enabled Migrations" do
   
         geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
         geom_column.should be_a(SpatialAdapter::SpatialColumn)
-        geom_column.type.should == :geometry
+        geom_column.type.should == :string
         geom_column.geometry_type.should == type
         geom_column.with_z.should == false
         geom_column.with_m.should == false
@@ -212,7 +212,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == true
       geom_column.with_m.should == false
@@ -227,7 +227,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == false
       geom_column.with_m.should == true
@@ -242,7 +242,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == true
       geom_column.with_m.should == true
@@ -256,7 +256,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.should be_geographic
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == true
@@ -271,7 +271,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.should be_geographic
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == false
@@ -286,7 +286,7 @@ describe "Spatially-enabled Migrations" do
   
       geom_column = @connection.columns(:migrated_geometry_models).select{|c| c.name == 'geom'}.first
       geom_column.should be_a(SpatialAdapter::SpatialColumn)
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.should be_geographic
       geom_column.geometry_type.should == :point
       geom_column.with_z.should == true
@@ -301,7 +301,7 @@ describe "Spatially-enabled Migrations" do
       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
-      geom_column.type.should == :geometry
+      geom_column.type.should == :string
       geom_column.with_z.should == false
       geom_column.with_m.should == false
       geom_column.srid.should == 4326

data/spec/postgresql/schema_dumper_spec.rb

@@ -48,7 +48,7 @@ describe "Spatially-enabled Schema Dumps" do
     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 == :geometry
+    geom_column.type.should == :string
     geom_column.with_z.should == true
     geom_column.with_m.should == true
     geom_column.srid.should == 4326
@@ -61,7 +61,7 @@ describe "Spatially-enabled Schema Dumps" do
     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 == :geometry
+    geom_column.type.should == :string
     geom_column.with_z.should == true
     geom_column.with_m.should == true
     geom_column.should be_geographic

data/spec/spec_helper.rb

@@ -2,14 +2,13 @@ require 'rubygems'
 require 'spec'
 require 'geo_ruby'
 gem 'activerecord', '=2.3.5'
+#gem 'activerecord', '=3.0.0.beta3'
 require 'active_record'
 
 $:.unshift((File.join(File.dirname(__FILE__), '..', 'lib')))
 
 include GeoRuby::SimpleFeatures
 
-# Don't output migration logging
-ActiveRecord::Migration.verbose = false
 
 def postgis_connection
   ActiveRecord::Base.establish_connection(
@@ -18,6 +17,9 @@ def postgis_connection
   )
   # Turn off those annoying NOTICE messages
   ActiveRecord::Base.connection.execute 'set client_min_messages = warning'
+
+  # Don't output migration logging
+  ActiveRecord::Migration.verbose = false
 end
 
 def mysql_connection
@@ -27,6 +29,9 @@ def mysql_connection
     :username => 'root',
     :host => 'localhost'
   )
+  
+  # Don't output migration logging
+  ActiveRecord::Migration.verbose = false
 end
 
 class GeometryFactory

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Pete Deffendol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -06:00
+date: 2010-04-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency