Merge pull request #50 from culturecode/rails-8-support

Support Rails 8

Author: rywall

.github/workflows/ci.yml

@@ -11,8 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["3.2"]
-        gemfile: ["rails_7_0"]
+        ruby-version: ["3.2", "4.0"]
+        gemfile: ["rails_7_0", "rails_8_0"]
+        exclude:
+          - ruby-version: "4.0"
+            gemfile: "rails_7_0"
+          - ruby-version: "3.2"
+            gemfile: "rails_8_0"
       fail-fast: false
 
     env:
@@ -38,7 +43,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
       # libgeos and gdal are required and must be installed before `bundle install`
       # NB: if you add libs here that are required for Gem native extensions be sure to clear the

app/models/abstract_feature.rb

@@ -7,7 +7,7 @@ class AbstractFeature < ActiveRecord::Base
   class_attribute :lowres_simplification
   self.lowres_simplification = 2 # Threshold in meters
 
-  belongs_to :spatial_model, :polymorphic => :true, :autosave => false
+  belongs_to :spatial_model, polymorphic: :true, autosave: false
 
   attr_writer :make_valid
 
@@ -16,7 +16,7 @@ class AbstractFeature < ActiveRecord::Base
   validates_presence_of :geog
   validate :validate_geometry, if: :will_save_change_to_geog?
   before_save :sanitize, if: :will_save_change_to_geog?
-  after_save :cache_derivatives, :if => [:automatically_cache_derivatives?, :saved_change_to_geog?]
+  after_save :cache_derivatives, if: [:automatically_cache_derivatives?, :saved_change_to_geog?]
 
   def self.cache_key
     collection_cache_key
@@ -41,15 +41,15 @@ def self.metadata_keys
   end
 
   def self.polygons
-    where(:feature_type => 'polygon')
+    where(feature_type: 'polygon')
   end
 
   def self.lines
-    where(:feature_type => 'line')
+    where(feature_type: 'line')
   end
 
   def self.points
-    where(:feature_type => 'point')
+    where(feature_type: 'point')
   end
 
   def self.within_distance_of_point(lat, lng, distance_in_meters, geom = 'geom_lowres')
@@ -59,7 +59,7 @@ def self.within_distance_of_point(lat, lng, distance_in_meters, geom = 'geom_low
       else "ST_Transform(ST_SetSRID(ST_Point(:lng, :lat), 4326), #{detect_srid(geom)})"
       end
 
-    binds = { :lng => lng.to_d, :lat => lat.to_d }
+    binds = { lng: lng.to_d, lat: lat.to_d }
 
     within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
   end
@@ -71,7 +71,7 @@ def self.within_distance_of_line(points, distance_in_meters, geom = 'geom_lowres
       else "ST_Transform(ST_SetSRID(:points::geometry, 4326), #{detect_srid(geom)})"
       end
 
-    binds = { :points => "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
+    binds = { points: "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
 
     within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
   end
@@ -83,14 +83,14 @@ def self.within_distance_of_polygon(points, distance_in_meters, geom = 'geom_low
       else "ST_Transform(ST_Polygon(:points::geometry, 4326), #{detect_srid(geom)})"
       end
 
-    binds = { :points => "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
+    binds = { points: "LINESTRING(#{points.map {|coords| coords.join(' ') }.join(', ')})" }
 
     within_distance_of_sql(point_sql, distance_in_meters, geom, **binds)
   end
 
   def self.within_distance_of_sql(geometry_sql, distance_in_meters, features_column = 'geom_lowres', **binds)
     if distance_in_meters.to_f > 0
-      where("ST_DWithin(features.#{features_column}, #{geometry_sql}, :distance)", **binds, :distance => distance_in_meters)
+      where("ST_DWithin(features.#{features_column}, #{geometry_sql}, :distance)", **binds, distance: distance_in_meters)
     else
       where("ST_Intersects(features.#{features_column}, #{geometry_sql})", **binds)
     end
@@ -128,7 +128,7 @@ def self.valid
   end
 
   def envelope(buffer_in_meters = 0)
-    envelope_json = JSON.parse(self.class.select("ST_AsGeoJSON(ST_Envelope(ST_Buffer(features.geog, #{buffer_in_meters})::geometry)) AS result").where(:id => id).first.result)
+    envelope_json = JSON.parse(self.class.select("ST_AsGeoJSON(ST_Envelope(ST_Buffer(features.geog, #{buffer_in_meters})::geometry)) AS result").where(id: id).first.result)
     envelope_json = envelope_json["coordinates"].first
 
     raise "Can't calculate envelope for Feature #{self.id}" if envelope_json.blank?
@@ -257,12 +257,12 @@ def bounds
   end
 
   def cache_derivatives(*args)
-    self.class.default_scoped.where(:id => self.id).cache_derivatives(*args)
+    self.class.default_scoped.where(id: self.id).cache_derivatives(*args)
   end
 
   def kml(options = {})
     column = options[:lowres] ? 'geom_lowres' : 'geog'
-    return SpatialFeatures::Utils.select_db_value(self.class.where(:id => id).select("ST_AsKML(#{column}, 6)"))
+    return SpatialFeatures::Utils.select_db_value(self.class.where(id: id).select("ST_AsKML(#{column}, 6)"))
   end
 
   def geojson(*args)
@@ -290,7 +290,7 @@ def self.detect_srid(column_name)
   end
 
   def self.join_other_features(other)
-    joins('INNER JOIN features AS other_features ON true').where(:other_features => {:id => other})
+    joins('INNER JOIN features AS other_features ON true').where(other_features: {id: other})
   end
 
   def validate_geometry

app/models/aggregate_feature.rb

@@ -1,10 +1,10 @@
 require_dependency SpatialFeatures::Engine.root.join('app/models/abstract_feature')
 
 class AggregateFeature < AbstractFeature
-  has_many :features, lambda { |aggregate| where(:spatial_model_type => aggregate.spatial_model_type) }, :foreign_key => :spatial_model_id, :primary_key => :spatial_model_id
+  has_many :features, lambda { |aggregate| where(spatial_model_type: aggregate.spatial_model_type) }, foreign_key: :spatial_model_id, primary_key: :spatial_model_id
 
   # Aggregate the features for the spatial model into a single feature
-  before_validation :set_geog, :on => :create, :unless => :geog?
+  before_validation :set_geog, on: :create, unless: :geog?
 
   private
 

app/models/feature.rb

@@ -7,9 +7,9 @@ class Feature < AbstractFeature
   class_attribute :lowres_precision
   self.lowres_precision = 5
 
-  has_one :aggregate_feature, lambda { |feature| where(:spatial_model_type => feature.spatial_model_type) }, :foreign_key => :spatial_model_id, :primary_key => :spatial_model_id
+  has_one :aggregate_feature, lambda { |feature| where(spatial_model_type: feature.spatial_model_type) }, foreign_key: :spatial_model_id, primary_key: :spatial_model_id
 
-  scope :source_identifier, lambda {|source_identifier| where(:source_identifier => source_identifier) if source_identifier.present? }
+  scope :source_identifier, lambda {|source_identifier| where(source_identifier: source_identifier) if source_identifier.present? }
 
   before_save :truncate_name
 
@@ -21,7 +21,7 @@ def self.defer_aggregate_refresh(&block)
     start_at = Feature.maximum(:id).to_i + 1
     output = without_aggregate_refresh(&block)
 
-    where(:id => start_at..Float::INFINITY).refresh_aggregates
+    where(id: start_at..Float::INFINITY).refresh_aggregates
 
     return output
   end
@@ -36,13 +36,13 @@ def self.without_aggregate_refresh
 
   def self.refresh_aggregates
     # Find one feature from each spatial model and trigger the aggregate feature refresh
-    ids = where.not(:spatial_model_type => nil)
-            .where.not(:spatial_model_id => nil)
+    ids = where.not(spatial_model_type: nil)
+            .where.not(spatial_model_id: nil)
             .group('spatial_model_type, spatial_model_id')
             .pluck('MAX(id)')
 
     # Unscope so that newly built AggregateFeatures get their type column set correctly
-    AbstractFeature.unscoped { where(:id => ids).find_each(&:refresh_aggregate) }
+    AbstractFeature.unscoped { where(id: ids).find_each(&:refresh_aggregate) }
   end
 
   def refresh_aggregate

app/models/spatial_cache.rb

@@ -1,9 +1,9 @@
 class SpatialCache < ActiveRecord::Base
-  belongs_to :spatial_model, :polymorphic => true, :inverse_of => :spatial_caches
+  belongs_to :spatial_model, polymorphic: true, inverse_of: :spatial_caches
 
   def self.between(spatial_model, klass)
     where(SpatialFeatures::Utils.polymorphic_condition(spatial_model, 'spatial_model'))
-    .where(:intersection_model_type => SpatialFeatures::Utils.class_name_with_ancestors(klass))
+    .where(intersection_model_type: SpatialFeatures::Utils.class_name_with_ancestors(klass))
   end
 
   def stale?

app/models/spatial_proximity.rb

@@ -1,6 +1,6 @@
 class SpatialProximity < ActiveRecord::Base
-  belongs_to :model_a, :polymorphic => true
-  belongs_to :model_b, :polymorphic => true
+  belongs_to :model_a, polymorphic: true
+  belongs_to :model_b, polymorphic: true
 
   def self.between(scope1, scope2)
     where condition_sql(scope1, scope2, <<~SQL.squish)

gemfiles/rails_6_1.gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0", "< 6.1"
+gem "activerecord", "~> 8"
 
 gemspec path: "../"

gemfiles/rails_6_0.gemfile gemfiles/rails_8_0.gemfilegemfiles/rails_6_0.gemfile renamed to gemfiles/rails_8_0.gemfile

@@ -69,16 +69,16 @@ def self.clear_cache(klass = nil, clazz = nil)
   end
 
   def self.clear_record_cache(record, klass)
-    record.spatial_caches.where(:intersection_model_type => SpatialFeatures::Utils.class_name_with_ancestors(klass)).delete_all
+    record.spatial_caches.where(intersection_model_type: SpatialFeatures::Utils.class_name_with_ancestors(klass)).delete_all
     SpatialProximity.between(record, klass).delete_all
   end
 
   def self.create_spatial_proximities(record, klass)
     klass = klass.to_s.constantize
     klass_record = klass.new
 
-    scope = klass.within_buffer(record, default_cache_buffer_in_meters, :columns => :id, :intersection_area => true, :distance => true, :cache => false)
-    scope = scope.where.not(:id => record.id) if klass.table_name == record.class.table_name # Don't calculate self proximity
+    scope = klass.within_buffer(record, default_cache_buffer_in_meters, columns: :id, intersection_area: true, distance: true, cache: false)
+    scope = scope.where.not(id: record.id) if klass.table_name == record.class.table_name # Don't calculate self proximity
     results = klass.connection.select_rows(scope.to_sql)
 
     results.each do |id, distance, area|

lib/spatial_features/caching.rb

@@ -15,29 +15,29 @@ def abstract_clear_feature_update_errors(models)
   end
 
   def abstract_proximity_action(scope, target, distance, &block)
-    @nearby_records = scope_for_search(scope).within_buffer(target, distance, :distance => true, :intersection_area => true).order('distance_in_meters ASC, intersection_area_in_square_meters DESC, id ASC')
+    @nearby_records = scope_for_search(scope).within_buffer(target, distance, distance: true, intersection_area: true).order('distance_in_meters ASC, intersection_area_in_square_meters DESC, id ASC')
     @target = target
 
     if block_given?
       block.call(@nearby_records)
     else
       respond_to do |format|
-        format.html { render :template => 'shared/spatial/feature_proximity', :layout => false }
-        format.kml { render :template => 'shared/spatial/feature_proximity' }
+        format.html { render template: 'shared/spatial/feature_proximity', layout: false }
+        format.kml { render template: 'shared/spatial/feature_proximity' }
       end
     end
   end
 
   def abstract_venn_polygons_action(scope, target, &block)
-    @venn_polygons = SpatialFeatures.venn_polygons(scope_for_search(scope).intersecting(target), target.class.where(:id => target), :target => target)
+    @venn_polygons = SpatialFeatures.venn_polygons(scope_for_search(scope).intersecting(target), target.class.where(id: target), target: target)
     @klass = klass_for_search(scope)
     @target = target
 
     if block_given?
       block.call(@venn_polygons)
     else
       respond_to do |format|
-        format.kml { render :template => 'shared/spatial/feature_venn_polygons' }
+        format.kml { render template: 'shared/spatial/feature_venn_polygons' }
       end
     end
   end
@@ -50,7 +50,7 @@ def scope_for_search(scope)
     if params.key?(:ids)
       ids = params[:ids]
       ids = ids.split(/\D/) if ids.is_a?(String)
-      scope.where(:id => ids)
+      scope.where(id: ids)
     else
       scope
     end