ffi-geos 2.1.0 → 2.3.1

data/test/test_helper.rb

@@ -9,6 +9,12 @@ SimpleCov.start do
   add_filter '/.bundle/'
 end
 
+if ENV['CI']
+  require 'simplecov_json_formatter'
+
+  SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
+end
+
 require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/reporters'
@@ -23,23 +29,28 @@ puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUB
 puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
 
 if Geos.respond_to?(:version)
-  puts "GEOS version #{Geos.version}"
+  puts "GEOS version #{Geos.version} (#{Geos::GEOS_NICE_VERSION})"
 else
-  puts "GEOS version #{Geos::GEOS_VERSION}"
+  puts "GEOS version #{Geos::GEOS_VERSION} (#{Geos::GEOS_NICE_VERSION})"
 end
 
 puts "ffi-geos version #{Geos::VERSION}" if defined?(Geos::VERSION)
 puts "Using #{Geos::FFIGeos.geos_library_path}" if defined?(Geos::FFIGeos)
+puts "Process #{$PID}"
 
 module TestHelper
   TOLERANCE = 0.0000000000001
 
-  EMPTY_GEOMETRY = if Geos::GEOS_VERSION > '3.8'
+  EMPTY_GEOMETRY = if Geos::GEOS_NICE_VERSION >= '030800'
     'POINT EMPTY'
   else
     'GEOMETRYCOLLECTION EMPTY'
   end
 
+  EMPTY_BLOCK = proc do
+    # no-op
+  end
+
   def self.included(base)
     base.class_eval do
       attr_reader :reader, :reader_hex, :writer
@@ -53,16 +64,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 +84,12 @@ 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.__safe_send__(method, *args, **options)
     assert_equal(4326, geom.srid)
     assert_equal(expected_srid, geom_b.srid)
     assert_equal(expected, write(geom_b))
@@ -108,44 +120,49 @@ 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.__safe_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.__safe_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.__safe_send__(method, *args, **options)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(result))
 
     geom = read(wkt)
-    geom.send("#{method}!", *args)
+    geom.__safe_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.__safe_send__(method, *args, **options)
 
     case result
       when Geos::Geometry
@@ -159,20 +176,42 @@ 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.__safe_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.__safe_send__(method, *args, **options).snap_to_grid(0.1)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(geom_2, trim: true))
   end
 end
 
+class Object
+  if RUBY_VERSION >= '2.7'
+    def __safe_send__(method_name, *args, **kwargs)
+      send(method_name, *args, **kwargs)
+    end
+  else
+    def __safe_send__(method_name, *args, **kwargs)
+      raise NoMethodError unless respond_to?(method_name)
+
+      arity = method(method_name).arity
+
+      if arity.zero?
+        send(method_name)
+      elsif arity.negative? && !kwargs.empty?
+        send(method_name, *args, **kwargs)
+      else
+        send(method_name, *args)
+      end
+    end
+  end
+end
+
 Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.1
 platform: ruby
 authors:
 - J Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -31,9 +31,12 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
+- ".rubocop-minitest.yml"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
+- FUNDING.yml
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -86,8 +89,9 @@ files:
 homepage: http://github.com/dark-panda/ffi-geos
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,15 +99,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 test_files:

data/.travis.yml

@@ -1,33 +0,0 @@
-cache: bundler
-sudo: false
-language: ruby
-dist: trusty
-
-rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-  - jruby-head
-
-addons:
-  apt:
-    packages:
-      - libgeos-c1
-  sonarcloud:
-    organization: "dark-panda"
-    token:
-      secure: UiS3BU1SUSbIynvaup+3w9NNa85mH3lXSa+iCQx9luhp5Nc5Zg4xedycfGylCzpr6D6vRRH3gYefafitcvjS8LbhtNd2Z4oezp2T4fRt8W387HJ3wIcRkyOwBhmQqt/SiPiQr/rkDE9VomelLe7RSkelfAQQvpka5TMzc4wKYd4=
-
-git:
-  depth: false
-
-before_install:
-  - gem install bundler
-
-before_script:
-  - bundle exec rubocop --format=json > rubocop-report.json || true
-
-script:
-  - bundle exec rake test
-  - sonar-scanner