spatial_features 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67375fd4d6b858c5ec8328bd8aaa32c71941d8766191930548c92c85c0956b98
-  data.tar.gz: b218f666a84ef5d134871fba0b601ee9670878e7bdca9ee6836333e1d00f1a27
+  metadata.gz: 4b6abe862ed5f56fddc3c661c0f07441d9688203396289bb106a103b9d0d60ef
+  data.tar.gz: c1962522d534ce23508a6eab05742ea7ba427415f0b662ab0a0f202b7f81d084
 SHA512:
-  metadata.gz: 6bd79356822d20f5b760170af7e7503f7804ada6806496e41659a1fa8053fe0b9abdbc561720528410521ce7612a35b29958937bb15601c58de66c22d4877db6
-  data.tar.gz: 13a0194979498974b8c4c0607c2333942fab881e583a2a6e2d3e6bef631517e156171e2654559a8a21ef69061a6f0adb5ecd62846d2e85b1a64487f8b25a42f1
+  metadata.gz: f13503272dbd7d176ec814aae1b09e353f175370be2a26a069d595bdef141ef80ea2bd6c489026b4add5311f0cd81582f75633ddd3bcb1ad813fae840a21ab9b
+  data.tar.gz: 2ebcb0781feb12c6058043d55fa57b06a7a7b3edb98837c8a047c8fa8abb133be5a2a82e78a2cf83a38c9b47e9c76eb21a90da1cdc9cdd7f601edf5ab9c2a01d

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(SpatialFeatures::Utils.polymorphic_condition(klass, 'intersection_model'))
+    .where(:intersection_model_type => klass.to_s)
   end
 
   def stale?

data/lib/spatial_features/caching.rb

@@ -59,7 +59,7 @@ module SpatialFeatures
   end
 
   def self.clear_record_cache(record, klass)
-    record.spatial_caches.where(:intersection_model_type => klass).delete_all
+    record.spatial_caches.where(:intersection_model_type => klass.to_s).delete_all
     SpatialProximity.between(record, klass).delete_all
   end
 

data/lib/spatial_features/has_spatial_features.rb

@@ -72,7 +72,7 @@ module SpatialFeatures
     end
 
     def features
-      type = base_class # Rails stores polymorphic foreign keys as the base class
+      type = base_class.to_s # Rails stores polymorphic foreign keys as the base class
       if all == unscoped
         Feature.where(:spatial_model_type => type)
       else
@@ -100,7 +100,9 @@ module SpatialFeatures
       options = options.reverse_merge(:columns => "#{table_name}.*")
 
       # Don't use the cache if it doesn't exist
-      return none.extending(UncachedResult) unless other.spatial_cache_for?(Utils.class_of(self), buffer_in_meters)
+      unless other.class.unscoped { other.spatial_cache_for?(Utils.class_of(self), buffer_in_meters) } # Unscope so if we're checking for same class intersections the scope doesn't affect this lookup
+        return none.extending(UncachedResult)
+      end
 
       scope = cached_spatial_join(other)
       scope = scope.select(options[:columns])
@@ -113,8 +115,6 @@ module SpatialFeatures
     def cached_spatial_join(other)
       other_class = Utils.class_of(other)
 
-      raise "Cannot use cached spatial join for the same class" if self == other_class
-
       other_column = other_class.name < self.name ? :model_a : :model_b
       self_column = other_column == :model_a ? :model_b : :model_a
 

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement