spatial_features 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c680fd535f7a9774f215d2d98183b0f3738d3f5
-  data.tar.gz: 26ce1595016848e915b4acf734a59bbe7b663263
+  metadata.gz: 5e0a3bff0a76b4cc7d6e569677d5ee9035f6da2b
+  data.tar.gz: 225c280e58e6af0b5ce3623a582acd599037f9ef
 SHA512:
-  metadata.gz: 727c003d4531cd14a6bd3a146baa095471d4d343335fefa16086714d512c8a9fc8cda46dda25bb5964b037e32e8daa0cd46fe48acebde71db82b1a4c4ee14d91
-  data.tar.gz: 13a9bfe5018579fa1e42aac6ada8272b81d867090206f422d0884b71cf93ffb8f0ce948c6b421a8e363cf8193097c0affb42bde10b6220f53ffabd6938870893
+  metadata.gz: a35b743e5e5f90c58a002bafe5f823dbf90f1b25974f54809a2cbbf8a4a4aeabb59ca55f59677ead4f9a4e08977385ed50bdcaa811a6bc8f93cd5c094fe429f6
+  data.tar.gz: 7eaab5ad9ea2087fd35962c518e3df8118911ae5450cd54a431314d1f90a159edb1813e866c5aa7dcc1d54805e1c7f04a4c0bcf7ddc5178a87b1c3f52d998943

data/README.md

@@ -19,6 +19,9 @@ Adds spatial methods to a model.
 
   ```ruby
   execute("
+    CREATE EXTENSION hstore;
+    CREATE EXTENSION postgis;
+    
     CREATE TABLE features (
         id integer NOT NULL,
         spatial_model_type character varying(255),
@@ -39,6 +42,16 @@ Adds spatial methods to a model.
         centroid geography,
         kml_centroid text
     );
+    
+    CREATE SEQUENCE features_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
+    ALTER SEQUENCE features_id_seq OWNED BY features.id;
+    ALTER TABLE ONLY features ALTER COLUMN id SET DEFAULT nextval('features_id_seq'::regclass);
+    ALTER TABLE ONLY features ADD CONSTRAINT features_pkey PRIMARY KEY (id);
+    
+    CREATE INDEX index_features_on_feature_type ON features USING btree (feature_type);
+    CREATE INDEX index_features_on_spatial_model_id_and_spatial_model_type ON features USING btree (spatial_model_id, spatial_model_type);
+    CREATE INDEX index_features_on_geom ON features USING gist (geom);
+    CREATE INDEX index_features_on_geom_lowres ON features USING gist (geom_lowres);
 
     CREATE TABLE spatial_caches (
         id integer NOT NULL,
@@ -50,6 +63,13 @@ Adds spatial methods to a model.
         intersection_cache_distance double precision,
         features_hash character varying(255)
     );
+    
+    CREATE SEQUENCE spatial_caches_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
+    ALTER SEQUENCE spatial_caches_id_seq OWNED BY spatial_caches.id;
+    ALTER TABLE ONLY spatial_caches ALTER COLUMN id SET DEFAULT nextval('spatial_caches_id_seq'::regclass);
+    ALTER TABLE ONLY spatial_caches ADD CONSTRAINT spatial_caches_pkey PRIMARY KEY (id);
+    
+    CREATE INDEX index_spatial_caches_on_spatial_model ON spatial_caches USING btree (spatial_model_id, spatial_model_type);
 
     CREATE TABLE spatial_proximities (
         id integer NOT NULL,
@@ -60,6 +80,14 @@ Adds spatial methods to a model.
         distance_in_meters double precision,
         intersection_area_in_square_meters double precision
     );
+    
+    CREATE SEQUENCE spatial_proximities_id_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1;
+    ALTER SEQUENCE spatial_proximities_id_seq OWNED BY spatial_proximities.id;
+    ALTER TABLE ONLY spatial_proximities ALTER COLUMN id SET DEFAULT nextval('spatial_proximities_id_seq'::regclass);
+    ALTER TABLE ONLY spatial_proximities ADD CONSTRAINT spatial_proximities_pkey PRIMARY KEY (id);
+    
+    CREATE INDEX index_spatial_proximities_on_model_a ON spatial_proximities USING btree (model_a_id, model_a_type);
+    CREATE INDEX index_spatial_proximities_on_model_b ON spatial_proximities USING btree (model_b_id, model_b_type);
   ")
   ```
 

data/app/models/spatial_cache.rb

@@ -1,5 +1,5 @@
 class SpatialCache < ActiveRecord::Base
-  belongs_to :spatial_model, :polymorphic => true, :inverse_of => :spatial_cache
+  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'))

data/lib/spatial_features/caching.rb

@@ -15,8 +15,8 @@ module SpatialFeatures
   end
 
   def self.update_spatial_cache(scope)
-    scope.with_stale_spatial_cache.includes(:spatial_cache).find_each do |record|
-      record.spatial_cache.each do |spatial_cache|
+    scope.with_stale_spatial_cache.includes(:spatial_caches).find_each do |record|
+      record.spatial_caches.each do |spatial_cache|
         cache_record_proximity(record, spatial_cache.intersection_model_type) if spatial_cache.stale?
       end
     end
@@ -59,7 +59,7 @@ module SpatialFeatures
   end
 
   def self.clear_record_cache(record, klass)
-    record.spatial_cache.where(:intersection_model_type => klass).delete_all
+    record.spatial_caches.where(:intersection_model_type => klass).delete_all
     SpatialProximity.between(record, klass).delete_all
   end
 

data/lib/spatial_features/has_spatial_features.rb

@@ -14,11 +14,11 @@ module SpatialFeatures
         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 :with_spatial_cache, lambda {|klass| joins(:spatial_cache).where(:spatial_caches => { :intersection_model_type =>  klass }).uniq }
+        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 spatial_model_id = #{table_name}.id AND spatial_model_type = '#{name}' and intersection_model_type = '#{klass}'").where('spatial_model_id IS NULL') }
-        scope :with_stale_spatial_cache, lambda { joins(:spatial_cache).where("#{table_name}.features_hash != spatial_caches.features_hash").uniq } if has_spatial_features_hash?
+        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_cache, :as => :spatial_model, :dependent => :delete_all
+        has_many :spatial_caches, :as => :spatial_model, :dependent => :delete_all, :class_name => 'SpatialCache'
         has_many :model_a_spatial_proximities, :as => :model_a, :class_name => 'SpatialProximity', :dependent => :delete_all
         has_many :model_b_spatial_proximities, :as => :model_b, :class_name => 'SpatialProximity', :dependent => :delete_all
 
@@ -98,7 +98,7 @@ module SpatialFeatures
       options = options.reverse_merge(:columns => "#{table_name}.*")
 
       # Don't use the cache if it doesn't exist
-      return all.extending(UncachedRelation) unless other.spatial_cache_for?(Utils.class_of(self), buffer_in_meters)
+      return none.extending(UncachedResult) unless other.spatial_cache_for?(Utils.class_of(self), buffer_in_meters)
 
       scope = cached_spatial_join(other)
       scope = scope.select(options[:columns])
@@ -204,7 +204,7 @@ module SpatialFeatures
     end
 
     def spatial_cache_for?(other, buffer_in_meters)
-      if cache = spatial_cache.between(self, SpatialFeatures::Utils.class_of(other)).first
+      if cache = spatial_caches.between(self, SpatialFeatures::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/uncached_result.rb

@@ -0,0 +1,4 @@
+module SpatialFeatures
+  module UncachedResult
+  end
+end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/lib/spatial_features.rb

@@ -9,6 +9,7 @@ require 'google/apis/drive_v3'
 
 # LIB
 require 'spatial_features/caching'
+require 'spatial_features/uncached_result'
 require 'spatial_features/venn_polygons'
 require 'spatial_features/controller_helpers/spatial_extensions'
 require 'spatial_features/download'
@@ -34,12 +35,6 @@ require 'spatial_features/importers/shapefile'
 
 require 'spatial_features/engine'
 
-module SpatialFeatures
-  module UncachedRelation
-    include ActiveRecord::NullRelation
-  end
-end
-
 # Load the act method
 ActiveRecord::Base.send :extend, SpatialFeatures::ActMethod
 ActiveRecord::Base.send :extend, SpatialFeatures::FusionTables::ActMethod

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -170,6 +170,7 @@ files:
 - lib/spatial_features/importers/kml_file.rb
 - lib/spatial_features/importers/kml_file_arcgis.rb
 - lib/spatial_features/importers/shapefile.rb
+- lib/spatial_features/uncached_result.rb
 - lib/spatial_features/unzip.rb
 - lib/spatial_features/utils.rb
 - lib/spatial_features/venn_polygons.rb