spatial_features 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db03e1d3f48e6c65a11830da75d6b201f623db3a60ae355e2f640f8acaa236e0
-  data.tar.gz: 62d9c5b620f02a8b7db5374697c10e398d1f896a245d95646bb34e4a6c0598fb
+  metadata.gz: a81032b4deadb06258e344a37d5a165179a88582641c493ce7826fa4f1911ef1
+  data.tar.gz: 14b10756cdd9e97ab19418813c8fea4acee09436f7311cab69ae70f99c09bb1a
 SHA512:
-  metadata.gz: 33508968c4ed148c9f73dbccca0a0b4f2931e665fa9b921ffc2389f2f9ca1673287667ef0802922acf706860565b6196bd8e097da387b7b37111fd7daa07f995
-  data.tar.gz: 219d7656e568dbb2f34d55cbddda7f616ffc4e78fdcd8630a2be1255f17b652c52871a0a68a74ed0505ce91eaea7f611f289766eb82aea1d7d2d95d764486c86
+  metadata.gz: c6d4b2e281363aecd61250885e85f9919cf7e42bc5bdcb95a4928bd9d9e4cb8b7e4bbe03b3f64363bfe0ea0967abc1cafe074aed452031cbd407e91c893f85d6
+  data.tar.gz: 364f0877b4b40c408548cb193214a4c9389dd2a054b874f6cf394125994a3ce0d61ce154682902c6069a230f47ad50acc3bd5db4f0aadb03967d0025f2448852

data/lib/spatial_features/download.rb

@@ -3,16 +3,18 @@ require 'open-uri'
 module SpatialFeatures
   module Download
     # file can be a url, path, or file, any of which can return be a zipped archive
-    def self.read(file, unzip: nil)
-      file = open(file, unzip: unzip)
+    def self.read(file, unzip: nil, **unzip_options)
+      file = open(file, unzip: unzip, **unzip_options)
       path = ::File.path(file)
       return ::File.read(path)
     end
 
-    def self.open(file, unzip: nil)
+    def self.open(file, unzip: nil, **unzip_options)
       file = Kernel.open(file)
       file = normalize_file(file) if file.is_a?(StringIO)
-      file = find_in_zip(file, unzip) if Unzip.is_zip?(file)
+      if Unzip.is_zip?(file)
+        file = find_in_zip(file, find: unzip, **unzip_options)
+      end
       return file
     end
 
@@ -24,9 +26,8 @@ module SpatialFeatures
       end
     end
 
-    def self.find_in_zip(file, unzip)
-      raise "Must specify an :unzip option if opening a zip file. e.g. open(file, :find => '.shp')" unless unzip
-      return File.open(Unzip.paths(file, :find => unzip))
+    def self.find_in_zip(file, find:, **unzip_options)
+      return File.open(Unzip.paths(file, :find => find, **unzip_options))
     end
   end
 end

data/lib/spatial_features/importers/file.rb

@@ -4,7 +4,7 @@ module SpatialFeatures
   module Importers
     class File < SimpleDelegator
       def initialize(data, *args)
-        file = Download.open(data, unzip: [/\.kml$/, /\.shp$/])
+        file = Download.open(data, unzip: [/\.kml$/, /\.shp$/], downcase: true)
 
         case ::File.extname(file.path.downcase)
         when '.kml'

data/lib/spatial_features/importers/shapefile.rb

@@ -43,7 +43,7 @@ module SpatialFeatures
       end
 
       def file
-        @file ||= Download.open(@data, unzip: /\.shp$/)
+        @file ||= Download.open(@data, unzip: /\.shp$/, downcase: true)
       end
 
 

data/lib/spatial_features/unzip.rb

@@ -2,8 +2,8 @@ require 'fileutils'
 
 module SpatialFeatures
   module Unzip
-    def self.paths(file_path, find: nil)
-      paths = extract(file_path)
+    def self.paths(file_path, find: nil, **extract_options)
+      paths = extract(file_path, **extract_options)
 
       if find = Array.wrap(find).presence
         paths = paths.detect {|path| find.any? {|pattern| path.index(pattern) } }
@@ -13,10 +13,12 @@ module SpatialFeatures
       return paths
     end
 
-    def self.extract(file_path, output_dir = Dir.mktmpdir)
+    def self.extract(file_path, output_dir = Dir.mktmpdir, downcase: false)
       [].tap do |paths|
         entries(file_path).each do |entry|
-          path = "#{output_dir}/#{entry.name}"
+          output_filename = entry.name
+          output_filename = output_filename.downcase if downcase
+          path = "#{output_dir}/#{output_filename}"
           FileUtils.mkdir_p(File.dirname(path))
           entry.extract(path)
           paths << path

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.10.1"
+  VERSION = "2.10.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails