spatial_features 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0185dc6f36f9a140099521ea658507a7a787c0f
-  data.tar.gz: ed739d4d19ad60d38086ced1588bccf072c14ebf
+  metadata.gz: 69d8ba9f76d0b6597c4719211a776191af5a6051
+  data.tar.gz: 048baef877073d0068e9a1b06c1e4b5fbf438c9d
 SHA512:
-  metadata.gz: 1b3a240c8a306fcde5641b0266a250711a68d7897c9b233dde611705c50ccfc7c4087c0c6bbc011cc7e55f4273c0edb3e9daafe537225716a91a499e8e4feb18
-  data.tar.gz: 83a0f93960f0db42a09d31b69fd776c0573577d94e3275b6da0a32c4ef7a67c272173f572cdf55db0c691d6104daeba12a594ff9d249a1e65bd947f64429c4bf
+  metadata.gz: 5b9dd28da45913bc3637d4c3df5ea6e5e9ebc5eec1e1f4e353c2f8334cddc495912c369d09ab1a60cfb585c3c389505e50ff180cecabc1eb3643dcc716705680
+  data.tar.gz: f029dd9bb557d9237e19376dbe40db379b31d967cd2520714f4d5ce998e5afdf76678d5912a257511700fed8bfc75ca9cb44fc64efdc702956bef9a57e302f28

data/lib/spatial_features/import/arcgis_kmz_features.rb

@@ -117,6 +117,8 @@ module ArcGISKmzFeatures
   end
 
   def open_kmz_url(url)
+    url = URI(url)
+
     Zip::InputStream.open(open(url)) do |io|
       while (entry = io.get_next_entry)
         return io.read if entry.name.downcase == 'doc.kml'
@@ -124,6 +126,13 @@ module ArcGISKmzFeatures
     end
 
     return nil
+
+  rescue SocketError, Errno::ECONNREFUSED => e
+    e.message.replace "ArcGIS Server is not responding. Ensure ArcGIS Server is running and accessible at #{[url.scheme, "//#{url.host}", url.port].select(&:present?).join(':')}."
+    raise e
+  rescue OpenURI::HTTPError => e
+    e.message.replace "ArcGIS Map Service not found. Ensure ArcGIS Server is running and accessible at #{url}."
+    raise e
   end
 
   # Can be overridden to use PostGIS to force geometry to be valid

data/lib/spatial_features/version.rb

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

data/lib/spatial_features/workers/arcgis_update_features_job.rb

@@ -21,8 +21,6 @@ class ArcGISUpdateFeaturesJob < Struct.new(:options)
   def normalize_message(message)
     normalized_messages = []
 
-    normalized_messages << "ArcGIS Server is not responding." if message =~ /\Agetaddrinfo/
-
     if message =~ /invalid KML representation/
       normalized_messages += invalid_kml_reason(message).presence || ["invalid KML being generated by ArcGIS."]
     end
@@ -33,8 +31,10 @@ class ArcGISUpdateFeaturesJob < Struct.new(:options)
       end
     end
 
-    if normalized_messages.present?
+    if normalized_messages.many?
       return '<ul><li>' + normalized_messages.join('</li><li>') + '</li></ul>'
+    elsif normalized_messages.present?
+      normalized_messages.first
     else
       return message
     end

metadata

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