ffi-geos 2.1.0 → 2.2.0

data/test/strtree_tests.rb

@@ -313,6 +313,7 @@ class STRtreeTests < Minitest::Test
 
   def test_nearest_with_only_empty_geometries
     skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip if Geos::GEOS_VERSION > '3.9.0'
 
     geom_1 = read('LINESTRING EMPTY')
     geom_2 = read('POINT (2 7)')

data/test/test_helper.rb

@@ -40,6 +40,10 @@ module TestHelper
     'GEOMETRYCOLLECTION EMPTY'
   end
 
+  EMPTY_BLOCK = proc do
+    nil
+  end
+
   def self.included(base)
     base.class_eval do
       attr_reader :reader, :reader_hex, :writer
@@ -53,16 +57,16 @@ module TestHelper
     @writer = Geos::WktWriter.new
   end
 
-  def read(*args)
-    if args[0][0] != '0'
-      reader.read(*args)
+  def read(*args, **options)
+    if args[0][0] == '0'
+      reader_hex.read_hex(*args, **options)
     else
-      reader_hex.read_hex(*args)
+      reader.read(*args, **options)
     end
   end
 
-  def write(*args)
-    writer.write(*args)
+  def write(*args, **options)
+    writer.write(*args, **options)
   end
 
   def geom_from_geom_or_wkt(geom_or_wkt)
@@ -73,11 +77,11 @@ module TestHelper
     end
   end
 
-  def srid_copy_tester(method, expected, expected_srid, srid_policy, wkt, *args)
+  def srid_copy_tester(method, expected, expected_srid, srid_policy, wkt, *args, **options)
     geom = read(wkt)
     geom.srid = 4326
     Geos.srid_copy_policy = srid_policy
-    geom_b = geom.send(method, *args)
+    geom_b = geom.send(method, *args, **options)
     assert_equal(4326, geom.srid)
     assert_equal(expected_srid, geom_b.srid)
     assert_equal(expected, write(geom_b))
@@ -108,44 +112,48 @@ module TestHelper
     assert(geom.eql_exact?(result, tolerance), "Expected geom.eql_exact? to be within #{tolerance}")
   end
 
-  def snapped_tester(method, expected, geom, *args)
+  def snapped_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
 
-    result = geom.send(method, *args)
+    result = geom.send(method, *args, **options)
     assert_equal(expected, write(result.snap_to_grid(1)))
   end
 
-  def simple_tester(method, expected, geom, *args)
+  def simple_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args)
+    result = geom.send(method, *args, **options)
     result = write(result) if result.is_a?(Geos::Geometry)
 
-    assert_equal(expected, result)
+    if expected.nil?
+      assert_nil(result)
+    else
+      assert_equal(expected, result)
+    end
   end
 
-  def simple_bang_tester(method, expected, wkt, *args)
+  def simple_bang_tester(method, expected, wkt, *args, **options)
     geom = read(wkt)
-    result = geom.send(method, *args)
+    result = geom.send(method, *args, **options)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(result))
 
     geom = read(wkt)
-    geom.send("#{method}!", *args)
+    geom.send("#{method}!", *args, **options)
 
     assert_equal(expected, write(geom))
   end
 
-  def comparison_tester(method, expected, geom_a, geom_b, *args)
-    geom_a = geom_from_geom_or_wkt(geom_a)
-    geom_b = geom_from_geom_or_wkt(geom_b)
+  def comparison_tester(method, expected, geom_a, geom_b, *args, **options)
+    geom_a = geom_from_geom_or_wkt(geom_a).normalize
+    geom_b = geom_from_geom_or_wkt(geom_b).normalize
 
-    simple_tester(method, expected, geom_a, geom_b, *args)
+    simple_tester(method, expected, geom_a, geom_b, *args, **options)
   end
 
-  def array_tester(method, expected, geom, *args)
+  def array_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args)
+    result = geom.send(method, *args, **options)
 
     case result
       when Geos::Geometry
@@ -159,16 +167,16 @@ module TestHelper
     assert_equal(expected, result)
   end
 
-  def affine_tester(method, expected, wkt, *args)
+  def affine_tester(method, expected, wkt, *args, **options)
     writer.trim = true
 
     geom = read(wkt)
-    geom.send("#{method}!", *args).snap_to_grid!(0.1)
+    geom.send("#{method}!", *args, **options).snap_to_grid!(0.1)
 
     assert_equal(expected, write(geom))
 
     geom = read(wkt)
-    geom_2 = geom.send(method, *args).snap_to_grid(0.1)
+    geom_2 = geom.send(method, *args, **options).snap_to_grid(0.1)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(geom_2, trim: true))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - J Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -34,6 +34,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- FUNDING.yml
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -87,7 +88,7 @@ homepage: http://github.com/dark-panda/ffi-geos
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 test_files: