spatial_features 2.10.4 → 2.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033d463978aa207a802ab2ecb1f295f33cd1c4f857905aba42c4266ada83383a
-  data.tar.gz: 6306307bbf18320d1767ad9c73ae855edafbc2549b089db4afb4a86948492532
+  metadata.gz: f9bf780dcb26228b6b90cb184045b0321cbc4ba30d081317fa804663070f3d35
+  data.tar.gz: d481db709804be2eede27c8454b142693d052eb58a16431b2b0dfe5aec8594e6
 SHA512:
-  metadata.gz: 104856341f7d7807012a9f2372682f78eebd867adea536fc98f9f97f62029b50d5176c09394e634d9837fd819923f2061e627d8f3ef0c60f91c2fe153d7a53f0
-  data.tar.gz: 64411a07521f62d1c83213bd2c76cf7636d6321aa524c17a00a510be3fc8b003f66be0b43da9b38ae8d87e838ef0ef2a654b24037993c57cb4b1bed27cce426f
+  metadata.gz: 36ef374d045bf479fc82d03cba5591fa12697f6631be9007a0eb4834aedc6dfb23d5f49ea5ea64635cd16e3cd360d081e5c8ec72e8b9d801eaa4ebe5463e3b78
+  data.tar.gz: 8dc564d1d76a136d452cc21205fdd6b8119a37f6cd5c7d85ca192e805da27b18fede7987e617a827a4c2166b37ada0ed9116e0b2dc1df0ae3b52ffca86f3fe2e

data/lib/spatial_features/importers/file.rb

@@ -4,7 +4,11 @@ module SpatialFeatures
   module Importers
     class File < SimpleDelegator
       def initialize(data, *args)
-        file = Download.open(data, unzip: [/\.kml$/, /\.shp$/], downcase: true)
+        begin
+          file = Download.open(data, unzip: [/\.kml$/, /\.shp$/], downcase: true)
+        rescue Unzip::PathNotFound
+          raise ImportError, "Archive did not contain a .kml or .shp file. Supported formats are KMZ, KML, and zipped ArcGIS shapefiles."
+        end
 
         case ::File.extname(file.path.downcase)
         when '.kml'

data/lib/spatial_features/importers/shapefile.rb

@@ -26,7 +26,7 @@ module SpatialFeatures
       rescue Errno::ENOENT => e
         case e.message
         when /No such file or directory @ rb_sysopen - (.+)/
-          raise IncompleteShapefileArchive, "Shapefile archive was missing a required file: #{::File.basename($1)}"
+          raise IncompleteShapefileArchive, "Shapefile archive is missing a required file: #{::File.basename($1)}"
         else
           raise e
         end

data/lib/spatial_features/unzip.rb

@@ -7,7 +7,7 @@ module SpatialFeatures
 
       if find = Array.wrap(find).presence
         paths = paths.detect {|path| find.any? {|pattern| path.index(pattern) } }
-        raise(ImportError, "No file matched #{find}") unless paths.present?
+        raise(PathNotFound, "Archive did not contain a file matching #{find}") unless paths.present?
       end
 
       return paths
@@ -44,5 +44,9 @@ module SpatialFeatures
     rescue EOFError
       return false
     end
+
+    # EXCEPTIONS
+
+    class PathNotFound < StandardError; end
   end
 end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.10.4"
+  VERSION = "2.10.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.4
+  version: 2.10.5
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-22 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: '5.1'
+        version: '5.2'
   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: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement