ffi-geos 1.2.0 → 2.2.0

data/test/wkb_reader_tests.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
 require 'test_helper'
 
 class WkbReaderTests < Minitest::Test
@@ -107,7 +105,7 @@ class WkbReaderTests < Minitest::Test
   def test_2d_little_endian_binary
     wkb_tester(
       'POINT(6 7)',
-      "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40",
+      [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -119,7 +117,7 @@ class WkbReaderTests < Minitest::Test
   def test_2d_big_endian_binary
     wkb_tester(
       'POINT (6 7)',
-      "\x00\x00\x00\x00\x01\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00",
+      [0, 0, 0, 0, 1, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -131,7 +129,7 @@ class WkbReaderTests < Minitest::Test
   def test_2d_little_endian_srid_binary
     wkb_tester(
       'POINT (6 7)',
-      "\x01\x01\x00\x00\x20\x2B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40",
+      [1, 1, 0, 0, 32, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -143,7 +141,7 @@ class WkbReaderTests < Minitest::Test
   def test_2d_big_endian_srid_binary
     wkb_tester(
       'POINT (6 7)',
-      "\x00\x20\x00\x00\x01\x00\x00\x00\x2B\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00",
+      [0, 32, 0, 0, 1, 0, 0, 0, 43, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -155,7 +153,7 @@ class WkbReaderTests < Minitest::Test
   def test_3d_little_endian_binary
     wkb_tester(
       'POINT Z (6 7 8)',
-      "\x01\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40\x00\x00\x00\x00\x00\x00\x20\x40",
+      [1, 1, 0, 0, 128, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64, 0, 0, 0, 0, 0, 0, 32, 64].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -167,7 +165,7 @@ class WkbReaderTests < Minitest::Test
   def test_3d_big_endian_binary
     wkb_tester(
       'POINT Z (6 7 8)',
-      "\x00\x80\x00\x00\x01\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00\x40\x20\x00\x00\x00\x00\x00\x00",
+      [0, 128, 0, 0, 1, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0, 64, 32, 0, 0, 0, 0, 0, 0].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -179,7 +177,7 @@ class WkbReaderTests < Minitest::Test
   def test_3d_big_endian_srid_binary
     wkb_tester(
       'POINT Z (6 7 8)',
-      "\x00\xA0\x00\x00\x01\x00\x00\x00\x35\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00\x40\x20\x00\x00\x00\x00\x00\x00",
+      [0, 160, 0, 0, 1, 0, 0, 0, 53, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0, 64, 32, 0, 0, 0, 0, 0, 0].pack('C*'),
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
@@ -190,12 +188,13 @@ class WkbReaderTests < Minitest::Test
 
   def test_read_with_srid
     assert_equal(43,
-      @wkb_reader.read("\x01\x01\x00\x00\x20\x2B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40").srid)
+      @wkb_reader.read([1, 1, 0, 0, 32, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64].pack('C*')).srid)
 
     assert_equal(4326,
-      @wkb_reader.read("\x01\x01\x00\x00\x20\x2B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40", {
-        :srid => 4326
-      }).srid)
+      @wkb_reader.read(
+        [1, 1, 0, 0, 32, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64].pack('C*'),
+        srid: 4326
+      ).srid)
   end
 
   def test_read_hex_srid
@@ -203,20 +202,21 @@ class WkbReaderTests < Minitest::Test
       @wkb_reader.read_hex('01010000202B00000000000000000018400000000000001C40').srid)
 
     assert_equal(4326,
-      @wkb_reader.read_hex('01010000202B00000000000000000018400000000000001C40', {
-        :srid => 4326
-      }).srid)
+      @wkb_reader.read_hex(
+        '01010000202B00000000000000000018400000000000001C40',
+        srid: 4326
+      ).srid)
   end
 
   def test_read_parse_error
     assert_raises(Geos::WkbReader::ParseError) do
-      @wkb_reader.read("FOO")
+      @wkb_reader.read('FOO')
     end
   end
 
   def test_read_hex_parse_error
     assert_raises(Geos::WkbReader::ParseError) do
-      @wkb_reader.read_hex("FOO")
+      @wkb_reader.read_hex('FOO')
     end
   end
 end

data/test/wkb_writer_tests.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
 require 'test_helper'
 
 class WkbWriterTests < Minitest::Test
@@ -122,8 +120,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_little_endian_with_3d_input
     wkb_tester(
       '010100000000000000000018400000000000001C40',
@@ -146,8 +142,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_big_endian_with_3d_input
     wkb_tester(
       '00000000014018000000000000401C000000000000',
@@ -315,8 +309,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_little_endian_with_3d_input_binary
     wkb_tester(
       '010100000000000000000018400000000000001C40',
@@ -341,7 +333,7 @@ class WkbWriterTests < Minitest::Test
 
   def test_2d_big_endian_with_3d_input_binary
     wkb_tester(
-      "\x00\x00\x00\x00\x01\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00",
+      [0, 0, 0, 0, 1, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0].pack('C*'),
       'POINT(6 7 8)',
       2,
       0,
@@ -353,7 +345,7 @@ class WkbWriterTests < Minitest::Test
 
   def test_2d_big_endian_with_3d_input_with_srid_binary
     wkb_tester(
-      "\x00\x20\x00\x00\x01\x00\x00\x00\x35\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00",
+      [0, 32, 0, 0, 1, 0, 0, 0, 53, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0].pack('C*'),
       'POINT(6 7 8)',
       2,
       0,
@@ -365,7 +357,7 @@ class WkbWriterTests < Minitest::Test
 
   def test_3d_little_endian_with_3d_input_binary
     wkb_tester(
-      "\x01\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40\x00\x00\x00\x00\x00\x00\x20\x40",
+      [1, 1, 0, 0, 128, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64, 0, 0, 0, 0, 0, 0, 32, 64].pack('C*'),
       'POINT(6 7 8)',
       3,
       1,
@@ -377,7 +369,7 @@ class WkbWriterTests < Minitest::Test
 
   def test_3d_big_endian_with_3d_input_binary
     wkb_tester(
-      "\x00\x80\x00\x00\x01\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00\x40\x20\x00\x00\x00\x00\x00\x00",
+      [0, 128, 0, 0, 1, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0, 64, 32, 0, 0, 0, 0, 0, 0].pack('C*'),
       'POINT(6 7 8)',
       3,
       0,
@@ -389,7 +381,7 @@ class WkbWriterTests < Minitest::Test
 
   def test_3d_big_endian_with_3d_input_with_srid_binary
     wkb_tester(
-      "\x00\xA0\x00\x00\x01\x00\x00\x00\x35\x40\x18\x00\x00\x00\x00\x00\x00\x40\x1C\x00\x00\x00\x00\x00\x00\x40\x20\x00\x00\x00\x00\x00\x00",
+      [0, 160, 0, 0, 1, 0, 0, 0, 53, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0, 64, 32, 0, 0, 0, 0, 0, 0].pack('C*'),
       'POINT(6 7 8)',
       3,
       0,
@@ -402,7 +394,7 @@ class WkbWriterTests < Minitest::Test
   def test_try_bad_byte_order_value_binary
     assert_raises(TypeError) do
       wkb_tester(
-        "\x01\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40\x00\x00\x00\x00\x00\x00\x20\x40",
+        [1, 1, 0, 0, 128, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64, 0, 0, 0, 0, 0, 0, 32, 64].pack('C*'),
         'POINT(6 7 8)',
         3,
         'gibberish',
@@ -414,7 +406,7 @@ class WkbWriterTests < Minitest::Test
 
     assert_raises(TypeError) do
       wkb_tester(
-        "\x01\x01\x00\x00\x80\x00\x00\x00\x00\x00\x00\x18\x40\x00\x00\x00\x00\x00\x00\x1C\x40\x00\x00\x00\x00\x00\x00\x20\x40",
+        [1, 1, 0, 0, 128, 0, 0, 0, 0, 0, 0, 24, 64, 0, 0, 0, 0, 0, 0, 28, 64, 0, 0, 0, 0, 0, 0, 32, 64].pack('C*'),
         'POINT(6 7 8)',
         3,
         1000,
@@ -441,13 +433,12 @@ class WkbWriterTests < Minitest::Test
     }
 
     tester[
-      "\x01\x01\x00\x00\x20\xE6\x10\x00\x00\x00\x00\x00\x00\x00\x00\xF0\x3F\x00\x00\x00\x00\x00\x00\x00\x40", {
-        :include_srid => true
-      }
+      [1, 1, 0, 0, 32, 230, 16, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*'),
+      include_srid: true
     ]
 
     tester[
-      "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xF0\x3F\x00\x00\x00\x00\x00\x00\x00\x40"
+      [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 240, 63, 0, 0, 0, 0, 0, 0, 0, 64].pack('C*')
     ]
   end
 
@@ -457,9 +448,11 @@ class WkbWriterTests < Minitest::Test
     geom = read('POINT(1 2 3)')
     geom.srid = 4326
 
-    assert_equal('0101000020E6100000000000000000F03F0000000000000040', @wkb_writer.write_hex(geom, {
-      :include_srid => true
-    }))
+    assert_equal('0101000020E6100000000000000000F03F0000000000000040',
+      @wkb_writer.write_hex(
+        geom,
+        include_srid: true
+      ))
 
     assert_equal('0101000000000000000000F03F0000000000000040', @wkb_writer.write_hex(geom))
   end

data/test/wkt_reader_tests.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
 require 'test_helper'
 
 class WktReaderTests < Minitest::Test
@@ -22,7 +20,6 @@ class WktReaderTests < Minitest::Test
       Geos::GEOS_POINT,
       'Point',
       Geos::Point,
-
       'POINT(0 0)',
       'POINT(0 0 0)',
       'POINT Z(0 0 0)',
@@ -122,6 +119,6 @@ class WktReaderTests < Minitest::Test
 
   def test_read_with_srid
     assert_equal(0, read('POINT (0 0)').srid)
-    assert_equal(4326, read('POINT (0 0)', :srid => 4326).srid)
+    assert_equal(4326, read('POINT (0 0)', srid: 4326).srid)
   end
 end

data/test/wkt_writer_tests.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
-$: << File.dirname(__FILE__)
 require 'test_helper'
 
 class WktWriterTests < Minitest::Test
@@ -11,9 +9,7 @@ class WktWriterTests < Minitest::Test
     geom = read('POINT(12.3456789 98.7654321)')
     wkt = write(geom)
 
-    x, y = if wkt =~ /^POINT\s\((\d+\.\d+)\s*(\d+\.\d+)\)$/
-      [ $1.to_f, $2.to_f ]
-    end
+    x, y = ([Regexp.last_match[1].to_f, Regexp.last_match[2].to_f] if wkt =~ /^POINT\s\((\d+\.\d+)\s*(\d+\.\d+)\)$/)
 
     assert_in_delta(12.3456789, x, TOLERANCE)
     assert_in_delta(98.7654321, y, TOLERANCE)
@@ -118,18 +114,13 @@ class WktWriterTests < Minitest::Test
     @writer.rounding_precision = 2
 
     geom = read('POINT(1 2 3)')
-    assert_equal('POINT (1 2)', write(geom, {
-      :trim => true
-    }))
-
-    assert_equal('POINT (1.0000 2.0000)', write(geom, {
-      :rounding_precision => 4
-    }))
-
-    assert_equal('POINT Z (1 2 3)', write(geom, {
-      :output_dimensions => 3,
-      :trim => true
-    }))
+    assert_equal('POINT (1 2)', write(geom, trim: true))
+
+    assert_equal('POINT (1.0000 2.0000)', write(geom, rounding_precision: 4))
+
+    assert_equal('POINT Z (1 2 3)', write(geom,
+      output_dimensions: 3,
+      trim: true))
 
     assert_equal('POINT (1.00 2.00)', write(geom))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.2.0
 platform: ruby
 authors:
 - J Smith
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -32,7 +32,9 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
+- FUNDING.yml
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -61,6 +63,8 @@ files:
 - lib/ffi-geos/wkb_writer.rb
 - lib/ffi-geos/wkt_reader.rb
 - lib/ffi-geos/wkt_writer.rb
+- sonar-project.properties
+- test/.rubocop.yml
 - test/coordinate_sequence_tests.rb
 - test/geometry_collection_tests.rb
 - test/geometry_tests.rb
@@ -84,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
@@ -99,12 +103,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-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:
+- test/.rubocop.yml
 - test/coordinate_sequence_tests.rb
 - test/geometry_collection_tests.rb
 - test/geometry_tests.rb