activerecord-postgis 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b0a720bdf3520ba032d20033a4259e1875bd37ec97e9e517b0b1b1ac647e40
-  data.tar.gz: 4c2ff56e23a305ad149fb61b9f84d8742675e62358f80c4cd8708a488c7b3f67
+  metadata.gz: c4caab5fe6b63c11ebb789f2e77cb8997ac1c495333cc08e2cba397e043916fa
+  data.tar.gz: a8688b2c439daf278f07fe7c9ff00fd791ef82f964a74f0032ec088e5a495144
 SHA512:
-  metadata.gz: 1a3849e3b5f56491964affeaac36f53317bc6fe1d77557067171b00197b0af5675b5aa090250efe9d083f51bf94e531b2965ed97802e704f4969e3e840cf4485
-  data.tar.gz: a4d2916514e25e89fd722567cddd90fe96bbda946c3de5c110018f6d20ad2b3e395049a5c4960bec1d565d03824340b22ed7c8f1bce92f3bbad4f5e6c1fabbba
+  metadata.gz: 55b212ec58aff548cd55062d88728b75383859b246a66cd49cda54e1f86d2acde0ad3b6a3df8d921e4e7678efe99c9898f78efa4557e978b9361e520996bd823
+  data.tar.gz: 5c33782d1350c14a8f8bf1edbe3ae8495bd40527293241f80e5d6b140f964c70b953d2f3fc8b513a1c5df8fb218c896540d6fcc80645ef4573c7e7460abc11e0

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

@@ -25,9 +25,9 @@ module ActiveRecord
                 has_z = geo_part.end_with?("Z") || geo_part.end_with?("ZM")
                 has_m = geo_part.end_with?("M") || geo_part.end_with?("ZM")
               end
-            elsif o.limit.is_a?(String) && o.limit.include?(",")
+            elsif o.options[:limit].is_a?(String) && o.options[:limit].include?(",")
               # Fallback to parsing limit string (for schema loading)
-              geo_part, srid_part = o.limit.split(",", 2)
+              geo_part, srid_part = o.options[:limit].split(",", 2)
               srid = srid_part.to_i if srid_part && !srid_part.empty?
               if geo_part
                 has_z = geo_part.end_with?("Z") || geo_part.end_with?("ZM")
@@ -42,9 +42,9 @@ module ActiveRecord
             end
 
             sql_type = type_to_sql(o.type.to_sym,
-                                   limit: o.options[:spatial_sql] || o.limit,
-                                   precision: o.precision,
-                                   scale: o.scale,
+                                   limit: o.options[:spatial_sql] || o.options[:limit],
+                                   precision: o.options[:precision],
+                                   scale: o.options[:scale],
                                    srid: srid,
                                    geographic: geographic,
                                    has_z: has_z,

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

@@ -22,8 +22,9 @@ module ActiveRecord
           end
 
           if spatial_column_type?(col_type)
-            if (limit = options.delete(:limit)) && limit.is_a?(::Hash)
-              options.merge!(limit)
+            case (limit = options.delete(:limit))
+            when ::Hash then options.merge!(limit)
+            when ::String then options.reverse_merge!(ColumnDefinitionUtils.options_from_limit(limit))
             end
 
             # Set geographic option for geography types
@@ -125,6 +126,17 @@ module ActiveRecord
             end
           end
 
+          # Inverse of limit_from_options: "POINTZ,4326" => { srid: 4326, has_z: true }
+          def options_from_limit(limit)
+            geo_part, srid_part = limit.split(",", 2)
+            dimensions = geo_part.to_s.upcase[/(ZM|Z|M)\z/].to_s
+            options = {}
+            options[:srid] = Integer(srid_part) if srid_part.present?
+            options[:has_z] = true if dimensions.include?("Z")
+            options[:has_m] = true if dimensions.include?("M")
+            options
+          end
+
           def limit_from_options(type, options = {})
             has_z = options[:has_z] ? "Z" : ""
             has_m = options[:has_m] ? "M" : ""

data/lib/active_record/connection_adapters/postgis/type/spatial.rb

@@ -15,13 +15,6 @@ module ActiveRecord
             @has_z = has_z
             @has_m = has_m
             @geographic = geographic
-            @factory = RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
-              geo_type: @geo_type.underscore,
-              srid: srid,
-              has_z: has_z,
-              has_m: has_m,
-              sql_type: (@geographic ? "geography" : "geometry")
-            )
           end
 
           def type
@@ -40,6 +33,18 @@ module ActiveRecord
 
           private
 
+          # Not memoized: types are frozen for Ractor sharing, and factories
+          # hold mutexes/procs. SpatialFactoryStore already caches them.
+          def factory
+            RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+              geo_type: @geo_type.underscore,
+              srid: @srid,
+              has_z: @has_z,
+              has_m: @has_m,
+              sql_type: (@geographic ? "geography" : "geometry")
+            )
+          end
+
           def cast_value(value)
             case value
             when ::RGeo::Feature::Instance
@@ -56,11 +61,11 @@ module ActiveRecord
           def parse_wkt(string)
             if binary_string?(string)
               # Parse WKB (Well-Known Binary) format
-              wkb_parser = RGeo::WKRep::WKBParser.new(@factory, support_ewkb: true, default_srid: @srid)
+              wkb_parser = RGeo::WKRep::WKBParser.new(factory, support_ewkb: true, default_srid: @srid)
               wkb_parser.parse(string)
             else
               # Parse WKT (Well-Known Text) format
-              wkt_parser = RGeo::WKRep::WKTParser.new(@factory, support_ewkt: true, default_srid: @srid)
+              wkt_parser = RGeo::WKRep::WKTParser.new(factory, support_ewkt: true, default_srid: @srid)
               wkt_parser.parse(string)
             end
           rescue RGeo::Error::ParseError
@@ -74,7 +79,7 @@ module ActiveRecord
           def parse_hash(hash)
             # Support GeoJSON-style hash
             if hash["type"] && hash["coordinates"]
-              RGeo::GeoJSON.decode(hash.to_json, geo_factory: @factory)
+              RGeo::GeoJSON.decode(hash.to_json, geo_factory: factory)
             else
               nil
             end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: PostGIS Type support for ActiveRecord
 test_files: []