spatial_features 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6a8cf38e1cf6d83445e02a7b3c7cfa6955480e9e00b3532402d5d859946700
-  data.tar.gz: 0dedcbcd0eee00e0a0280fb0cd89bfd266d32d9bb4bafbafbd19b6566ad3c51f
+  metadata.gz: 57499f73e1190669ab1f3b5893c718db536fda282cce4a91bb0936908c5b2548
+  data.tar.gz: 0eb2e143c321b8e4e0dc498673d4a3c82e6d8d66df131a6ce445654a2f874772
 SHA512:
-  metadata.gz: 80085428e855ef6db9d6b5536769c2bf0aeda8ded9a5b041d47b8446f92f97fc2aa3611388c4cf04f93af8043c5401be8af7a4f8121b029d20a3d308fc4db898
-  data.tar.gz: 123f63f2096cc6d3ca335cd5c8344db46b915edefe9690ef9701f3c1c9c81619928f7403fb096553b790bdbbd97cd5694b40626a47ed7e34bbe717d83ae4c834
+  metadata.gz: 8dca234339ac5c209752e01ae0eea025f8ad88e51480b73d4d5ec3beed2ebd019c58f4c96ba56a25f0655611474eea396ee0da0be8d13ece5db0b279d5de2e27
+  data.tar.gz: 72f3fbceb533ffad03a849cf7d3caed587749d0d3d3a6830538beb59787588fc67803c965b3ad7fed10512d3cc3aecdc9878f45c8cbf52a1656746289b3e598d

data/lib/spatial_features/download.rb

@@ -2,13 +2,6 @@ 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, **unzip_options)
-      file = Download.open_each(file, unzip: unzip, **unzip_options).first
-      path = ::File.path(file)
-      return ::File.read(path)
-    end
-
     # file can be a url, path, or file, any of which can return be a zipped archive
     def self.open(file)
       file = Kernel.open(file)

data/lib/spatial_features/has_spatial_features/feature_import.rb

@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'fileutils'
 
 module SpatialFeatures
   module FeatureImport
@@ -21,9 +22,10 @@ module SpatialFeatures
 
     def update_features!(skip_invalid: false, **options)
       options = options.reverse_merge(spatial_features_options)
+      tmpdir = options.fetch(:tmpdir) { Dir.mktmpdir("ruby_spatial_features") }
 
       ActiveRecord::Base.transaction do
-        imports = spatial_feature_imports(options[:import], options[:make_valid])
+        imports = spatial_feature_imports(options[:import], options[:make_valid], options[:tmpdir])
         cache_key = Digest::MD5.hexdigest(imports.collect(&:cache_key).join)
 
         return if features_cache_key_matches?(cache_key)
@@ -49,6 +51,8 @@ module SpatialFeatures
       else
         raise ImportError, e.message, e.backtrace
       end
+    ensure
+      FileUtils.remove_entry(tmpdir) if Dir.exist?(tmpdir)
     end
 
     def update_features_cache_key(cache_key)
@@ -73,10 +77,11 @@ module SpatialFeatures
 
     private
 
-    def spatial_feature_imports(import_options, make_valid)
+    def spatial_feature_imports(import_options, make_valid, tmpdir)
       import_options.flat_map do |data_method, importer_name|
         Array.wrap(send(data_method)).flat_map do |data|
-          spatial_importer_from_name(importer_name).create_all(data, :make_valid => make_valid) if data.present?
+          next unless data.present?
+          spatial_importer_from_name(importer_name).create_all(data, :make_valid => make_valid, :tmpdir => tmpdir)
         end
       end.compact
     end

data/lib/spatial_features/importers/base.rb

@@ -5,10 +5,11 @@ module SpatialFeatures
     class Base
       attr_reader :errors
 
-      def initialize(data, make_valid: false)
+      def initialize(data, make_valid: false, tmpdir: nil)
         @make_valid = make_valid
         @data = data
         @errors = []
+        @tmpdir = tmpdir
       end
 
       def features

data/lib/spatial_features/importers/file.rb

@@ -8,7 +8,7 @@ module SpatialFeatures
 
       FILE_PATTERNS = [/\.kml$/, /\.shp$/, /\.json$/, /\.geojson$/]
       def self.create_all(data, **options)
-        Download.open_each(data, unzip: FILE_PATTERNS, downcase: true).map do |file|
+        Download.open_each(data, unzip: FILE_PATTERNS, downcase: true, tmpdir: options[:tmpdir]).map do |file|
           new(data, **options, current_file: file)
         end
       rescue Unzip::PathNotFound
@@ -23,7 +23,7 @@ module SpatialFeatures
       # If no `current_file` is passed then we just take the first valid file that we find.
       def initialize(data, *args, current_file: nil, **options)
         begin
-          current_file ||= Download.open_each(data, unzip: FILE_PATTERNS, downcase: true).first
+          current_file ||= Download.open_each(data, unzip: FILE_PATTERNS, downcase: true, tmpdir: options[:tmpdir]).first
         rescue Unzip::PathNotFound
           raise ImportError, INVALID_ARCHIVE
         end

data/lib/spatial_features/unzip.rb

@@ -16,21 +16,19 @@ module SpatialFeatures
       return Array(paths)
     end
 
-    def self.extract(file_path, output_dir = Dir.mktmpdir, downcase: false)
+    def self.extract(file_path, tmpdir: nil, downcase: false)
+      tmpdir ||= Dir.mktmpdir
       [].tap do |paths|
         entries(file_path).each do |entry|
           next if entry.name =~ IGNORED_ENTRY_PATHS
           output_filename = entry.name
           output_filename = output_filename.downcase if downcase
-          path = "#{output_dir}/#{output_filename}"
+          path = "#{tmpdir}/#{output_filename}"
           FileUtils.mkdir_p(File.dirname(path))
           entry.extract(path)
           paths << path
         end
       end
-    rescue => e
-      FileUtils.remove_entry(output_dir)
-      raise(e)
     end
 
     def self.names(file_path)

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails