activerecord-postgis 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b46f58d9f4e2ae496184d5b010cd2ebd4707cea2f70526925e4eb677ab43270
-  data.tar.gz: 81e594ef0a7ca42ce1dc6996a70610fb2b80b980cf92bc889a461bfcb233da70
+  metadata.gz: 86b0a720bdf3520ba032d20033a4259e1875bd37ec97e9e517b0b1b1ac647e40
+  data.tar.gz: 4c2ff56e23a305ad149fb61b9f84d8742675e62358f80c4cd8708a488c7b3f67
 SHA512:
-  metadata.gz: 672a16c717f2f4a717d17fae6f55f9bc8b8ca714d4923ed8544af0fa04d82c361ee0acd768009860d68ee4598099e308013688b65e0ccf46e092fb7c539f6296
-  data.tar.gz: f6ca038d3130f62c662a77fb0ad58885339a278ec71af721003c3c0af416fb2ec6ff4f2d7b6829daab310664780ad874d8c970392b0ddfd097e2f905d4ee3d63
+  metadata.gz: 1a3849e3b5f56491964affeaac36f53317bc6fe1d77557067171b00197b0af5675b5aa090250efe9d083f51bf94e531b2965ed97802e704f4969e3e840cf4485
+  data.tar.gz: a4d2916514e25e89fd722567cddd90fe96bbda946c3de5c110018f6d20ad2b3e395049a5c4960bec1d565d03824340b22ed7c8f1bce92f3bbad4f5e6c1fabbba

data/README.md

@@ -6,11 +6,11 @@
 
 This is the **next-generation PostGIS adapter** that brings PostGIS support to Rails the right way:
 
-✅ **Use standard `postgres://` URLs** - No custom adapter names, no special configuration  
-✅ **No monkey patching** - Clean extensions using Rails 8 patterns  
-✅ **No obscure hacks** - Transparent, well-documented implementation  
-✅ **Latest APIs** - Built for Rails 8+ and Ruby 3.3+  
-✅ **Zero configuration** - Just add the gem and it works  
+- **Use standard `postgres://` URLs** - No custom adapter names, no special configuration
+- **No monkey patching** - Clean extensions using Rails 8.1 patterns
+- **No obscure hacks** - Transparent, well-documented implementation
+- **Latest APIs** - Built for Rails 8.1+ and Ruby 3.3+
+- **Zero configuration** - Just add the gem and it works
 
 Unlike legacy PostGIS adapters that require custom database URLs, special configurations, and complex setup, this gem **extends the existing PostgreSQL adapter** seamlessly. Your database configuration stays clean and standard.
 
@@ -53,7 +53,7 @@ development:
 Create spatial columns using PostGIS types:
 
 ```ruby
-class CreateLocations < ActiveRecord::Migration[8.0]
+class CreateLocations < ActiveRecord::Migration[8.1]
   def change
     create_table :locations do |t|
       t.st_point :coordinates, srid: 4326
@@ -81,14 +81,14 @@ Location.where("ST_Distance(coordinates, ?) < ?", point, 1000)
 
 # Using parameterized queries (automatically quoted)
 locations_nearby = Location.where(
-  "ST_DWithin(coordinates, ?, ?)", 
-  point, 
+  "ST_DWithin(coordinates, ?, ?)",
+  point,
   1000  # meters
 )
 
 # Complex spatial queries
 parks_in_city = Park.where(
-  "ST_Within(boundary, ?)", 
+  "ST_Within(boundary, ?)",
   city_polygon
 )
 ```
@@ -186,28 +186,28 @@ class LocationTest < ActiveSupport::TestCase
     point1 = create_point(-5.9, 35.8)
     point2 = create_point(-5.91, 35.81)
     polygon = create_test_polygon
-    
+
     location = Location.create!(coordinates: point1, boundary: polygon)
-    
+
     # Traditional assertions
     assert_spatial_equal point1, location.coordinates
     assert_within_distance point1, point2, 200  # meters
     assert_contains polygon, point1
-    
+
     # New chainable syntax (recommended)
     assert_spatial_column(location.coordinates)
       .has_srid(4326)
       .is_type(:point)
       .is_geographic
-      
+
     assert_spatial_column(location.boundary)
       .is_type(:polygon)
       .has_srid(4326)
   end
-  
+
   def test_3d_geometry
     point_3d = create_point(1.0, 2.0, srid: 4326, z: 10.0)
-    
+
     assert_spatial_column(point_3d)
       .has_z
       .has_srid(4326)
@@ -237,7 +237,7 @@ end
 
 **Geometry Factories:**
 - `create_point(x, y, srid: 4326)` - Create test points
-- `create_test_polygon(srid: 4326)` - Create test polygons  
+- `create_test_polygon(srid: 4326)` - Create test polygons
 - `create_test_linestring(srid: 4326)` - Create test linestrings
 - `factory(srid: 4326, geographic: false)` - Get geometry factory
 - `geographic_factory(srid: 4326)` - Get geographic factory
@@ -245,20 +245,18 @@ end
 
 ## Documentation
 
-📚 **Learn Like You're Defending the Galaxy**
-
-- [🚀 Spatial Warfare Manual](docs/SPATIAL_WARFARE.md) - Advanced PostGIS arsenal explained through space combat
-- [🍳 The PostGIS Cookbook](docs/COOKBOOK.md) - Real-world recipes from delivery fleets to geofencing
+- [Spatial Warfare Manual](docs/SPATIAL_WARFARE.md) - Advanced PostGIS arsenal explained through space combat
+- [The PostGIS Cookbook](docs/COOKBOOK.md) - Real-world recipes from delivery fleets to geofencing
 
 ## Features
 
-🌍 **Complete PostGIS Type Support**
-- `st_point`, `st_line_string`, `st_polygon` 
+**Complete PostGIS Type Support**
+- `st_point`, `st_line_string`, `st_polygon`
 - `st_multi_point`, `st_multi_line_string`, `st_multi_polygon`
 - `st_geometry_collection`, `st_geography`
 - Support for SRID, Z/M dimensions
 
-🔍 **Spatial Query Methods**
+**Spatial Query Methods**
 - Core methods: `st_distance`, `st_contains`, `st_within`, `st_length`
 - **NEW:** Advanced spatial operations:
   - `<->` (distance_operator) - K-Nearest Neighbor search (blazing fast!)
@@ -270,13 +268,13 @@ end
 - Custom Arel visitor for PostGIS SQL generation
 - Seamless integration with ActiveRecord queries
 
-⚡ **Modern Architecture**
-- Built on Rails 8 patterns
+**Modern Architecture**
+- Built on Rails 8.1 patterns
 - Clean module extensions (no inheritance)
 - Proper type registration and schema dumping
 - Compatible with multi-database setups
 
-🛠️ **Developer Experience**
+**Developer Experience**
 - Standard `postgres://` URLs
 - Works with existing PostgreSQL tools
 - Clear error messages and debugging
@@ -287,17 +285,17 @@ end
 
 This gem builds upon the incredible work of many contributors to the Ruby geospatial ecosystem:
 
-🙏 **RGeo Ecosystem** - The foundation that makes Ruby geospatial possible:
+**RGeo Ecosystem** - The foundation that makes Ruby geospatial possible:
 - [RGeo](https://github.com/rgeo/rgeo) originally by Daniel Azuma, currently maintained by Keith Doggett (@keithdoggett) and Ulysse Buonomo (@BuonOmo)
 - [RGeo::ActiveRecord](https://github.com/rgeo/rgeo-activerecord) for ActiveRecord integration
 - [RGeo::Proj4](https://github.com/rgeo/rgeo-proj4) for coordinate system transformations
 - Former maintainer Tee Parham and all contributors who built this ecosystem
 
-🗺️ **PostGIS Pioneers** - Previous PostGIS adapters that paved the way:
+**PostGIS Pioneers** - Previous PostGIS adapters that paved the way:
 - [activerecord-postgis-adapter](https://github.com/rgeo/activerecord-postgis-adapter) by Daniel Azuma and the RGeo team
 - All the maintainers and contributors who solved spatial data challenges in Rails
 
-🌍 **PostGIS & GEOS** - The underlying spatial powerhouses:
+**PostGIS & GEOS** - The underlying spatial powerhouses:
 - PostGIS developers for the amazing spatial database extension
 - GEOS contributors for computational geometry
 - PostgreSQL team for the solid foundation

data/activerecord-postgis.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = spec.summary
   spec.homepage = 'https://github.com/seuros/activerecord-postgis'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.3.0'
+  spec.required_ruby_version = '>= 3.3.0', '< 5.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.files = Dir.glob('{lib}/**/*') + [ gemspec, 'LICENSE.txt', 'README.md' ]
   spec.require_paths = [ 'lib' ]
 
-  spec.add_dependency 'activerecord', '>= 8.1.0', '< 8.2'
+  spec.add_dependency 'activerecord', '>= 8.1.0', '< 8.3'
   spec.add_dependency 'pg'
+  spec.add_dependency 'rgeo', '>= 3.1.0'
   spec.add_dependency 'rgeo-activerecord', '>= 8.0'
 end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      class Railtie < ::Rails::Railtie
+        config.after_initialize do
+          PostGIS.ignore_postgis_system_tables
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "0.5.1"
+      VERSION = "0.6.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis.rb

@@ -35,26 +35,43 @@ module ActiveRecord
 
       SPATIAL_OPTIONS_FOR_REGISTRATION = %i[srid has_z has_m geographic].freeze
 
+      POSTGIS_SYSTEM_TABLES = %w[
+        geography_columns
+        geometry_columns
+        layer
+        raster_columns
+        raster_overviews
+        spatial_ref_sys
+        topology
+      ].freeze
+
       def self.initialize!
         return if @initialized
         @initialized = true
 
-        # Extend PostgreSQL Column class with spatial functionality
-        PostgreSQL::Column.include(ColumnExtensions)
+        extend_postgresql_adapter
 
-        # Add spatial object quoting support
-        PostgreSQLAdapter.prepend(Quoting)
+        register_spatial_types
+
+        ignore_postgis_system_tables
+      end
 
-        # Allow PostGIS specific options in table definitions
-        # The `define_column_methods` call already makes these available on the `TableDefinition` instance.
-        # The issue might be deeper in how schema.rb is processed or how options are validated.
-        # Let's ensure that the column methods are defined *before* any schema loading that might trigger validation.
+      def self.extend_postgresql_adapter
+        PostgreSQL::Column.include(ColumnExtensions)
+        PostgreSQLAdapter.prepend(Quoting)
+        PostgreSQL::Table.include(PostGIS::TableDefinition)
+        PostgreSQLAdapter.prepend(AdapterExtensions)
+        PostgreSQLAdapter.prepend(DatabaseStatements)
+      end
 
-        PostgreSQL::Table.include(
-          PostGIS::TableDefinition
-        )
+      def self.register_spatial_types
+        register_native_database_types
+        register_column_methods
+        register_type_classes
+        register_type_mapping
+      end
 
-        # Using st_* prefix to avoid conflicts with PostgreSQL native geometric types
+      def self.register_native_database_types
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:st_geography] = { name: "geography" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:st_geometry] = { name: "geometry" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:st_geometry_collection] = { name: "geometry(GeometryCollection)" }
@@ -65,7 +82,6 @@ module ActiveRecord
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:st_point] = { name: "geometry(Point)" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:st_polygon] = { name: "geometry(Polygon)" }
 
-        # Legacy aliases for compatibility with activerecord-postgis-adapter
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:geography] = { name: "geography" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:geometry] = { name: "geometry" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:geometry_collection] = { name: "geometry(GeometryCollection)" }
@@ -74,95 +90,69 @@ module ActiveRecord
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:multi_point] = { name: "geometry(MultiPoint)" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:multi_polygon] = { name: "geometry(MultiPolygon)" }
         PostgreSQLAdapter::NATIVE_DATABASE_TYPES[:polygon] = { name: "geometry(Polygon)" }
+      end
 
-
-        # Tell Rails these are valid column methods for schema dumping - PostgreSQL only
+      def self.register_column_methods
         PostgreSQL::TableDefinition.send(:define_column_methods,
-                                                                            :st_geography, :st_geometry, :st_geometry_collection, :st_line_string,
-                                                                            :st_multi_line_string, :st_multi_point, :st_multi_polygon, :st_point, :st_polygon,
-                                                                            # Legacy column methods for compatibility with activerecord-postgis-adapter
-                                                                            :geography, :geometry, :geometry_collection, :line_string,
-                                                                            :multi_line_string, :multi_point, :multi_polygon, :polygon,
-                                                                            *SPATIAL_OPTIONS_FOR_REGISTRATION)
-
-        # prevent unknown OID warning and register PostGIS types
-        PostgreSQLAdapter.singleton_class.prepend(RegisterTypes)
-
-        # Prepend our extensions to handle spatial columns
-        PostgreSQLAdapter.prepend(AdapterExtensions)
-
-        # Prevent spatial_reference_sys truncation
-        PostgreSQLAdapter.prepend(DatabaseStatements)
+          :st_geography, :st_geometry, :st_geometry_collection, :st_line_string,
+          :st_multi_line_string, :st_multi_point, :st_multi_polygon, :st_point, :st_polygon,
+          :geography, :geometry, :geometry_collection, :line_string,
+          :multi_line_string, :multi_point, :multi_polygon, :polygon,
+          *SPATIAL_OPTIONS_FOR_REGISTRATION)
+      end
 
-        # Register spatial types with ActiveRecord::Type - use st_* prefix to avoid conflicts
+      def self.register_type_classes
         adapter_name = :postgresql
 
-        # Register specific spatial types with their corresponding classes
-        ActiveRecord::Type.register(:st_geography, Type::Geography, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_geometry, Type::Geometry, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_geometry_collection, Type::GeometryCollection, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_line_string, Type::LineString, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_multi_line_string, Type::MultiLineString, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_multi_point, Type::MultiPoint, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_multi_polygon, Type::MultiPolygon, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_point, Type::Point, adapter: adapter_name)
-        ActiveRecord::Type.register(:st_polygon, Type::Polygon, adapter: adapter_name)
-
-        # Legacy type registrations for compatibility with activerecord-postgis-adapter
-        ActiveRecord::Type.register(:geography, Type::Geography, adapter: adapter_name)
-        ActiveRecord::Type.register(:geometry, Type::Geometry, adapter: adapter_name)
-        ActiveRecord::Type.register(:geometry_collection, Type::GeometryCollection, adapter: adapter_name)
-        ActiveRecord::Type.register(:line_string, Type::LineString, adapter: adapter_name)
-        ActiveRecord::Type.register(:multi_line_string, Type::MultiLineString, adapter: adapter_name)
-        ActiveRecord::Type.register(:multi_point, Type::MultiPoint, adapter: adapter_name)
-        ActiveRecord::Type.register(:multi_polygon, Type::MultiPolygon, adapter: adapter_name)
-        ActiveRecord::Type.register(:polygon, Type::Polygon, adapter: adapter_name)
-
-        # Ignore PostGIS system tables in schema dumps - PostgreSQL specific
-        PostgreSQL::SchemaDumper.ignore_tables |= %w[
-              geography_columns
-              geometry_columns
-              layer
-              raster_columns
-              raster_overviews
-              spatial_ref_sys
-              topology
-            ]
+        SPATIAL_TYPES_FOR_REGISTRATION.each do |type_name|
+          type_class_name = type_name.to_s.sub(/^st_/, "").split("_").map(&:capitalize).join
+          type_class = Type.const_get(type_class_name) rescue nil
+          if type_class
+            ActiveRecord::Type.register(type_name, type_class, adapter: adapter_name)
+          end
+        end
       end
 
-      module RegisterTypes
-        def initialize_type_map(m = type_map)
-          super
+      def self.register_type_mapping
+        if PostgreSQLAdapter.respond_to?(:register_type_mapping)
+          PostgreSQLAdapter.register_type_mapping { |m| TypeRegistration.register!(m) }
+        else
+          PostgreSQLAdapter.singleton_class.prepend(RegisterTypes)
+        end
+      end
 
-          # Register by type name for schema loading
-          m.register_type "geography" do |_, _, sql_type|
-            create_spatial_type_from_sql(sql_type)
-          end
+      def self.schema_ignored_tables
+        if ActiveRecord.respond_to?(:schema_ignored_tables)
+          ActiveRecord.schema_ignored_tables
+        else
+          PostgreSQL::SchemaDumper.ignore_tables
+        end
+      end
 
-          m.register_type "geometry" do |_, _, sql_type|
-            create_spatial_type_from_sql(sql_type)
-          end
+      def self.ignore_postgis_system_tables
+        if ActiveRecord.respond_to?(:schema_ignored_tables)
+          ActiveRecord.schema_ignored_tables |= POSTGIS_SYSTEM_TABLES
+        else
+          PostgreSQL::SchemaDumper.ignore_tables |= POSTGIS_SYSTEM_TABLES
         end
+      end
 
-        private
+      module TypeRegistration
+        def self.register!(m)
+          m.register_type("geometry") { |_, _, sql| from_sql(sql) }
+          m.register_type("geography") { |_, _, sql| from_sql(sql) }
+        end
 
-        def create_spatial_type_from_sql(sql_type)
-          # Handle empty sql_type (common in joins) - this is an upstream Rails issue
-          # where sql_type comes back as empty string, making it impossible to determine
-          # the correct spatial type properties
+        def self.from_sql(sql_type)
           if sql_type.nil? || sql_type.empty?
-            # Log warning about potential type mismatch due to upstream issue
-            # Users experiencing this should use explicit attribute registration as workaround
-            # See: https://github.com/rgeo/activerecord-postgis-adapter/pull/334
             return Type::Geometry.new(srid: 0, has_z: false, has_m: false, geographic: false)
           end
 
-          # Extract SRID and dimensions from SQL type
           srid = extract_srid_from_sql(sql_type)
-          # Check for dimension suffixes (e.g., PointZ, PointM, PointZM)
           has_z = sql_type.match?(/\b\w+Z\b|\b\w+ZM\b/)
           has_m = sql_type.match?(/\b\w+M\b|\b\w+ZM\b/)
           geographic = sql_type.start_with?("geography")
+
           case sql_type
           when /geography\(Point/i
             Type::Point.new(srid: srid, has_z: has_z, has_m: has_m, geographic: geographic)
@@ -197,17 +187,22 @@ module ActiveRecord
           when /geometry/i
             Type::Geometry.new(srid: srid, has_z: has_z, has_m: has_m)
           else
-            # Fallback for unrecognized types
             Type::Geometry.new(srid: srid, has_z: has_z, has_m: has_m)
           end
         end
 
-        def extract_srid_from_sql(sql_type)
-          # Extract SRID from patterns like geometry(Point,3785) or geography(Point,4326)
+        def self.extract_srid_from_sql(sql_type)
           match = sql_type.match(/,(\d+)\)/)
           match ? match[1].to_i : 0
         end
       end
+
+      module RegisterTypes
+        def initialize_type_map(m = type_map)
+          super
+          TypeRegistration.register!(m)
+        end
+      end
     end
   end
 end

data/lib/activerecord-postgis.rb

@@ -10,3 +10,5 @@ require "rgeo-activerecord"
 ActiveSupport.on_load(:active_record_postgresqladapter) do
   ActiveRecord::ConnectionAdapters::PostGIS.initialize!
 end
+
+require_relative "active_record/connection_adapters/postgis/railtie" if defined?(Rails::Railtie)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -18,7 +18,7 @@ dependencies:
         version: 8.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '8.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
         version: 8.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '8.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rgeo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ files:
 - lib/active_record/connection_adapters/postgis/oid/spatial.rb
 - lib/active_record/connection_adapters/postgis/oid/spatial_types.rb
 - lib/active_record/connection_adapters/postgis/quoting.rb
+- lib/active_record/connection_adapters/postgis/railtie.rb
 - lib/active_record/connection_adapters/postgis/schema_dumper.rb
 - lib/active_record/connection_adapters/postgis/schema_statements.rb
 - lib/active_record/connection_adapters/postgis/spatial_column_methods.rb
@@ -112,13 +127,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '5.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: PostGIS Type support for ActiveRecord
 test_files: []