spatial_features 2.17.3 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0a8fb7f4886f07f02b8b110f7975d91538324d6cf2c5a70b3b247dfb6719c98
-  data.tar.gz: 15c681c5de6fccb10a515c8ff1f8a423a7c9fa1c1fded8955c2072dd76f5d4f2
+  metadata.gz: 41b8326969b8e58e74200ad16194cbc2e6307ba9a1e1b81cc1bc0339ead5ecd5
+  data.tar.gz: aeee4a1a92da17454c61f853cd6cb9917b727dbc4a5bc8095cc74d17846642f5
 SHA512:
-  metadata.gz: 0a9224909db6dd85bf20cf9b9561e78cdc12f094423c86b0280f0e2a96e2dad9ae24030c4a4014b448f566e232b7dd37620d2a8890c411af97487a0047261346
-  data.tar.gz: 740174a0882bc82edd053e4adf31318c6afc51860a66a3d50068e3c106cc8ac9351061f9d4990c652c5f41704815e2d5b8c8ef3d6b7aaa47525d9663f01acce4
+  metadata.gz: 4f793c92a7c6018655bf8cd20f77f0b7b3b106cd8922fede6090c7c3e8513df966fedddbd1f1e5614a9b14f41b47fd3658e0b8db642cd7287138b611b398735a
+  data.tar.gz: 4b965732b239b2fde43d1449fe31862255d03c5e84f34011707cf26ffffd3b9775646712f754863305f1375e3cb64136bef028558c40dc0f823d58db69408eed

data/app/models/abstract_feature.rb

@@ -49,8 +49,7 @@ class AbstractFeature < ActiveRecord::Base
     where(:feature_type => 'point')
   end
 
-  def self.within_distance(lat, lng, distance_in_meters)
-    # where("ST_DWithin(features.geog, ST_SetSRID( ST_Point( -71.104, 42.315), 4326)::geography, :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
+  def self.within_distance_of_point(lat, lng, distance_in_meters)
     where("ST_DWithin(features.geog, ST_Point(:lng, :lat), :distance)", :lat => lat, :lng => lng, :distance => distance_in_meters)
   end
 
@@ -73,6 +72,10 @@ class AbstractFeature < ActiveRecord::Base
     join_other_features(other).where('ST_Intersects(features.geom_lowres, other_features.geom_lowres)').uniq
   end
 
+  def self.within_distance(other, distance_in_meters)
+    join_other_features(other).where('ST_DWithin(features.geom_lowres, other_features.geom_lowres, ?)', distance_in_meters).uniq
+  end
+
   def self.invalid(column = 'geog::geometry')
     select("features.*, ST_IsValidReason(#{column}) AS invalid_geometry_message").where.not("ST_IsValid(#{column})")
   end

data/lib/spatial_features/has_spatial_features/queued_spatial_processing.rb

@@ -11,7 +11,22 @@ module SpatialFeatures
     end
 
     def updating_features?
-      running_feature_update_jobs.exists?
+      case spatial_processing_status(:update_features!)
+      when :queued, :processing
+        true
+      else
+        false
+      end
+    end
+
+    def updating_features_failed?
+      spatial_processing_status(:update_features!) == :failure
+    end
+
+    def spatial_processing_status(method_name)
+      if has_attribute?(:spatial_processing_status_cache)
+        spatial_processing_status_cache[method_name.to_s]&.to_sym
+      end
     end
 
     def feature_update_error
@@ -27,17 +42,58 @@ module SpatialFeatures
     end
 
     def spatial_processing_jobs(suffix = nil)
-      Delayed::Job.where('queue LIKE ?', "#{spatial_processing_queue_name}#{suffix}%")
+      Delayed::Job.where(:queue => "#{spatial_processing_queue_name}#{suffix}")
     end
 
     private
 
     def queue_spatial_task(method_name, *args)
-      delay(:queue => spatial_processing_queue_name + method_name).send(method_name, *args)
+      Delayed::Job.enqueue SpatialProcessingJob.new(self, method_name, *args), :queue => spatial_processing_queue_name + method_name
     end
 
     def spatial_processing_queue_name
-      "#{self.class}/#{self.id}/"
+      "#{model_name}/#{id}/"
+    end
+
+    # CLASSES
+
+    class SpatialProcessingJob
+      def initialize(record, method_name, *args)
+        @record = record
+        @method_name = method_name
+        @args = args
+      end
+
+      def enqueue(job)
+        update_cached_status(:queued)
+      end
+
+      def perform
+        update_cached_status(:processing)
+        @record.send(@method_name, *@args)
+      end
+
+      def success(job)
+        update_cached_status(:success)
+      end
+
+      def error(job)
+        update_cached_status(:failure)
+      end
+
+      def failure(job)
+        update_cached_status(:failure)
+      end
+
+      private
+
+      def update_cached_status(state)
+        if @record.has_attribute?(:spatial_processing_status_cache)
+          cache = @record.spatial_processing_status_cache || {}
+          cache[@method_name] = state
+          @record.update_column(:spatial_processing_status_cache, cache)
+        end
+      end
     end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.17.3"
+  VERSION = "2.18.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.17.3
+  version: 2.18.0
 platform: ruby
 authors:
 - Ryan Wallace
 - Nicholas Jakobsen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,7 +175,7 @@ homepage: https://github.com/culturecode/spatial_features
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.
 test_files: []