spatial_features 2.19.0 → 2.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d49ba8050fb39cb929127a633f92bddc901d7851e5e02ac7459db8edbfe790
-  data.tar.gz: 3f0c2d8ed22051efe5e11f0735c5430d8f9a0d11c94550b2719be338531e0f1e
+  metadata.gz: 36eed2c1325bed9be0605ee197dfe74770fd86e2a0e0c032e73937db73519ebc
+  data.tar.gz: dc7959b2ed3f6ca983c0dc22c50842bdbf78b73ab47ec8279a8101f0f850f99b
 SHA512:
-  metadata.gz: c6d53a0c2c448b51f9344e39be1e271f8a084ccee0e1d3aeefd0252c3d9dfb2b7afcb8ab0b6822e1485a44aecdf79f62615f59f6f169073c74fc61ce70107d32
-  data.tar.gz: 7dc96d943a8a8695d05ad246c4ffaaa166ff4be40fe10745a671ac4ae89b72ecbae810241fd1dde605d72c57989695d7cbb07a55575799dd8b65eb32d8819d61
+  metadata.gz: cf5986e2b8473f571c7faef6044a34b14171779ad46724b3d38916570ca47dff17e57e0ea5ee6d8ae599032ae197ef7177b7113d77911495dc87413570ba630a
+  data.tar.gz: 95dbc3d2c8c8dc2535930304823f91746ef293091b70ff9c530fcebdeff65ca8dabca66db78ce6bf68919f4cb5d1afb0b3db8e3ee414130e600b956a285a6a1e

data/app/models/aggregate_feature.rb

@@ -4,7 +4,11 @@ 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
 
   # Aggregate the features for the spatial model into a single feature
-  def refresh
+  before_validation :set_geog, :on => :create, :unless => :geog?
+
+  private
+
+  def set_geog
     feature_array_sql = <<~SQL
       ARRAY[
         (#{features.select('ST_UNION(ST_CollectionExtract(geog::geometry, 1))').to_sql}),
@@ -19,6 +23,5 @@ class AggregateFeature < AbstractFeature
       FROM (SELECT unnest(#{feature_array_sql})) AS features
       WHERE NOT ST_IsEmpty(unnest)
     SQL
-    self.save!
   end
 end

data/app/models/feature.rb

@@ -1,3 +1,5 @@
+require_dependency SpatialFeatures::Engine.root.join('app/models/abstract_feature')
+
 class Feature < AbstractFeature
   class_attribute :automatically_refresh_aggregate
   self.automatically_refresh_aggregate = true
@@ -52,8 +54,8 @@ class Feature < AbstractFeature
   end
 
   def refresh_aggregate
-    build_aggregate_feature unless aggregate_feature&.persisted?
-    aggregate_feature.refresh
+    aggregate_feature&.destroy # Destroy the existing aggregate feature to ensure its cache key changes when it is refreshed
+    create_aggregate_feature!
   end
 
   def automatically_refresh_aggregate?

data/lib/spatial_features/has_spatial_features/queued_spatial_processing.rb

@@ -77,7 +77,7 @@ module SpatialFeatures
         update_cached_status(:success)
       end
 
-      def error(job)
+      def error(job, exception)
         update_cached_status(:failure)
       end
 

data/lib/spatial_features/unzip.rb

@@ -2,6 +2,9 @@ require 'fileutils'
 
 module SpatialFeatures
   module Unzip
+    # paths containing '__macosx' or beginning with a '.'
+    IGNORED_ENTRY_PATHS = /(\A|\/)(__macosx|\.)/i.freeze
+
     def self.paths(file_path, find: nil, **extract_options)
       paths = extract(file_path, **extract_options)
 
@@ -16,6 +19,7 @@ module SpatialFeatures
     def self.extract(file_path, output_dir = Dir.mktmpdir, downcase: false)
       [].tap do |paths|
         entries(file_path).each do |entry|
+          next if entry.name =~ IGNORED_ENTRY_PATHS
           output_filename = entry.name
           output_filename = output_filename.downcase if downcase
           path = "#{output_dir}/#{output_filename}"

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.19.0"
+  VERSION = "2.19.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.19.1
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,7 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.