spatial_features 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d3fe76f0ce82837de428e401ce4f6a20a84b97acb2085374a8bf8fe1daba5c8
-  data.tar.gz: fed058553913c07b27838424dc07b1b63677f28798fae7d5534b55de7c1aa713
+  metadata.gz: 9578faf8d4205e8b25b7039b99df9ead3f03f13d82568277930c8824adb48980
+  data.tar.gz: 16a5be2783383686f570f598edd8ecf3da6350fb92d5b393618f8be919ab8c79
 SHA512:
-  metadata.gz: 0f6aebd3553502127a91f68d5f692bd6311a8c7af0aca22bccc54cec712aa8371696b0f8e19c0c7aaffa9e98c1ee809d478612a5f7c2441452a202bc9f53280a
-  data.tar.gz: fcf4f4eb0fc85f82ff726ec950936b9c45bdd9aaf85eb06067acac71b250185b6640e89f3536e5e5e1759b93efbee66e855460964ba112aa4f26a77cefae0abe
+  metadata.gz: 772ab77070751ca764ab8a06cf5260038be3cae8461c6e9c7fa894e644d2164cd8905281c43d0eab48b7ab2f06227b01da809687ec4ffb7bc1ade359c7097eea
+  data.tar.gz: da9f6d66e79f85362f4c6af9e3dc8400b4f6fb51bf0cb5ba84114ccb47b4541e59614d162271877c6d20d9d342fbc9a86b48de7e8a5a1de15b27c7136c09f3b3

data/README.md

@@ -181,3 +181,18 @@ add_column :features, :tilegeom, :geometry
 add_index :features, :tilegeom, :using => :gist
 Feature.update_all('tilegeom = ST_Transform(geom, 3857)')
 ```
+
+## Testing
+
+Create a postgres database:
+```bash
+createdb spatial_features_test
+```
+
+There are multiple gemfiles available for testing against different Rails versions.  Set `BUNDLE_GEMFILE` to target them, e.g.
+
+```bash
+bundle install
+BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle install
+BUNDLE_GEMFILE=gemfiles/rails_7_0.gemfile bundle exec rspec
+```

data/config/initializers/mime_types.rb

@@ -1,4 +1,5 @@
 Mime::Type.register "application/vnd.geo+json", :geojson
+Mime::Type.register "application/vnd.bounds+json", :bounds
 Mime::Type.register "application/vnd.mapbox-vector-tile", :mvt
 Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
 Mime::Type.register "application/vnd.google-earth.kmz", :kmz

data/config/initializers/register_oids.rb

@@ -1,8 +1,12 @@
 module PostGISTypes
   def initialize_type_map(m = type_map)
     super
-    register_class_with_limit m, 'geometry', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
-    register_class_with_limit m, 'geography', ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString
+    %w[
+      geography
+      geometry
+    ].each do |geo_type|
+      m.register_type geo_type, ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::SpecializedString.new(geo_type.to_sym)
+    end
   end
 end
 

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/has_spatial_features.rb

@@ -56,7 +56,7 @@ module SpatialFeatures
       within_buffer(other, 0, options)
     end
 
-    def within_buffer(other, buffer_in_meters = 0, **options)
+    def within_buffer(other, buffer_in_meters = 0, options = {})
       return none if other.is_a?(ActiveRecord::Base) && other.new_record?
 
       # Cache only works on single records, not scopes.

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/importers/kml.rb

@@ -15,7 +15,7 @@ module SpatialFeatures
 
       def each_record(&block)
         {'Polygon' => 'POLYGON', 'LineString' => 'LINE', 'Point' => 'POINT'}.each do |kml_type, sql_type|
-          Nokogiri::XML(@data).css(kml_type).each do |feature|
+          kml_document.css(kml_type).each do |feature|
             if placemark = feature.ancestors('Placemark').first
               name = placemark.css('name').text
               metadata = extract_metadata(placemark)
@@ -35,6 +35,14 @@ module SpatialFeatures
         end
       end
 
+      def kml_document
+        @kml_document ||= begin
+          doc = Nokogiri::XML(@data)
+          raise ImportError, "Invalid KML document (root node was '#{doc.root&.name}')" unless doc.root&.name.to_s.casecmp?('kml')
+          doc
+        end
+      end
+
       def blank_feature?(feature)
         feature.css('coordinates').text.blank?
       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.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Ryan Wallace
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 2022-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +91,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds spatial methods to a model.
 email:
 - contact@culturecode.ca
@@ -189,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adds spatial methods to a model.