Merge branch 'develop'

README.rdoc

@@ -33,7 +33,7 @@ The schema comment looks like this:
      . . .
 
 It also annotates geometrical columns, geom type and srid, when using
-`SpatialAdapter` or `PostgisAdapter`:
+`SpatialAdapter`, `PostgisAdapter` or `PostGISAdapter`:
 
    # == Schema Info
    #
@@ -119,15 +119,6 @@ anywhere in the file:
 
     # -*- SkipSchemaAnnotations
 
-To generate a configuration file (in the form of a `.rake` file), to set
-default options:
-
-    rails g annotate:install
-
-Edit this file to control things like output format, where annotations are
-added (top or bottom of file), and in which artifacts.
-
-
 === Configuration in Rails
 
 To generate a configuration file (in the form of a `.rake` file), to set
@@ -137,6 +128,7 @@ default options:
 
 Edit this file to control things like output format, where annotations are
 added (top or bottom of file), and in which artifacts.
+
 == Rails Integration
 
 By default, once you've generated a configuration file, annotate will be
@@ -148,7 +140,7 @@ change:
 
 To:
 
-    'skip_on_db_migrate'   => "try",
+    'skip_on_db_migrate'   => "true",
 
 If you want to run `rake db:migrate` as a one-off without running annotate,
 you can do so with a simple environment variable, instead of editing the
@@ -237,6 +229,7 @@ extra carefully, and consider using one.
 - Fabrication: http://github.com/paulelliott/fabrication
 - SpatialAdapter: http://github.com/pdeffendol/spatial_adapter
 - PostgisAdapter: http://github.com/nofxx/postgis_adapter
+- PostGISAdapter: https://github.com/dazuma/activerecord-postgis-adapter
 
 
 == License
@@ -251,3 +244,4 @@ Released under the same license as Ruby. No Support. No Warranty.
 == Authors
 
 {See AUTHORS.rdoc}[link:AUTHORS.rdoc].
+

lib/annotate/annotate_models.rb

@@ -121,7 +121,7 @@ module AnnotateModels
         col_type = (col.type || col.sql_type).to_s
         if col_type == "decimal"
           col_type << "(#{col.precision}, #{col.scale})"
-        else
+				elsif col_type != "spatial"
           if (col.limit)
             if col.limit.is_a? Array
               attrs << "(#{col.limit.join(', ')})"
@@ -135,6 +135,8 @@ module AnnotateModels
         # and print the type and SRID
         if col.respond_to?(:geometry_type)
           attrs << "#{col.geometry_type}, #{col.srid}"
+				elsif col.respond_to?(:geometric_type) and col.geometric_type.present?
+          attrs << "#{col.geometric_type.to_s.downcase}, #{col.srid}"
         end
 
         # Check if the column has indices and print "indexed" if true

spec/annotate/annotate_models_spec.rb

@@ -103,7 +103,6 @@ EOS
 #  id   :integer          not null
 #  name :enum             not null, (enum1, enum2)
 #
-
 EOS
   end