spatial_features 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0f42760d9c4ab52f26a23e324a0f20944a8b93
-  data.tar.gz: 37a0903b8c114cbf16a9af5417e8fab68b357df7
+  metadata.gz: e0185dc6f36f9a140099521ea658507a7a787c0f
+  data.tar.gz: ed739d4d19ad60d38086ced1588bccf072c14ebf
 SHA512:
-  metadata.gz: d88534ca90a6252ff84ba3f01f3b10c0807ef90e8f1f2303b54f4ff43005ee23ba2dcba69b49df9b581e45fd8044cb71228b93a6f9ad9ecadedd21a24906f564
-  data.tar.gz: 4e00ff7f7325893dde4829824dcb5751a98878f40c06f3fd4e44fc1fb514e48523547eb9b14bfb83a74366cfb244e8c8c8bac25de302755e0a907586c659d05a
+  metadata.gz: 1b3a240c8a306fcde5641b0266a250711a68d7897c9b233dde611705c50ccfc7c4087c0c6bbc011cc7e55f4273c0edb3e9daafe537225716a91a499e8e4feb18
+  data.tar.gz: 83a0f93960f0db42a09d31b69fd776c0573577d94e3275b6da0a32c4ef7a67c272173f572cdf55db0c691d6104daeba12a594ff9d249a1e65bd947f64429c4bf

data/lib/spatial_features/controller_helpers/spatial_extensions.rb

@@ -3,19 +3,8 @@ module SpatialExtensions
 
   def abstract_refresh_geometry_action(models, cache_classes)
     Array.wrap(models).each do |model|
-      queue = "#{model.class}/#{model.id}/update_features"
-
-      # Destroy old failed jobs
-      Delayed::Job.where(:queue => queue).where.not(:failed_at => nil).destroy_all
-
-      Delayed::Job.enqueue(
-        ArcGISUpdateFeaturesJob.new(
-          :spatial_model_type => model.class,
-          :spatial_model_id => model.id,
-          :cache_classes => cache_classes
-        ),
-        :queue => queue
-      )
+      model.failed_feature_update_jobs.destroy_all
+      model.queue_feature_update!(:cache_classes => cache_classes)
     end
 
     redirect_to :back

data/lib/spatial_features/import/arcgis_kmz_features.rb

@@ -30,16 +30,36 @@ module ArcGISKmzFeatures
     return true
   end
 
+  def queue_feature_update!(options = {})
+    Delayed::Job.enqueue ArcGISUpdateFeaturesJob.new(options.merge :spatial_model_type => self.class, :spatial_model_id => self.id), :queue => delayed_jobs_queue_name
+  end
+
   def updating_features?
-    Delayed::Job.where(queue: "#{self.class}/#{self.id}/update_features", failed_at: nil).exists?
+    running_feature_update_jobs.exists?
   end
 
   def feature_update_error
-    (Delayed::Job.where(queue: "#{self.class}/#{self.id}/update_features").where.not(failed_at: nil).first.try(:last_error) || '').split("\n").first
+    (failed_feature_update_jobs.first.try(:last_error) || '').split("\n").first
+  end
+
+  def running_feature_update_jobs
+    feature_update_jobs.where(failed_at: nil)
+  end
+
+  def failed_feature_update_jobs
+    feature_update_jobs.where.not(failed_at: nil)
+  end
+
+  def feature_update_jobs
+    Delayed::Job.where(queue: delayed_jobs_queue_name)
   end
 
   private
 
+  def delayed_jobs_queue_name
+    "#{self.class}/#{self.id}/update_features"
+  end
+
   def replace_features(kml_array)
     new_features = []
     kml_array.each {|kml| new_features.concat build_features(kml) }

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/lib/spatial_features/workers/arcgis_update_features_job.rb

@@ -3,7 +3,7 @@ class ArcGISUpdateFeaturesJob < Struct.new(:options)
     model = options[:spatial_model_type].find(options[:spatial_model_id])
 
     if model.update_features!
-      options[:cache_classes].each {|klass| SpatialFeatures.cache_record_proximity(model, klass) }
+      Array(options[:cache_classes]).each {|klass| SpatialFeatures.cache_record_proximity(model, klass) }
       after_feature_update(model)
     end
   rescue => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails