spatial_features 2.7.4 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca12b6b107350864c5a353d6a7fe587676c1661e1d54bd8cbccb57733e49926
-  data.tar.gz: 7272b1807b1335b7ea22fc1cae398780f13acd095f5d5c8a0436dfa2ed6c6b17
+  metadata.gz: 13dafdeb45681a5a529ee77c0c54d8306d35858e7c715c8f6845bf7bac4ff51e
+  data.tar.gz: 9789d728e2a2fcd7cb3903637bb3fa61c01e323c99b38bf677fbfcdc06cc2bb4
 SHA512:
-  metadata.gz: eec0cf39ea56064d74eb3b7efc90be1903377dd9035f5e0be8a8de8b4cb6088ab607087b025f7bee1178f6a974386dd74b59f1f4f5045b5af3959d25eb8669d5
-  data.tar.gz: bce6ce396af2a8ba10f11eded504d26e00be348ca15211ba04adca5310698b11e66a177fe0d081a0511d94a14eed89b8d8f280db0de54cc0019895b6a7d67eab
+  metadata.gz: f0f614d22d3df5c3fbdeda0875d95b31b7a2b843ee012aafa240996a3ffe6ea00c1854b470945dcf3151ed3427daac680856c176b72419fad3f18dfa00418307
+  data.tar.gz: e0b1535e925c8376fcfb20a13e70d1f1ae80dcfc7b709f755140aae94b70f8118dd95c7cd040d7f8441493d79d339e106838e3f757cac7eec2249023b0f7657c

data/app/models/spatial_cache.rb

@@ -3,7 +3,7 @@ class SpatialCache < ActiveRecord::Base
 
   def self.between(spatial_model, klass)
     where(SpatialFeatures::Utils.polymorphic_condition(spatial_model, 'spatial_model'))
-    .where(:intersection_model_type => klass.to_s)
+    .where(:intersection_model_type => SpatialFeatures::Utils.class_name_with_ancestors(klass))
   end
 
   def stale?

data/lib/spatial_features/caching.rb

@@ -3,7 +3,7 @@ module SpatialFeatures
   self.default_cache_buffer_in_meters = 100
 
   def self.update_proximity(*klasses)
-    klasses.permutation(2).each do |klass, clazz|
+    class_permutations(klasses).each do |klass, clazz|
       klass.without_spatial_cache(clazz).find_each do |record|
         cache_record_proximity(record, clazz)
       end
@@ -26,7 +26,7 @@ module SpatialFeatures
   # NOTE: Arguments are order independent, so their names do not reflect the _a _b
   # naming scheme used in other cache methods
   def self.cache_proximity(*klasses)
-    klasses.combination(2).each do |klass, clazz|
+    class_combinations(klasses).each do |klass, clazz|
       clear_cache(klass, clazz)
 
       klass.find_each do |record|
@@ -40,6 +40,16 @@ module SpatialFeatures
     end
   end
 
+  # Returns a list of class pairs with each combination e.g. [a,b], [a,c] [b,c] and also [a,a], [b,b], [c,c]
+  def self.class_combinations(klasses)
+    klasses.zip(klasses) + klasses.combination(2).to_a
+  end
+
+  # Returns a list of class pairs with each permutation e.g. [a,b], [b,a] and also [a,a], [b,b]
+  def self.class_permutations(klasses)
+    klasses.zip(klasses) + klasses.permutation(2).to_a
+  end
+
   # Create or update the spatial cache of a single record in relation to another spatial class
   def self.cache_record_proximity(record, klass)
     clear_record_cache(record, klass)
@@ -59,14 +69,14 @@ module SpatialFeatures
   end
 
   def self.clear_record_cache(record, klass)
-    record.spatial_caches.where(:intersection_model_type => klass.to_s).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
-    model_a, model_b = record.class.to_s < klass.to_s ? [record, klass_record] : [klass_record, record]
+    model_a, model_b = Utils.base_class(record).to_s < Utils.base_class(klass).to_s ? [record, klass_record] : [klass_record, record]
 
     scope = klass.within_buffer(record, default_cache_buffer_in_meters, :columns => :id, :intersection_area => true, :distance => true, :cache => false)
     results = klass.connection.select_rows(scope.to_sql)
@@ -76,9 +86,9 @@ module SpatialFeatures
       SpatialProximity.create! do |proximity|
         # Set id and type instead of model to avoid autosaving the klass_record
         proximity.model_a_id = model_a.id
-        proximity.model_a_type = model_a.class
+        proximity.model_a_type = Utils.base_class(model_a)
         proximity.model_b_id = model_b.id
-        proximity.model_b_type = model_b.class
+        proximity.model_b_type = Utils.base_class(model_b)
         proximity.distance_in_meters = distance
         proximity.intersection_area_in_square_meters = area
       end

data/lib/spatial_features/has_spatial_features.rb

@@ -13,10 +13,10 @@ module SpatialFeatures
         has_many :features, lambda { extending FeaturesAssociationExtensions }, :as => :spatial_model, :dependent => :delete_all
 
         scope :with_features, lambda { joins(:features).uniq }
-        scope :without_features, lambda { joins("LEFT OUTER JOIN features ON features.spatial_model_type = '#{name}' AND features.spatial_model_id = #{table_name}.id").where("features.id IS NULL") }
+        scope :without_features, lambda { joins("LEFT OUTER JOIN features ON features.spatial_model_type = '#{Utils.base_class(name)}' AND features.spatial_model_id = #{table_name}.id").where("features.id IS NULL") }
 
-        scope :with_spatial_cache, lambda {|klass| joins(:spatial_caches).where(:spatial_caches => { :intersection_model_type =>  klass }).uniq }
-        scope :without_spatial_cache, lambda {|klass| joins("LEFT OUTER JOIN #{SpatialCache.table_name} ON #{SpatialCache.table_name}.spatial_model_id = #{table_name}.id AND #{SpatialCache.table_name}.spatial_model_type = '#{name}' and intersection_model_type = '#{klass}'").where("#{SpatialCache.table_name}.spatial_model_id IS NULL") }
+        scope :with_spatial_cache, lambda {|klass| joins(:spatial_caches).where(:spatial_caches => { :intersection_model_type =>  Utils.class_name_with_ancestors(klass) }).uniq }
+        scope :without_spatial_cache, lambda {|klass| joins("LEFT OUTER JOIN #{SpatialCache.table_name} ON #{SpatialCache.table_name}.spatial_model_id = #{table_name}.id AND #{SpatialCache.table_name}.spatial_model_type = '#{Utils.base_class(name)}' and intersection_model_type IN ('#{Utils.class_name_with_ancestors(klass).join("','") }')").where("#{SpatialCache.table_name}.spatial_model_id IS NULL") }
         scope :with_stale_spatial_cache, lambda { joins(:spatial_caches).where("#{table_name}.features_hash != spatial_caches.features_hash").uniq } if has_spatial_features_hash?
 
         has_many :spatial_caches, :as => :spatial_model, :dependent => :delete_all, :class_name => 'SpatialCache'
@@ -113,12 +113,13 @@ module SpatialFeatures
     end
 
     def cached_spatial_join(other)
-      other_class = Utils.class_of(other)
+      other_class = Utils.base_class_of(other)
+      self_class = Utils.base_class_of(self)
 
-      other_column = other_class.name < self.name ? :model_a : :model_b
+      other_column = other_class.name < self_class.name ? :model_a : :model_b
       self_column = other_column == :model_a ? :model_b : :model_a
 
-      joins("INNER JOIN spatial_proximities ON spatial_proximities.#{self_column}_type = '#{self}' AND spatial_proximities.#{self_column}_id = #{table_name}.id AND spatial_proximities.#{other_column}_type = '#{other_class}' AND spatial_proximities.#{other_column}_id IN (#{Utils.id_sql(other)})")
+      joins("INNER JOIN spatial_proximities ON spatial_proximities.#{self_column}_type = '#{self_class}' AND spatial_proximities.#{self_column}_id = #{table_name}.id AND spatial_proximities.#{other_column}_type = '#{other_class}' AND spatial_proximities.#{other_column}_id IN (#{Utils.id_sql(other)})")
     end
 
     def uncached_within_buffer_scope(other, buffer_in_meters, options)
@@ -153,7 +154,7 @@ module SpatialFeatures
 
     def features_scope(other)
       scope = Feature
-      scope = scope.where(:spatial_model_type => Utils.class_of(other))
+      scope = scope.where(:spatial_model_type => Utils.base_class_of(other))
       scope = scope.where(:spatial_model_id => other) unless Utils.class_of(other) == other
       return scope
     end
@@ -205,7 +206,7 @@ module SpatialFeatures
     end
 
     def spatial_cache_for?(other, buffer_in_meters)
-      if cache = spatial_caches.between(self, SpatialFeatures::Utils.class_of(other)).first
+      if cache = spatial_caches.between(self, Utils.class_of(other)).first
         return cache.intersection_cache_distance.nil? if buffer_in_meters.nil? # cache must be total if no buffer_in_meters
         return false if cache.stale? # cache must be for current features
         return true if cache.intersection_cache_distance.nil? # always good if cache is total

data/lib/spatial_features/utils.rb

@@ -6,7 +6,26 @@ module SpatialFeatures
       sql = "#{column_name}_type = ?"
       sql << " AND #{column_name}_id IN (#{id_sql(scope)})" unless scope.is_a?(Class)
 
-      return class_of(scope).send :sanitize_sql, [sql, class_of(scope)]
+      return class_of(scope).send :sanitize_sql, [sql, base_class_of(scope)]
+    end
+
+    def class_name_with_ancestors(object)
+      class_of(object).ancestors.select {|k| k < ActiveRecord::Base }.map(&:to_s)
+    end
+
+    def base_class_of(object)
+      base_class(class_of(object))
+    end
+
+    def base_class(klass)
+      case klass
+      when String
+        klass.constantize.base_class.to_s
+      when ActiveRecord::Base
+        klass.class.base_class
+      when Class
+        klass.base_class
+      end
     end
 
     # Returns the class for the given, class, scope, or record

data/lib/spatial_features/venn_polygons.rb

@@ -29,7 +29,7 @@ module SpatialFeatures
     if options[:target]
       sql <<
         "INNER JOIN features
-          ON features.spatial_model_type = '#{options[:target].class}' AND features.spatial_model_id = #{options[:target].id} AND ST_Intersects(features.geom, venn_polygons.geom) "
+          ON features.spatial_model_type = '#{Utils.base_class(options[:target].class)}' AND features.spatial_model_id = #{options[:target].id} AND ST_Intersects(features.geom, venn_polygons.geom) "
     end
 
     # Join with the original polygons so we can determine which original polygons each venn polygon came from

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.7.4"
+  VERSION = "2.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.5
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails