activerecord-postgis-adapter 3.0.0.beta5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da8f856d4cf24c6499865f61ffca7aa83dfde847
-  data.tar.gz: bb1f2d2716ef65650d7a438a62554e5f07cea2b0
+  metadata.gz: cae625bce4f6b68a5af7ea8c529ec394f87893e6
+  data.tar.gz: 53f7eec3f8cf9f34d65b5b730ebb9b96752c5160
 SHA512:
-  metadata.gz: 0aae508c94cd5a4d07e72e451b024f69fefb955db49213700490d7a71007cf3f0c7306479b6292e1b98fc841a7b3868bb26b3f91eb6ec916f0d9a47246dea898
-  data.tar.gz: 68e42bce528929b082443e7afc6736e80a4d1c89084300e3a648f0574486bae913937a46650153fb357f4f90be69619bbecf9325479e6376821b6d9ccf147179
+  metadata.gz: b48c96beba75c73a99c290576316749f2116f2cd2b3e5763e4e58edabbe867998b9c3e4841b721bfb8254d88737a5120a5c0f369aff54c8b7e506d6e682f8055
+  data.tar.gz: eda94967ac1d14c80500ae57b62a38982152f8fd5b722d3c37a2995e046398d366214436f832e1942785758a77edd29637eb5a4eecab75fbddc02504686e94d9

data/lib/active_record/connection_adapters/postgis/column_methods.rb

@@ -0,0 +1,50 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      module ColumnMethods
+        def spatial(name, options = {})
+          raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
+          column(name, options[:type], options)
+        end
+
+        def geography(name, options = {})
+          column(name, :geography, options)
+        end
+
+        def geometry(name, options = {})
+          column(name, :geometry, options)
+        end
+
+        def geometry_collection(name, options = {})
+          column(name, :geometry_collection, options)
+        end
+
+        def line_string(name, options = {})
+          column(name, :line_string, options)
+        end
+
+        def multi_line_string(name, options = {})
+          column(name, :multi_line_string, options)
+        end
+
+        def multi_point(name, options = {})
+          column(name, :multi_point, options)
+        end
+
+        def multi_polygon(name, options = {})
+          column(name, :multi_polygon, options)
+        end
+
+        def st_point(name, options = {})
+          column(name, :st_point, options)
+        end
+
+        def st_polygon(name, options = {})
+          column(name, :st_polygon, options)
+        end
+      end
+
+      PostgreSQL::Table.send(:include, ColumnMethods)
+    end
+  end
+end

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/create_connection.rb

@@ -1,4 +1,4 @@
-if(defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby')
+if RUBY_ENGINE == 'jruby'
   require 'active_record/connection_adapters/jdbcpostgresql_adapter'
 else
   require 'pg'
@@ -7,10 +7,10 @@ end
 module ActiveRecord  # :nodoc:
   module ConnectionHandling  # :nodoc:
 
-    if(defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby')
+    if RUBY_ENGINE == 'jruby'
 
       def postgis_connection(config)
-        config[:adapter_class] = ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter
+        config[:adapter_class] = ConnectionAdapters::PostGISAdapter
         postgresql_connection(config)
       end
 
@@ -35,7 +35,7 @@ module ActiveRecord  # :nodoc:
 
         # The postgres drivers don't allow the creation of an unconnected PGconn object,
         # so just pass a nil connection object for the time being.
-        ConnectionAdapters::PostGISAdapter::MainAdapter.new(nil, logger, conn_params, config)
+        ConnectionAdapters::PostGISAdapter.new(nil, logger, conn_params, config)
       end
 
     end

data/lib/active_record/connection_adapters/postgis/databases.rake

@@ -0,0 +1,16 @@
+namespace :db do
+  namespace :gis do
+    desc "Setup PostGIS data in the database"
+    task setup: [:load_config] do
+      environments = [Rails.env]
+      environments << "test" if Rails.env.development?
+      ActiveRecord::Base.configurations
+        .values_at(*environments)
+        .compact
+        .reject{ |config| config["database"].blank? }
+        .each do |config|
+          ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(config).setup_gis
+        end
+    end
+  end
+end

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/oid/spatial.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters
-    module PostGISAdapter
+    module PostGIS
       module OID
         class Spatial < Type::Value
           # sql_type is a string that comes from the database definition

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/postgis_database_tasks.rb

@@ -1,6 +1,6 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
+    module PostGIS  # :nodoc:
       class PostGISDatabaseTasks < ::ActiveRecord::Tasks::PostgreSQLDatabaseTasks  # :nodoc:
 
         def initialize(config)

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/railtie.rb

@@ -3,7 +3,7 @@ require 'active_record/connection_adapters/postgis_adapter'
 
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
+    module PostGIS  # :nodoc:
       class Railtie < ::Rails::Railtie  # :nodoc:
         rake_tasks do
           load ::File.expand_path("databases.rake", ::File.dirname(__FILE__))

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/schema_statements.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ConnectionAdapters
-    module PostGISAdapter
+    module PostGIS
       module SchemaStatements
         # override
         # pass table_name to #new_column
@@ -74,7 +74,7 @@ module ActiveRecord
 
         # override
         def create_table_definition(name, temporary, options, as = nil)
-          PostGISAdapter::TableDefinition.new(native_database_types, name, temporary, options, as, self)
+          PostGIS::TableDefinition.new(native_database_types, name, temporary, options, as)
         end
 
         # memoize hash of column infos for tables

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/setup.rb

@@ -1,6 +1,6 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
+    module PostGIS  # :nodoc:
 
       def self.initial_setup
         ::ActiveRecord::SchemaDumper.ignore_tables |= %w[geometry_columns spatial_ref_sys layer topology]

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/spatial_column.rb

@@ -1,6 +1,6 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
+    module PostGIS  # :nodoc:
       class SpatialColumn < ConnectionAdapters::PostgreSQLColumn  # :nodoc:
 
         # sql_type examples:

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/spatial_column_info.rb

@@ -1,6 +1,6 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter
+    module PostGIS
       # Do spatial sql queries for column info and memoize that info.
       class SpatialColumnInfo
         def initialize(adapter, table_name)
@@ -32,7 +32,7 @@ module ActiveRecord  # :nodoc:
 
         # do not query the database for non-spatial columns/tables
         def get(column_name, type)
-          return unless MainAdapter.spatial_column_options(type.to_sym)
+          return unless PostGISAdapter.spatial_column_options(type.to_sym)
           @spatial_column_info ||= all
           @spatial_column_info[column_name]
         end

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/spatial_table_definition.rb

@@ -1,17 +1,12 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
+    module PostGIS  # :nodoc:
       class TableDefinition < PostgreSQL::TableDefinition  # :nodoc:
+        include ColumnMethods
 
-        def initialize(types, name, temporary, options, as, adapter)
-          @adapter = adapter
-          @spatial_columns_hash = {}
-          super(types, name, temporary, options, as)
-        end
-
-        # super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L320
+        # super: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
         def new_column_definition(name, type, options)
-          if (info = MainAdapter.spatial_column_options(type.to_sym))
+          if (info = PostGISAdapter.spatial_column_options(type.to_sym))
             if (limit = options.delete(:limit))
               options.merge!(limit) if limit.is_a?(::Hash)
             end
@@ -30,7 +25,6 @@ module ActiveRecord  # :nodoc:
             column.srid = options[:srid]
             column.has_z = options[:has_z]
             column.has_m = options[:has_m]
-            (column.geographic? ? @columns_hash : @spatial_columns_hash)[name] = column
           else
             column = super(name, type, options)
           end
@@ -38,56 +32,11 @@ module ActiveRecord  # :nodoc:
           column
         end
 
-        def non_geographic_spatial_columns
-          @spatial_columns_hash.values
-        end
-
-        def spatial(name, options = {})
-          raise "You must set a type. For example: 't.spatial type: :st_point'" unless options[:type]
-          column(name, options[:type], options)
-        end
-
-        def geography(name, options = {})
-          column(name, :geography, options)
-        end
-
-        def geometry(name, options = {})
-          column(name, :geometry, options)
-        end
-
-        def geometry_collection(name, options = {})
-          column(name, :geometry_collection, options)
-        end
-
-        def line_string(name, options = {})
-          column(name, :line_string, options)
-        end
-
-        def multi_line_string(name, options = {})
-          column(name, :multi_line_string, options)
-        end
-
-        def multi_point(name, options = {})
-          column(name, :multi_point, options)
-        end
-
-        def multi_polygon(name, options = {})
-          column(name, :multi_polygon, options)
-        end
-
-        def st_point(name, options = {})
-          column(name, :st_point, options)
-        end
-
-        def st_polygon(name, options = {})
-          column(name, :st_polygon, options)
-        end
-
         private
 
         def create_column_definition(name, type)
-          if MainAdapter.spatial_column_options(type.to_sym)
-            PostGISAdapter::ColumnDefinition.new(name, type)
+          if PostGISAdapter.spatial_column_options(type.to_sym)
+            PostGIS::ColumnDefinition.new(name, type)
           else
             super
           end
@@ -143,7 +92,7 @@ module ActiveRecord  # :nodoc:
           if @srid
             @srid.to_i
           else
-            geographic? ? 4326 : PostGISAdapter::MainAdapter::DEFAULT_SRID
+            geographic? ? 4326 : PostGISAdapter::DEFAULT_SRID
           end
         end
 

data/lib/active_record/connection_adapters/{postgis_adapter → postgis}/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
-    module PostGISAdapter
-      VERSION = '3.0.0.beta5'.freeze
+    module PostGIS
+      VERSION = '3.0.0'.freeze
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -5,23 +5,87 @@
 
 require 'active_record/connection_adapters/postgresql_adapter'
 require 'rgeo/active_record'
-require 'active_record/connection_adapters/postgis_adapter/version'
-require 'active_record/connection_adapters/postgis_adapter/schema_statements'
-require 'active_record/connection_adapters/postgis_adapter/main_adapter'
-require 'active_record/connection_adapters/postgis_adapter/spatial_column_info'
-require 'active_record/connection_adapters/postgis_adapter/spatial_table_definition'
-require 'active_record/connection_adapters/postgis_adapter/spatial_column'
-require 'active_record/connection_adapters/postgis_adapter/arel_tosql'
-require 'active_record/connection_adapters/postgis_adapter/setup'
-require 'active_record/connection_adapters/postgis_adapter/oid/spatial'
-require 'active_record/connection_adapters/postgis_adapter/create_connection'
-require 'active_record/connection_adapters/postgis_adapter/postgis_database_tasks'
+require 'active_record/connection_adapters/postgis/version'
+require 'active_record/connection_adapters/postgis/column_methods'
+require 'active_record/connection_adapters/postgis/schema_statements'
+require 'active_record/connection_adapters/postgis/spatial_column_info'
+require 'active_record/connection_adapters/postgis/spatial_table_definition'
+require 'active_record/connection_adapters/postgis/spatial_column'
+require 'active_record/connection_adapters/postgis/arel_tosql'
+require 'active_record/connection_adapters/postgis/setup'
+require 'active_record/connection_adapters/postgis/oid/spatial'
+require 'active_record/connection_adapters/postgis/create_connection'
+require 'active_record/connection_adapters/postgis/postgis_database_tasks'
 
-
-::ActiveRecord::ConnectionAdapters::PostGISAdapter.initial_setup
+::ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
 
 if defined?(::Rails::Railtie)
-  load ::File.expand_path('postgis_adapter/railtie.rb', ::File.dirname(__FILE__))
+  load ::File.expand_path('postgis/railtie.rb', ::File.dirname(__FILE__))
 end
 
 # :startdoc:
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostGISAdapter < PostgreSQLAdapter
+      include PostGIS::SchemaStatements
+
+      SPATIAL_COLUMN_OPTIONS =
+        {
+          geography:           { geographic: true },
+          geometry:            {},
+          geometry_collection: {},
+          line_string:         {},
+          multi_line_string:   {},
+          multi_point:         {},
+          multi_polygon:       {},
+          spatial:             {},
+          st_point:            {},
+          st_polygon:          {},
+        }
+
+      # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
+      DEFAULT_SRID = 0
+
+      def initialize(*args)
+        super
+        @visitor = Arel::Visitors::PostGIS.new(self)
+      end
+
+      def adapter_name
+        "PostGIS".freeze
+      end
+
+      def self.spatial_column_options(key)
+        SPATIAL_COLUMN_OPTIONS[key]
+      end
+
+      def postgis_lib_version
+        @postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
+      end
+
+      def default_srid
+        DEFAULT_SRID
+      end
+
+      def srs_database_columns
+        {
+          auth_name_column: 'auth_name',
+          auth_srid_column: 'auth_srid',
+          proj4text_column: 'proj4text',
+          srtext_column:    'srtext',
+        }
+      end
+
+      def quote(value, column = nil)
+        if RGeo::Feature::Geometry.check_type(value)
+          "'#{ RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value) }'"
+        elsif value.is_a?(RGeo::Cartesian::BoundingBox)
+          "'#{ value.min_x },#{ value.min_y },#{ value.max_x },#{ value.max_y }'::box"
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/test/basic_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class BasicTest < ActiveSupport::TestCase  # :nodoc:
 
   def test_version
-    refute_nil ActiveRecord::ConnectionAdapters::PostGISAdapter::VERSION
+    refute_nil ActiveRecord::ConnectionAdapters::PostGIS::VERSION
   end
 
   def test_postgis_available

data/test/ddl_test.rb

@@ -13,7 +13,7 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
       :st_point,
       :st_polygon,
     ].each do |type|
-      assert ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter.spatial_column_options(type), type
+      assert ActiveRecord::ConnectionAdapters::PostGISAdapter.spatial_column_options(type), type
     end
   end
 
@@ -109,21 +109,30 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
       t.column('latlon', :geometry)
     end
     klass.connection.change_table(:spatial_models) do |t|
+      t.st_point('geom3', srid: 4326, geographic: true)
       t.column('geom2', :st_point, srid: 4326, geographic: true)
       t.column('name', :string)
     end
     klass.reset_column_information
     assert_equal 1, count_geometry_columns
-    cols_ = klass.columns
-    assert_equal RGeo::Feature::Geometry, cols_[-3].geometric_type
-    assert_equal 0, cols_[-3].srid
-    assert_equal true, cols_[-3].spatial?
-    assert_equal RGeo::Feature::Point, cols_[-2].geometric_type
-    assert_equal 4326, cols_[-2].srid
-    assert_equal true, cols_[-2].geographic?
-    assert_equal true, cols_[-2].spatial?
-    assert_nil cols_[-1].geometric_type
-    assert_equal false, cols_[-1].spatial?
+    cols = klass.columns
+    # latlon
+    assert_equal RGeo::Feature::Geometry, cols[-4].geometric_type
+    assert_equal 0, cols[-4].srid
+    assert_equal true, cols[-4].spatial?
+    # geom3
+    assert_equal RGeo::Feature::Point, cols[-3].geometric_type
+    assert_equal 4326, cols[-3].srid
+    assert_equal true, cols[-3].geographic?
+    assert_equal true, cols[-3].spatial?
+    # geom2
+    assert_equal RGeo::Feature::Point, cols[-2].geometric_type
+    assert_equal 4326, cols[-2].srid
+    assert_equal true, cols[-2].geographic?
+    assert_equal true, cols[-2].spatial?
+    # name
+    assert_nil cols[-1].geometric_type
+    assert_equal false, cols[-1].spatial?
   end
 
   def test_drop_geometry_column
@@ -136,11 +145,11 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     end
     klass.reset_column_information
     assert_equal 1, count_geometry_columns
-    cols_ = klass.columns
-    assert_equal RGeo::Feature::Geometry, cols_[-1].geometric_type
-    assert_equal 'latlon', cols_[-1].name
-    assert_equal 0, cols_[-1].srid
-    assert_equal false, cols_[-1].geographic?
+    cols = klass.columns
+    assert_equal RGeo::Feature::Geometry, cols[-1].geometric_type
+    assert_equal 'latlon', cols[-1].name
+    assert_equal 0, cols[-1].srid
+    assert_equal false, cols[-1].geographic?
   end
 
   def test_drop_geography_column
@@ -230,7 +239,7 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     end
     klass.reset_column_information
     # `all` queries column info from the database - it should not be called when klass.columns is called
-    ActiveRecord::ConnectionAdapters::PostGISAdapter::SpatialColumnInfo.any_instance.expects(:all).never
+    ActiveRecord::ConnectionAdapters::PostGIS::SpatialColumnInfo.any_instance.expects(:all).never
     # first column is id, second is name
     refute klass.columns[1].spatial?
     assert_nil klass.columns[1].has_z

data/test/tasks_test.rb

@@ -145,13 +145,13 @@ class TasksTest < ActiveSupport::TestCase  # :nodoc:
     FileUtils.rm_f(tmp_sql_filename)
     FileUtils.mkdir_p(::File.dirname(tmp_sql_filename))
     drop_db_if_exists
-    ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks.new(NEW_CONNECTION).create
+    ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(NEW_CONNECTION).create
   rescue ActiveRecord::Tasks::DatabaseAlreadyExists
     # ignore
   end
 
   def drop_db_if_exists
-    ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks.new(NEW_CONNECTION).drop
+    ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(NEW_CONNECTION).drop
   rescue ActiveRecord::Tasks::DatabaseAlreadyExists
     # ignore
   end

data/test/type_test.rb

@@ -21,6 +21,6 @@ class TypeTest < ActiveSupport::TestCase
   private
 
   def spatial
-    ActiveRecord::ConnectionAdapters::PostGISAdapter::OID::Spatial
+    ActiveRecord::ConnectionAdapters::PostGIS::OID::Spatial
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta5
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: ActiveRecord connection adapter for PostGIS. It is based on the stock
-  PostgreSQL adapter, but provides built-in support for the spatial extensions provided
+  PostgreSQL adapter, and adds built-in support for the spatial extensions provided
   by PostGIS. It uses the RGeo library to represent spatial data in Ruby.
 email: dazuma@gmail.com, parhameter@gmail.com
 executables: []
@@ -103,22 +103,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- lib/active_record/connection_adapters/postgis/arel_tosql.rb
+- lib/active_record/connection_adapters/postgis/column_methods.rb
+- lib/active_record/connection_adapters/postgis/create_connection.rb
+- lib/active_record/connection_adapters/postgis/databases.rake
+- lib/active_record/connection_adapters/postgis/oid/spatial.rb
+- lib/active_record/connection_adapters/postgis/postgis_database_tasks.rb
+- lib/active_record/connection_adapters/postgis/railtie.rb
+- lib/active_record/connection_adapters/postgis/schema_statements.rb
+- lib/active_record/connection_adapters/postgis/setup.rb
+- lib/active_record/connection_adapters/postgis/spatial_column.rb
+- lib/active_record/connection_adapters/postgis/spatial_column_info.rb
+- lib/active_record/connection_adapters/postgis/spatial_table_definition.rb
+- lib/active_record/connection_adapters/postgis/version.rb
 - lib/active_record/connection_adapters/postgis_adapter.rb
-- lib/active_record/connection_adapters/postgis_adapter/arel_tosql.rb
-- lib/active_record/connection_adapters/postgis_adapter/create_connection.rb
-- lib/active_record/connection_adapters/postgis_adapter/databases.rake
-- lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb
-- lib/active_record/connection_adapters/postgis_adapter/oid/spatial.rb
-- lib/active_record/connection_adapters/postgis_adapter/postgis_database_tasks.rb
-- lib/active_record/connection_adapters/postgis_adapter/railtie.rb
-- lib/active_record/connection_adapters/postgis_adapter/schema_statements.rb
-- lib/active_record/connection_adapters/postgis_adapter/setup.rb
-- lib/active_record/connection_adapters/postgis_adapter/spatial_column.rb
-- lib/active_record/connection_adapters/postgis_adapter/spatial_column_info.rb
-- lib/active_record/connection_adapters/postgis_adapter/spatial_table_definition.rb
-- lib/active_record/connection_adapters/postgis_adapter/version.rb
 - lib/activerecord-postgis-adapter.rb
-- lib/activerecord/postgis/adapter.rb
 - test/basic_test.rb
 - test/database.yml
 - test/ddl_test.rb
@@ -143,12 +142,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
@@ -162,4 +161,3 @@ test_files:
 - test/tasks_test.rb
 - test/test_helper.rb
 - test/type_test.rb
-has_rdoc: 

data/lib/active_record/connection_adapters/postgis_adapter/databases.rake

@@ -1,17 +0,0 @@
-# :stopdoc:
-
-namespace :db do
-  namespace :gis do
-    desc "Setup PostGIS data in the database"
-    task :setup => [:load_config] do
-      environments_ = [::Rails.env]
-      environments_ << 'test' if ::Rails.env.development?
-      configs_ = ::ActiveRecord::Base.configurations.values_at(*environments_).compact.reject{ |config_| config_['database'].blank? }
-      configs_.each do |config_|
-        ::ActiveRecord::ConnectionAdapters::PostGISAdapter::PostGISDatabaseTasks.new(config_).setup_gis
-      end
-    end
-  end
-end
-
-# :startdoc:

data/lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb

@@ -1,70 +0,0 @@
-module ActiveRecord  # :nodoc:
-  module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
-      class MainAdapter < PostgreSQLAdapter  # :nodoc:
-        include PostGISAdapter::SchemaStatements
-
-        SPATIAL_COLUMN_OPTIONS =
-          {
-            geography:           { geographic: true },
-            geometry:            {},
-            geometry_collection: {},
-            line_string:         {},
-            multi_line_string:   {},
-            multi_point:         {},
-            multi_polygon:       {},
-            spatial:             {},
-            st_point:            {},
-            st_polygon:          {},
-          }
-
-        # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
-        DEFAULT_SRID = 0
-
-        def initialize(*args)
-          super
-          @visitor = Arel::Visitors::PostGIS.new(self)
-        end
-
-        # def schema_creation
-        #   PostGISAdapter::SchemaCreation.new self
-        # end
-
-        def adapter_name
-          "PostGIS".freeze
-        end
-
-        def self.spatial_column_options(key)
-          SPATIAL_COLUMN_OPTIONS[key]
-        end
-
-        def postgis_lib_version
-          @postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
-        end
-
-        def default_srid
-          DEFAULT_SRID
-        end
-
-        def srs_database_columns
-          {
-            auth_name_column: 'auth_name',
-            auth_srid_column: 'auth_srid',
-            proj4text_column: 'proj4text',
-            srtext_column:    'srtext',
-          }
-        end
-
-        def quote(value, column = nil)
-          if RGeo::Feature::Geometry.check_type(value)
-            "'#{ RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value) }'"
-          elsif value.is_a?(RGeo::Cartesian::BoundingBox)
-            "'#{ value.min_x },#{ value.min_y },#{ value.max_x },#{ value.max_y }'::box"
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end

data/lib/activerecord/postgis/adapter.rb

@@ -1 +0,0 @@
-require 'active_record/connection_adapters/postgis_adapter.rb'