ffi-geos 1.2.1 → 1.2.2

data/test/tools_tests.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -24,7 +23,7 @@ class ToolsTests < Minitest::Test
   def test_bool_to_int
     assert_equal(1, Geos::Tools.bool_to_int(1))
     assert_equal(1, Geos::Tools.bool_to_int(true))
-    assert_equal(1, Geos::Tools.bool_to_int(""))
+    assert_equal(1, Geos::Tools.bool_to_int(''))
     assert_equal(1, Geos::Tools.bool_to_int(0))
     assert_equal(0, Geos::Tools.bool_to_int(false))
     assert_equal(0, Geos::Tools.bool_to_int(nil))
@@ -91,4 +90,3 @@ class ToolsTests < Minitest::Test
     assert_equal(:round, Geos::Tools.symbol_for_enum(Geos::BufferCapStyles, 1))
   end
 end
-

data/test/utils_tests.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -14,17 +13,17 @@ class UtilsTests < Minitest::Test
   def test_orientation_index
     skip unless ENV['FORCE_TESTS'] || (defined?(Geos::Utils) && Geos::Utils.respond_to?(:orientation_index))
 
-    assert_equal(0,  Geos::Utils.orientation_index(0, 0, 10, 0, 5, 0))
-    assert_equal(0,  Geos::Utils.orientation_index(0, 0, 10, 0, 10, 0))
-    assert_equal(0,  Geos::Utils.orientation_index(0, 0, 10, 0, 0, 0))
-    assert_equal(0,  Geos::Utils.orientation_index(0, 0, 10, 0, -5, 0))
-    assert_equal(0,  Geos::Utils.orientation_index(0, 0, 10, 0, 20, 0))
-    assert_equal(1,  Geos::Utils.orientation_index(0, 0, 10, 10, 5, 6))
-    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(0, Geos::Utils.orientation_index(0, 0, 10, 0, 5, 0))
+    assert_equal(0, Geos::Utils.orientation_index(0, 0, 10, 0, 10, 0))
+    assert_equal(0, Geos::Utils.orientation_index(0, 0, 10, 0, 0, 0))
+    assert_equal(0, Geos::Utils.orientation_index(0, 0, 10, 0, -5, 0))
+    assert_equal(0, Geos::Utils.orientation_index(0, 0, 10, 0, 20, 0))
+    assert_equal(1, Geos::Utils.orientation_index(0, 0, 10, 10, 5, 6))
+    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))
   end
 
   def test_relate_match
@@ -58,7 +57,7 @@ class UtilsTests < Minitest::Test
   end
 
   def test_create_point_with_x_y_and_z_arguments
-    assert_equal('POINT Z (10 20 30)', write(Geos.create_point(10, 20, 30), :output_dimensions => 3))
+    assert_equal('POINT Z (10 20 30)', write(Geos.create_point(10, 20, 30), output_dimensions: 3))
   end
 
   def test_create_point_with_too_many_arguments
@@ -76,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
@@ -120,7 +119,7 @@ class UtilsTests < Minitest::Test
   def test_create_bad_line_string
     cs = Geos::CoordinateSequence.new(1, 0)
     assert_raises(ArgumentError) do
-      Geos::create_line_string(cs)
+      Geos.create_line_string(cs)
     end
   end
 
@@ -173,7 +172,7 @@ class UtilsTests < Minitest::Test
     cs = Geos::CoordinateSequence.new(1, 0)
 
     assert_raises(ArgumentError) do
-      Geos::create_linear_ring(cs)
+      Geos.create_linear_ring(cs)
     end
   end
 
@@ -186,9 +185,9 @@ class UtilsTests < Minitest::Test
       [ 0, 0 ]
     ])
 
-    exterior_ring = Geos::create_linear_ring(cs)
+    exterior_ring = Geos.create_linear_ring(cs)
 
-    geom = Geos::create_polygon(exterior_ring)
+    geom = Geos.create_polygon(exterior_ring)
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -212,7 +211,7 @@ class UtilsTests < Minitest::Test
       [ 2, 2 ]
     )
 
-    geom = Geos::create_polygon(outer, inner)
+    geom = Geos.create_polygon(outer, inner)
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
@@ -244,7 +243,7 @@ class UtilsTests < Minitest::Test
       [ 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)
@@ -340,6 +339,7 @@ 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)
 
@@ -355,7 +355,7 @@ class UtilsTests < Minitest::Test
   def test_create_geometry_collection_with_options
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_geometry_collection)
 
-    geom = Geos.create_collection(:multi_line_string, :srid => 4326)
+    geom = Geos.create_collection(:multi_line_string, srid: 4326)
 
     assert_kind_of(Geos::MultiLineString, geom)
     assert_equal(4326, geom.srid)

data/test/wkb_reader_tests.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -192,9 +191,10 @@ class WkbReaderTests < Minitest::Test
       @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)
 
     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(
+        "\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)
   end
 
   def test_read_hex_srid
@@ -202,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,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -121,8 +120,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_little_endian_with_3d_input
     wkb_tester(
       '010100000000000000000018400000000000001C40',
@@ -145,8 +142,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_big_endian_with_3d_input
     wkb_tester(
       '00000000014018000000000000401C000000000000',
@@ -314,8 +309,6 @@ class WkbWriterTests < Minitest::Test
     )
   end
 
-
-
   def test_2d_little_endian_with_3d_input_binary
     wkb_tester(
       '010100000000000000000018400000000000001C40',
@@ -440,9 +433,8 @@ 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
-      }
+      "\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
     ]
 
     tester[
@@ -456,9 +448,9 @@ 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,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -121,6 +120,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,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 require 'test_helper'
@@ -11,7 +10,7 @@ class WktWriterTests < Minitest::Test
     wkt = write(geom)
 
     x, y = if wkt =~ /^POINT\s\((\d+\.\d+)\s*(\d+\.\d+)\)$/
-      [ $1.to_f, $2.to_f ]
+      [ Regexp.last_match[1].to_f, Regexp.last_match[2].to_f ]
     end
 
     assert_in_delta(12.3456789, x, TOLERANCE)
@@ -117,18 +116,14 @@ 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.1
+  version: 1.2.2
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -32,6 +32,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -61,6 +62,7 @@ files:
 - lib/ffi-geos/wkb_writer.rb
 - lib/ffi-geos/wkt_reader.rb
 - lib/ffi-geos/wkt_writer.rb
+- test/.rubocop.yml
 - test/coordinate_sequence_tests.rb
 - test/geometry_collection_tests.rb
 - test/geometry_tests.rb
@@ -100,11 +102,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 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