ffi-geos 2.0.0 → 2.1.0

data/test/interrupt_tests.rb

@@ -39,7 +39,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -62,7 +62,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -87,7 +87,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -114,7 +114,7 @@ class InterruptTests < Minitest::Test
       prc_1 = proc {
         interrupt_called
         called << :prc_1
-        prev.call if prev
+        prev&.call
       }
 
       Geos::Interrupt.register(prc_0)
@@ -122,13 +122,13 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called(1)
-        assert_equal([ :prc_1, :prc_0 ], called)
+        assert_equal([:prc_1, :prc_0], called)
       end
     end
   end
@@ -160,7 +160,7 @@ class InterruptTests < Minitest::Test
 
     begin
       buffer = geom.buffer(1, 8)
-    rescue => e
+    rescue StandardError => e
       assert_match(/^InterruptedException/, e.message)
       assert_nil(buffer)
     end

data/test/line_string_tests.rb

@@ -250,8 +250,8 @@ class LineStringTests < Minitest::Test
 
     wkt = 'LINESTRING (0 0, 10 10)'
 
-    affine_tester(:rotate, 'LINESTRING (30 10, 20 20)', wkt, Math::PI / 2, [ 10.0, 20.0 ])
-    affine_tester(:rotate, 'LINESTRING (-3 1, 7 -9)', wkt, -Math::PI / 2, [ -1.0, 2.0 ])
+    affine_tester(:rotate, 'LINESTRING (30 10, 20 20)', wkt, Math::PI / 2, [10.0, 20.0])
+    affine_tester(:rotate, 'LINESTRING (-3 1, 7 -9)', wkt, -Math::PI / 2, [-1.0, 2.0])
     affine_tester(:rotate, 'LINESTRING (2 2, -8 -8)', wkt, Math::PI, read('POINT(1 1)'))
     affine_tester(:rotate, 'LINESTRING (0.5 -0.5, -9.5 9.5)', wkt, Math::PI / 2, read('LINESTRING(0 0, 1 0)'))
   end
@@ -300,11 +300,11 @@ class LineStringTests < Minitest::Test
   end
 
   def test_scale_hash
-    affine_tester(:scale, 'LINESTRING (5 5, 50 50)', 'LINESTRING (1 1, 10 10)', :x => 5, :y => 5)
-    affine_tester(:scale, 'LINESTRING (3 2, 30 20)', 'LINESTRING (1 1, 10 10)', :x => 3, :y => 2)
+    affine_tester(:scale, 'LINESTRING (5 5, 50 50)', 'LINESTRING (1 1, 10 10)', x: 5, y: 5)
+    affine_tester(:scale, 'LINESTRING (3 2, 30 20)', 'LINESTRING (1 1, 10 10)', x: 3, y: 2)
 
     writer.output_dimensions = 3
-    affine_tester(:scale, 'LINESTRING Z (40 40 40, 80 80 80)', 'LINESTRING Z (10 20 -5, 20 40 -10)', :x => 4, :y => 2, :z => -8)
+    affine_tester(:scale, 'LINESTRING Z (40 40 40, 80 80 80)', 'LINESTRING Z (10 20 -5, 20 40 -10)', x: 4, y: 2, z: -8)
   end
 
   def test_trans_scale
@@ -326,11 +326,11 @@ class LineStringTests < Minitest::Test
   end
 
   def test_trans_scale_hash
-    affine_tester(:trans_scale, 'LINESTRING (2 2, 11 11)', 'LINESTRING (1 1, 10 10)', :delta_x => 1, :delta_y => 1, :x_factor => 1, :y_factor => 1)
+    affine_tester(:trans_scale, 'LINESTRING (2 2, 11 11)', 'LINESTRING (1 1, 10 10)', delta_x: 1, delta_y: 1, x_factor: 1, y_factor: 1)
 
     writer.output_dimensions = 3
-    affine_tester(:trans_scale, 'LINESTRING Z (15 28 1, 60 91 10)', 'LINESTRING Z (1 1 1, 10 10 10)', :delta_x => 2, :delta_y => 3, :x_factor => 5, :y_factor => 7)
-    affine_tester(:trans_scale, 'LINESTRING Z (3 1 1, 12 10 10)', 'LINESTRING Z (1 1 1, 10 10 10)', :delta_x => 2, :z_factor => 2)
+    affine_tester(:trans_scale, 'LINESTRING Z (15 28 1, 60 91 10)', 'LINESTRING Z (1 1 1, 10 10 10)', delta_x: 2, delta_y: 3, x_factor: 5, y_factor: 7)
+    affine_tester(:trans_scale, 'LINESTRING Z (3 1 1, 12 10 10)', 'LINESTRING Z (1 1 1, 10 10 10)', delta_x: 2, z_factor: 2)
   end
 
   def test_translate
@@ -341,10 +341,10 @@ class LineStringTests < Minitest::Test
   end
 
   def test_translate_hash
-    affine_tester(:translate, 'LINESTRING (5 12, 15 22)', 'LINESTRING (0 0, 10 10)', :x => 5, :y => 12)
+    affine_tester(:translate, 'LINESTRING (5 12, 15 22)', 'LINESTRING (0 0, 10 10)', x: 5, y: 12)
 
     writer.output_dimensions = 3
-    affine_tester(:translate, 'LINESTRING Z (-3 -7 3, 7 3 13)', 'LINESTRING Z (0 0 0, 10 10 10)', :x => -3, :y => -7, :z => 3)
+    affine_tester(:translate, 'LINESTRING Z (-3 -7 3, 7 3 13)', 'LINESTRING Z (0 0 0, 10 10 10)', x: -3, y: -7, z: 3)
   end
 
   def test_line_interpolate_point

data/test/point_tests.rb

@@ -163,8 +163,8 @@ class PointTests < Minitest::Test
 
     wkt = 'POINT (1 1)'
 
-    affine_tester(:rotate, 'POINT (29 11)', wkt, Math::PI / 2, [ 10.0, 20.0 ])
-    affine_tester(:rotate, 'POINT (-2 0)', wkt, -Math::PI / 2, [ -1.0, 2.0 ])
+    affine_tester(:rotate, 'POINT (29 11)', wkt, Math::PI / 2, [10.0, 20.0])
+    affine_tester(:rotate, 'POINT (-2 0)', wkt, -Math::PI / 2, [-1.0, 2.0])
     affine_tester(:rotate, 'POINT (19 1)', wkt, Math::PI / 2, read('POINT(10 10)'))
     affine_tester(:rotate, 'POINT (-0.5 0.5)', wkt, Math::PI / 2, read('LINESTRING(0 0, 1 0)'))
   end

data/test/polygon_tests.rb

@@ -79,8 +79,7 @@ class PolygonTests < Minitest::Test
 
   def test_snap_to_grid_with_illegal_result
     assert_raises(Geos::InvalidGeometryError) do
-      read('POLYGON ((1 1, 10 10, 10 10, 1 1))').
-        snap_to_grid
+      read('POLYGON ((1 1, 10 10, 10 10, 1 1))').snap_to_grid
     end
   end
 
@@ -110,13 +109,13 @@ class PolygonTests < Minitest::Test
       'POLYGON ((30 10, 30 15, 25 15, 25 10, 30 10))',
       wkt,
       Math::PI / 2,
-      [ 10.0, 20.0 ])
+      [10.0, 20.0])
 
     affine_tester(:rotate,
       'POLYGON ((-3 1, -3 -4, 2 -4, 2 1, -3 1))',
       wkt,
       -Math::PI / 2,
-      [ -1.0, 2.0 ])
+      [-1.0, 2.0])
 
     affine_tester(:rotate,
       'POLYGON ((2 2, -3 2, -3 -3, 2 -3, 2 2))',

data/test/prepared_geometry_tests.rb

@@ -17,14 +17,14 @@ class PreparedGeometryTests < Minitest::Test
 
   def relationship_tester(method, *expected)
     [
-      [ POINT_A, POINT_A ],
-      [ POINT_A, LINESTRING_A ],
-      [ POINT_B, LINESTRING_A ],
-      [ LINESTRING_B, LINESTRING_A ],
-      [ LINESTRING_C, LINESTRING_A ],
-      [ LINESTRING_D, LINESTRING_A ],
-      [ POLYGON_A, POLYGON_B ],
-      [ POLYGON_A, POINT_C ]
+      [POINT_A, POINT_A],
+      [POINT_A, LINESTRING_A],
+      [POINT_B, LINESTRING_A],
+      [LINESTRING_B, LINESTRING_A],
+      [LINESTRING_C, LINESTRING_A],
+      [LINESTRING_D, LINESTRING_A],
+      [POLYGON_A, POLYGON_B],
+      [POLYGON_A, POINT_C]
     ].each_with_index do |(geom_a, geom_b), i|
       geom_a = read(geom_a).to_prepared
       geom_b = read(geom_b)

data/test/strtree_tests.rb

@@ -8,7 +8,7 @@ class STRtreeTests < Minitest::Test
   def setup_tree
     @tree = Geos::STRtree.new(3)
     @item_1 = { item_1: :test }
-    @item_2 = [ :test ]
+    @item_2 = [:test]
     @item_3 = Object.new
 
     @geom_1 = read('LINESTRING(0 0, 10 10)')
@@ -183,9 +183,9 @@ class STRtreeTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree)
 
     tree = Geos::STRtree.new(
-      [ read('LINESTRING(0 0, 10 10)'), item_1 = { item_1: :test } ],
-      [ read('LINESTRING(20 20, 30 30)'), item_2 = [ :test ] ],
-      [ read('LINESTRING(20 20, 30 30)'), item_3 = Object.new ]
+      [read('LINESTRING(0 0, 10 10)'), item_1 = { item_1: :test }],
+      [read('LINESTRING(20 20, 30 30)'), item_2 = [:test]],
+      [read('LINESTRING(20 20, 30 30)'), item_3 = Object.new]
     )
 
     assert_equal([item_1],
@@ -346,7 +346,7 @@ class STRtreeTests < Minitest::Test
     geom_4 = read('POINT (3 8)')
 
     item_1 = { item_1: :test }
-    item_2 = [ :test ]
+    item_2 = [:test]
     item_3 = Object.new
 
     tree = Geos::STRtree.new(2)

data/test/test_helper.rb

@@ -1,19 +1,17 @@
-# encoding: BINARY; frozen_string_literal: true
+# frozen_string_literal: true
 
-if RUBY_VERSION >= '1.9'
-  require 'simplecov'
+require 'simplecov'
 
-  SimpleCov.command_name('Unit Tests')
-  SimpleCov.merge_timeout(3600)
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/.bundle/'
-  end
+SimpleCov.command_name('Unit Tests')
+SimpleCov.merge_timeout(3600)
+SimpleCov.start do
+  add_filter '/test/'
+  add_filter '/.bundle/'
 end
 
 require 'rubygems'
 require 'minitest/autorun'
-require 'minitest/reporters' if RUBY_VERSION >= '1.9'
+require 'minitest/reporters'
 
 if ENV['USE_BINARY_GEOS']
   require 'geos'
@@ -36,6 +34,12 @@ puts "Using #{Geos::FFIGeos.geos_library_path}" if defined?(Geos::FFIGeos)
 module TestHelper
   TOLERANCE = 0.0000000000001
 
+  EMPTY_GEOMETRY = if Geos::GEOS_VERSION > '3.8'
+    'POINT EMPTY'
+  else
+    'GEOMETRYCOLLECTION EMPTY'
+  end
+
   def self.included(base)
     base.class_eval do
       attr_reader :reader, :reader_hex, :writer
@@ -145,11 +149,11 @@ module TestHelper
 
     case result
       when Geos::Geometry
-        result = [ write(result) ]
+        result = [write(result)]
       when Array
-        result = result.collect { |r|
+        result = result.collect do |r|
           write(r)
-        }
+        end
     end
 
     assert_equal(expected, result)
@@ -164,30 +168,11 @@ module TestHelper
     assert_equal(expected, write(geom))
 
     geom = read(wkt)
-    geom2 = geom.send(method, *args).snap_to_grid(0.1)
+    geom_2 = geom.send(method, *args).snap_to_grid(0.1)
 
     assert_equal(wkt, write(geom))
-    assert_equal(expected, write(geom2, :trim => true))
-  end
-end
-
-if RUBY_VERSION >= '1.9'
-  Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
-end
-
-if !Fixnum.method_defined?(:negative?)
-  class Fixnum
-    def negative?
-      self < 0
-    end
-  end
-end
-
-if !Fixnum.method_defined?(:positive?)
-  class Fixnum
-    def positive?
-      self > 0
-    end
+    assert_equal(expected, write(geom_2, trim: true))
   end
 end
 
+Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)

data/test/utils_tests.rb

@@ -22,8 +22,8 @@ class UtilsTests < Minitest::Test
     assert_equal(1, Geos::Utils.orientation_index(0, 0, 10, 10, 5, 20))
     assert_equal(-1, Geos::Utils.orientation_index(0, 0, 10, 10, 5, 3))
     assert_equal(-1, Geos::Utils.orientation_index(0, 0, 10, 10, 5, -2))
-    assert_equal(1, Geos::Utils.orientation_index(0, 0, 10, 10, 1000000, 1000001))
-    assert_equal(-1, Geos::Utils.orientation_index(0, 0, 10, 10, 1000000, 999999))
+    assert_equal(1, Geos::Utils.orientation_index(0, 0, 10, 10, 1_000_000, 1_000_001))
+    assert_equal(-1, Geos::Utils.orientation_index(0, 0, 10, 10, 1_000_000, 999_999))
   end
 
   def test_relate_match
@@ -48,7 +48,7 @@ class UtilsTests < Minitest::Test
   end
 
   def test_create_point
-    cs = Geos::CoordinateSequence.new([[ 10, 20 ]])
+    cs = Geos::CoordinateSequence.new([[10, 20]])
     create_method_tester('POINT (10 20)', :create_point, cs, Geos::GEOS_POINT, Geos::Point)
   end
 
@@ -75,8 +75,8 @@ class UtilsTests < Minitest::Test
 
   def test_create_line_string
     cs = Geos::CoordinateSequence.new([
-      [ 10, 20, 30 ],
-      [ 30, 20, 10 ]
+      [10, 20, 30],
+      [30, 20, 10]
     ])
 
     writer.output_dimensions = 3
@@ -103,7 +103,7 @@ class UtilsTests < Minitest::Test
     create_method_tester(
       'LINESTRING Z (10 20 30, 30 20 10)',
       :create_line_string,
-      [[ 10, 20, 30 ], [ 30, 20, 10 ]],
+      [[10, 20, 30], [30, 20, 10]],
       Geos::GEOS_LINESTRING,
       Geos::LineString
     ) do |geom|
@@ -125,10 +125,10 @@ class UtilsTests < Minitest::Test
 
   def test_create_linear_ring
     cs = Geos::CoordinateSequence.new([
-      [ 7, 8, 9 ],
-      [ 3, 3, 3 ],
-      [ 11, 15.2, 2 ],
-      [ 7, 8, 9 ]
+      [7, 8, 9],
+      [3, 3, 3],
+      [11, 15.2, 2],
+      [7, 8, 9]
     ])
 
     writer.output_dimensions = 3
@@ -155,7 +155,7 @@ class UtilsTests < Minitest::Test
     create_method_tester(
       'LINEARRING Z (7 8 9, 3 3 3, 11 15.2 2, 7 8 9)',
       :create_linear_ring,
-      [[ 7, 8, 9 ], [ 3, 3, 3 ], [ 11, 15.2, 2 ], [ 7, 8, 9 ]],
+      [[7, 8, 9], [3, 3, 3], [11, 15.2, 2], [7, 8, 9]],
       Geos::GEOS_LINEARRING,
       Geos::LinearRing
     ) do |geom|
@@ -178,11 +178,11 @@ class UtilsTests < Minitest::Test
 
   def test_create_polygon
     cs = Geos::CoordinateSequence.new([
-      [ 0, 0 ],
-      [ 0, 10 ],
-      [ 10, 10 ],
-      [ 10, 0 ],
-      [ 0, 0 ]
+      [0, 0],
+      [0, 10],
+      [10, 10],
+      [10, 0],
+      [0, 0]
     ])
 
     exterior_ring = Geos.create_linear_ring(cs)
@@ -196,19 +196,19 @@ class UtilsTests < Minitest::Test
 
   def test_create_polygon_with_coordinate_sequences
     outer = Geos::CoordinateSequence.new(
-      [ 0, 0 ],
-      [ 0, 10 ],
-      [ 10, 10 ],
-      [ 10, 0 ],
-      [ 0, 0 ]
+      [0, 0],
+      [0, 10],
+      [10, 10],
+      [10, 0],
+      [0, 0]
     )
 
     inner = Geos::CoordinateSequence.new(
-      [ 2, 2 ],
-      [ 2, 4 ],
-      [ 4, 4 ],
-      [ 4, 2 ],
-      [ 2, 2 ]
+      [2, 2],
+      [2, 4],
+      [4, 4],
+      [4, 2],
+      [2, 2]
     )
 
     geom = Geos.create_polygon(outer, inner)
@@ -220,30 +220,30 @@ class UtilsTests < Minitest::Test
 
   def test_create_polygon_with_holes
     exterior_ring = Geos::CoordinateSequence.new(
-      [ 0, 0 ],
-      [ 0, 10 ],
-      [ 10, 10 ],
-      [ 10, 0 ],
-      [ 0, 0 ]
+      [0, 0],
+      [0, 10],
+      [10, 10],
+      [10, 0],
+      [0, 0]
     )
 
     hole_1 = Geos::CoordinateSequence.new(
-      [ 2, 2 ],
-      [ 2, 4 ],
-      [ 4, 4 ],
-      [ 4, 2 ],
-      [ 2, 2 ]
+      [2, 2],
+      [2, 4],
+      [4, 4],
+      [4, 2],
+      [2, 2]
     )
 
     hole_2 = Geos::CoordinateSequence.new(
-      [ 6, 6 ],
-      [ 6, 8 ],
-      [ 8, 8 ],
-      [ 8, 6 ],
-      [ 6, 6 ]
+      [6, 6],
+      [6, 8],
+      [8, 8],
+      [8, 6],
+      [6, 6]
     )
 
-    geom = Geos.create_polygon(exterior_ring, [ hole_1, hole_2 ])
+    geom = Geos.create_polygon(exterior_ring, [hole_1, hole_2])
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -261,10 +261,13 @@ class UtilsTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_point)
 
     assert_equal('MULTIPOINT EMPTY', write(Geos.create_multi_point))
-    assert_equal('MULTIPOINT (0 0, 10 10)', write(Geos.create_multi_point(
-      read('POINT(0 0)'),
-      read('POINT(10 10)')
-    )))
+    assert_equal('MULTIPOINT (0 0, 10 10)',
+      write(
+        Geos.create_multi_point(
+          read('POINT(0 0)'),
+          read('POINT(10 10)')
+        )
+      ))
   end
 
   def test_create_bad_multi_point
@@ -282,10 +285,13 @@ class UtilsTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_line_string)
 
     assert_equal('MULTILINESTRING EMPTY', write(Geos.create_multi_line_string))
-    assert_equal('MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))', write(Geos.create_multi_line_string(
-      read('LINESTRING(0 0, 10 10)'),
-      read('LINESTRING(10 10, 20 20)')
-    )))
+    assert_equal('MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))',
+      write(
+        Geos.create_multi_line_string(
+          read('LINESTRING(0 0, 10 10)'),
+          read('LINESTRING(10 10, 20 20)')
+        )
+      ))
   end
 
   def test_create_bad_multi_line_string
@@ -303,10 +309,13 @@ class UtilsTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_polygon)
 
     assert_equal('MULTIPOLYGON EMPTY', write(Geos.create_multi_polygon))
-    assert_equal('MULTIPOLYGON (((0 0, 0 5, 5 5, 5 0, 0 0)), ((10 10, 10 15, 15 15, 15 10, 10 10)))', write(Geos.create_multi_polygon(
-      read('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'),
-      read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
-    )))
+    assert_equal('MULTIPOLYGON (((0 0, 0 5, 5 5, 5 0, 0 0)), ((10 10, 10 15, 15 15, 15 10, 10 10)))',
+      write(
+        Geos.create_multi_polygon(
+          read('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'),
+          read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
+        )
+      ))
   end
 
   def test_create_bad_multi_polygon
@@ -325,11 +334,12 @@ class UtilsTests < Minitest::Test
 
     assert_equal('GEOMETRYCOLLECTION EMPTY', write(Geos.create_geometry_collection))
     assert_equal('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0)), POLYGON ((10 10, 10 15, 15 15, 15 10, 10 10)))',
-      write(Geos.create_geometry_collection(
-        read('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'),
-        read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
+      write(
+        Geos.create_geometry_collection(
+          read('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'),
+          read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
+        )
       ))
-    )
   end
 
   def test_create_geometry_collection_with_constants_and_symbols
@@ -339,7 +349,6 @@ class UtilsTests < Minitest::Test
     assert_kind_of(Geos::MultiLineString, Geos.create_collection(:multi_line_string))
   end
 
-
   def test_create_bad_geometry_collection
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_geometry_collection)
 
@@ -440,6 +449,7 @@ class UtilsTests < Minitest::Test
         [5, 5],
         [0, 5]
       ])
+
       Geos.create_linear_ring(cs)
       GC.start
     end