activerecord-postgis 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348c302fed46b25f5815a94a08f24882b3c9ce9a4f29907ba5e3fcd6570dbf27
-  data.tar.gz: dd1a7f7de5e9a71178a2e98981221861824336c20861fce51a2da6d6b6eeceac
+  metadata.gz: b80f70c84d88643edef39e5d702779a4248b05c03ed692c09139bad00f7f5009
+  data.tar.gz: 9f923717999ac80231119e353356f8f9570c04e17ef560e84aa0656132ec0618
 SHA512:
-  metadata.gz: '08ce6f86d903016208598a2c70e8da83d59fbf9b11afd8f7db0b4b1a8cb953599c43ce102ac3b84938a6b934e82af0791d2641ba453c2a17a6b75c15ad85ca13'
-  data.tar.gz: 6d529987e15c03978f48e346cb174f900d95493e6b1c1f2a1e417c71005ff2e7d75e1e3ee76099fcabd03b7705f28c60b04d983e609e6969929329f5d7d7a494
+  metadata.gz: aff8a1b78d4b16f498c013652b5fd0d1b9b268fe9292197e7d799e12c8cfa562be6f6ba9a118fd3bab8cef19f028439db1befa6da02528e81c7aede7669560d6
+  data.tar.gz: 8cb2c7bfe70dfdab95a8c8d535f5b7397be7b03978808b01a3169979cc6c417eae1f4a9c8e24043b5196aa5bfb678bd50c1778393ed40429f10b58d82f3666fd

data/activerecord-postgis.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.glob('{lib}/**/*') + [ gemspec, 'LICENSE.txt', 'README.md' ]
   spec.require_paths = [ 'lib' ]
 
-  spec.add_dependency 'activerecord', '>= 8.0', '< 8.1'
+  spec.add_dependency 'activerecord', '>= 8.1.0', '< 8.2'
   spec.add_dependency 'pg'
   spec.add_dependency 'rgeo-activerecord', '>= 8.0'
 end

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

@@ -19,6 +19,7 @@ module ActiveRecord
 
           PostgreSQL::Column.new(
             column_name,
+            type_metadata.type,
             default_value,
             type_metadata,
             field["is_nullable"] == "YES",

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

@@ -18,13 +18,15 @@ module ActiveRecord
         end
 
         def type_cast(value)
-          if value.is_a?(RGeo::Feature::Instance)
-            # Convert spatial objects to EWKT string for parameter binding
-            if value.srid && value.srid != 0
-              "SRID=#{value.srid};#{value.as_text}"
-            else
-              value.as_text
-            end
+          if RGeo::Feature::Geometry.check_type(value)
+            # Use EWKB format to preserve SRID information
+            RGeo::WKRep::WKBGenerator.new(
+              hex_format: true,
+              type_format: :ewkb,
+              emit_ewkb_srid: true
+            ).generate(value)
+          elsif value.is_a?(RGeo::Cartesian::BoundingBox)
+            value.to_s
           else
             super
           end

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

@@ -91,6 +91,7 @@ module ActiveRecord
 
           PostgreSQL::Column.new(
             field["column_name"],
+            type_metadata.type,
             default_value,
             type_metadata,
             field["is_nullable"] == "YES",

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

@@ -120,10 +120,15 @@ module ActiveRecord
           return base_type if @type == "geography"
 
           type_with_dimensions = build_type_with_dimensions
-          # Include SRID if specified and not the default for the type
-          # Geography defaults to 4326, geometry defaults to 0
-          should_include_srid = @srid &&
-            ((@geography && @srid != 4326) || (!@geography && @srid != 0))
+          # Include SRID if specified and not the default for the column type
+          # Geography columns: only include SRID if it's not the default 4326
+          # Geometry columns: always include SRID when specified and not 0
+          if @geography
+            should_include_srid = @srid && @srid != 4326
+          else
+            # For geometry columns, always include SRID when explicitly specified and not 0
+            should_include_srid = @srid && @srid != 0
+          end
 
           if should_include_srid
             "#{base_type}(#{type_with_dimensions},#{@srid})"

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

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module PostGIS
+      module SpatialQueries
+        extend ActiveSupport::Concern
+
+        class_methods do
+          # Safe wrapper for ST_Distance queries
+          # Usage: Model.where_st_distance(:column, lon, lat, '<', distance)
+          # For geographic calculations (meters), cast to geography
+          def where_st_distance(column, lon, lat, operator, distance, srid: 4326, geographic: false)
+            if geographic
+              where("ST_Distance(#{column}::geography, ST_SetSRID(ST_MakePoint(?, ?), ?)::geography) #{operator} ?", lon, lat, srid, distance)
+            else
+              where("ST_Distance(#{column}, ST_SetSRID(ST_MakePoint(?, ?), ?)) #{operator} ?", lon, lat, srid, distance)
+            end
+          end
+
+          # Safe wrapper for ST_DWithin queries
+          # Usage: Model.where_st_dwithin(:column, lon, lat, distance)
+          # For geographic calculations (meters), cast to geography
+          def where_st_dwithin(column, lon, lat, distance, srid: 4326, geographic: false)
+            if geographic
+              where("ST_DWithin(#{column}::geography, ST_SetSRID(ST_MakePoint(?, ?), ?)::geography, ?)", lon, lat, srid, distance)
+            else
+              where("ST_DWithin(#{column}, ST_SetSRID(ST_MakePoint(?, ?), ?), ?)", lon, lat, srid, distance)
+            end
+          end
+
+          # Safe wrapper for ST_Contains with point
+          # Usage: Model.where_st_contains(:column, lon, lat)
+          def where_st_contains(column, lon, lat, srid: 4326)
+            where("ST_Contains(#{column}, ST_SetSRID(ST_MakePoint(?, ?), ?))", lon, lat, srid)
+          end
+
+          # Safe wrapper for ST_Within with point
+          # Usage: Model.where_st_within_point(:column, lon, lat)
+          def where_st_within_point(column, lon, lat, srid: 4326)
+            where("ST_Within(ST_SetSRID(ST_MakePoint(?, ?), ?), #{column})", lon, lat, srid)
+          end
+
+          # Safe wrapper for ST_Intersects with WKT geometry
+          # Usage: Model.where_st_intersects(:column, wkt_string)
+          def where_st_intersects(column, wkt, srid: 4326)
+            where("ST_Intersects(#{column}, ST_GeomFromText(?, ?))", wkt, srid)
+          end
+
+          # Generic safe wrapper for any PostGIS function with a point parameter
+          # Usage: Model.where_st_function('ST_Distance', :column, lon, lat, '<', value)
+          def where_st_function(function, column, lon, lat, operator = nil, value = nil, srid: 4326)
+            if operator && value
+              where("#{function}(#{column}, ST_SetSRID(ST_MakePoint(?, ?), ?)) #{operator} ?", lon, lat, srid, value)
+            else
+              where("#{function}(#{column}, ST_SetSRID(ST_MakePoint(?, ?), ?))", lon, lat, srid)
+            end
+          end
+        end
+      end
+
+      # Module to include in models for instance methods
+      module SpatialScopes
+        extend ActiveSupport::Concern
+
+        included do
+          # Define commonly used spatial scopes
+          scope :within_distance, ->(column, lon, lat, distance, srid: 4326, geographic: false) {
+            where_st_distance(column, lon, lat, "<", distance, srid: srid, geographic: geographic)
+          }
+
+          scope :beyond_distance, ->(column, lon, lat, distance, srid: 4326, geographic: false) {
+            where_st_distance(column, lon, lat, ">", distance, srid: srid, geographic: geographic)
+          }
+
+          scope :near, ->(column, lon, lat, distance, srid: 4326, geographic: false) {
+            where_st_dwithin(column, lon, lat, distance, srid: srid, geographic: geographic)
+          }
+
+          scope :containing_point, ->(column, lon, lat, srid: 4326) {
+            where_st_contains(column, lon, lat, srid: srid)
+          }
+
+          scope :intersecting, ->(column, wkt, srid: 4326) {
+            where_st_intersects(column, wkt, srid: srid)
+          }
+        end
+      end
+    end
+  end
+end
+
+# Automatically include in ActiveRecord::Base
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Base.include(ActiveRecord::ConnectionAdapters::PostGIS::SpatialQueries)
+end

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

@@ -3,7 +3,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "0.3.1"
+      VERSION = "0.5.0"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis.rb

@@ -19,6 +19,7 @@ require_relative "postgis/spatial_column_type"
 require_relative "postgis/adapter_extensions"
 require_relative "postgis/column_extensions"
 require_relative "postgis/quoting"
+require_relative "postgis/spatial_queries"
 
 module ActiveRecord
   module ConnectionAdapters

data/lib/arel/visitors/postgis.rb

@@ -19,7 +19,7 @@ module Arel
     class SpatialIntersects < SpatialNode; end
     class SpatialDWithin < SpatialNode
       attr_reader :distance
-      
+
       def initialize(left, right, distance)
         super(left, right)
         @distance = distance
@@ -36,7 +36,7 @@ module Arel
       end
     end
     class SpatialArea < Unary; end
-    
+
     # K-Nearest Neighbor distance operator
     class SpatialDistanceOperator < Binary
       def initialize(left, right)
@@ -83,11 +83,11 @@ module Arel
       def st_area
         SpatialArea.new(self)
       end
-      
+
       def distance_operator(other)
         SpatialDistanceOperator.new(self, other)
       end
-      
+
       alias :'<->' :distance_operator
     end
   end
@@ -129,11 +129,11 @@ module Arel
       def st_area
         Arel::Nodes::SpatialArea.new(self)
       end
-      
+
       def distance_operator(other)
         Arel::Nodes::SpatialDistanceOperator.new(self, other)
       end
-      
+
       alias :'<->' :distance_operator
     end
   end
@@ -143,6 +143,26 @@ module Arel
     Arel::Nodes::SpatialValue.new(value)
   end
 
+  # Add Arel.st_make_point() method that properly handles floats for Rails 8.1
+  def self.st_make_point(x, y, srid = nil)
+    # Wrap floats in SqlLiteral nodes to avoid Rails 8.1 Arel strictness
+    x_node = x.is_a?(Numeric) ? Arel::Nodes::SqlLiteral.new(x.to_s) : x
+    y_node = y.is_a?(Numeric) ? Arel::Nodes::SqlLiteral.new(y.to_s) : y
+
+    if srid
+      srid_node = srid.is_a?(Numeric) ? Arel::Nodes::SqlLiteral.new(srid.to_s) : srid
+      Arel::Nodes::NamedFunction.new(
+        "ST_SetSRID",
+        [
+          Arel::Nodes::NamedFunction.new("ST_MakePoint", [ x_node, y_node ]),
+          srid_node
+        ]
+      )
+    else
+      Arel::Nodes::NamedFunction.new("ST_MakePoint", [ x_node, y_node ])
+    end
+  end
+
   module Visitors
     class PostGIS < PostgreSQL
       include RGeo::ActiveRecord::SpatialToSql
@@ -230,7 +250,7 @@ module Arel
         visit(node.expr, collector)
         collector << ")"
       end
-      
+
       def visit_Arel_Nodes_SpatialDistanceOperator(node, collector)
         visit(node.left, collector)
         collector << " <-> "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -15,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 8.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,7 @@ files:
 - lib/active_record/connection_adapters/postgis/schema_statements.rb
 - lib/active_record/connection_adapters/postgis/spatial_column_methods.rb
 - lib/active_record/connection_adapters/postgis/spatial_column_type.rb
+- lib/active_record/connection_adapters/postgis/spatial_queries.rb
 - lib/active_record/connection_adapters/postgis/table_definition.rb
 - lib/active_record/connection_adapters/postgis/test_helpers.rb
 - lib/active_record/connection_adapters/postgis/type/geography.rb