ffi-geos 0.0.6 → 0.1.0

data/test/utils_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class UtilsTests < Test::Unit::TestCase
+class UtilsTests < MiniTest::Unit::TestCase
   include TestHelper
 
   if defined?(Geos::Utils)
@@ -24,10 +24,10 @@ class UtilsTests < Test::Unit::TestCase
 
     if Geos::Utils.respond_to?(:relate_match)
       def test_relate_match
-        assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF2'))
-        assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF*'))
-        assert(Geos::Utils.relate_match('0FFFFFFF2', 'TFFFFFFF2'))
-        assert(!Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFFF'))
+        assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF2'), "'0FFFFFFF2' and '0FFFFFFF2' patterns match")
+        assert(Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFF*'), "'0FFFFFFF2' and '0FFFFFFF*' patterns match")
+        assert(Geos::Utils.relate_match('0FFFFFFF2', 'TFFFFFFF2'), "'0FFFFFFF2' and 'TFFFFFFF2' patterns match")
+        assert(!Geos::Utils.relate_match('0FFFFFFF2', '0FFFFFFFF'), "'0FFFFFFF2' and '0FFFFFFFF' patterns match")
       end
     end
   end
@@ -36,9 +36,9 @@ class UtilsTests < Test::Unit::TestCase
     geom = Geos.send(method, cs)
     expected_geom = read(expected)
 
-    assert(expected_geom.eql_exact?(geom, TOLERANCE))
-    assert(geom.valid?)
-    assert_instance_of(klass, geom)
+    assert_geom_eql_exact(expected_geom, geom)
+    assert_geom_valid(geom)
+    assert_kind_of(klass, geom)
     assert_equal(type_id, geom.type_id)
 
     yield geom if block_given?
@@ -52,9 +52,17 @@ class UtilsTests < Test::Unit::TestCase
     create_method_tester('POINT(10 20)', :create_point, cs, Geos::GEOS_POINT, Geos::Point)
   end
 
+  def test_create_point_with_x_and_y_arguments
+    assert_equal('POINT (10 20)', write(Geos.create_point(10, 20), :trim => true))
+  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), :trim => true, :output_dimensions => 3))
+  end
+
   def test_bad_create_point
     cs = Geos::CoordinateSequence.new(0, 0)
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Geos.create_point(cs)
     end
   end
@@ -75,18 +83,37 @@ class UtilsTests < Test::Unit::TestCase
       Geos::GEOS_LINESTRING,
       Geos::LineString
     ) do |geom|
-      assert(!geom.empty?)
-      assert(geom.valid?)
-      assert(geom.simple?)
-      assert(!geom.ring?)
-      assert(geom.has_z?)
+      refute_geom_empty(geom)
+      assert_geom_valid(geom)
+      assert_geom_simple(geom)
+      refute_geom_ring(geom)
+      assert_geom_has_z(geom)
+      assert_equal(1, geom.num_geometries)
+    end
+  end
+
+  def test_create_line_string_with_array
+    writer.output_dimensions = 3
+
+    create_method_tester(
+      'LINESTRING Z (10 20 30, 30 20 10)',
+      :create_line_string,
+      [[ 10, 20, 30 ], [ 30, 20, 10 ]],
+      Geos::GEOS_LINESTRING,
+      Geos::LineString
+    ) do |geom|
+      refute_geom_empty(geom)
+      assert_geom_valid(geom)
+      assert_geom_simple(geom)
+      refute_geom_ring(geom)
+      assert_geom_has_z(geom)
       assert_equal(1, geom.num_geometries)
     end
   end
 
   def test_create_bad_line_string
     cs = Geos::CoordinateSequence.new(1, 0)
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Geos::create_line_string(cs)
     end
   end
@@ -113,11 +140,30 @@ class UtilsTests < Test::Unit::TestCase
       Geos::GEOS_LINEARRING,
       Geos::LinearRing
     ) do |geom|
-      assert(!geom.empty?)
-      assert(geom.valid?)
-      assert(geom.simple?)
-      assert(geom.ring?)
-      assert(geom.has_z?)
+      refute_geom_empty(geom)
+      assert_geom_valid(geom)
+      assert_geom_simple(geom)
+      assert_geom_ring(geom)
+      assert_geom_has_z(geom)
+      assert_equal(1, geom.num_geometries)
+    end
+  end
+
+  def test_create_linear_ring_with_array
+    writer.output_dimensions = 3
+
+    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 ]],
+      Geos::GEOS_LINEARRING,
+      Geos::LinearRing
+    ) do |geom|
+      refute_geom_empty(geom)
+      assert_geom_valid(geom)
+      assert_geom_simple(geom)
+      assert_geom_ring(geom)
+      assert_geom_has_z(geom)
       assert_equal(1, geom.num_geometries)
     end
   end
@@ -125,7 +171,7 @@ class UtilsTests < Test::Unit::TestCase
   def test_bad_create_linear_ring
     cs = Geos::CoordinateSequence.new(1, 0)
 
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Geos::create_linear_ring(cs)
     end
   end
@@ -202,18 +248,18 @@ class UtilsTests < Test::Unit::TestCase
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
 
-    assert(!geom.empty?)
-    assert(geom.valid?)
-    assert(geom.simple?)
-    assert(!geom.ring?)
-    assert(!geom.has_z?)
+    refute_geom_empty(geom)
+    assert_geom_valid(geom)
+    assert_geom_simple(geom)
+    refute_geom_ring(geom)
+    refute_geom_has_z(geom)
 
     assert_equal(1, geom.num_geometries)
   end
 
   if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_point)
     def test_create_multi_point
-      @writer.rounding_precision = 0
+      writer.rounding_precision = 0
       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)'),
@@ -222,7 +268,7 @@ class UtilsTests < Test::Unit::TestCase
     end
 
     def test_create_bad_multi_point
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Geos.create_multi_point(
           read('POINT(0 0)'),
           read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
@@ -233,7 +279,7 @@ class UtilsTests < Test::Unit::TestCase
 
   if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_line_string)
     def test_create_multi_line_string
-      @writer.rounding_precision = 0
+      writer.rounding_precision = 0
       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)'),
@@ -242,7 +288,7 @@ class UtilsTests < Test::Unit::TestCase
     end
 
     def test_create_bad_multi_line_string
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Geos.create_multi_point(
           read('POINT(0 0)'),
           read('LINESTRING(0 0, 10 0)')
@@ -253,7 +299,7 @@ class UtilsTests < Test::Unit::TestCase
 
   if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_polygon)
     def test_create_multi_polygon
-      @writer.rounding_precision = 0
+      writer.rounding_precision = 0
       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))'),
@@ -262,7 +308,7 @@ class UtilsTests < Test::Unit::TestCase
     end
 
     def test_create_bad_multi_polygon
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Geos.create_multi_polygon(
           read('POINT(0 0)'),
           read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))')
@@ -273,7 +319,7 @@ class UtilsTests < Test::Unit::TestCase
 
   if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_geometry_collection)
     def test_create_geometry_collection
-      @writer.rounding_precision = 0
+      writer.rounding_precision = 0
       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(
@@ -289,7 +335,7 @@ class UtilsTests < Test::Unit::TestCase
     end
 
     def test_create_bad_geometry_collection
-      assert_raise(TypeError) do
+      assert_raises(TypeError) do
         Geos.create_geometry_collection(
           read('POINT(0 0)'),
           read('POLYGON((10 10, 10 15, 15 15, 15 10, 10 10))'),
@@ -346,4 +392,40 @@ class UtilsTests < Test::Unit::TestCase
       assert_equal('LINEARRING EMPTY', write(Geos.create_empty_linear_ring))
     end
   end
+
+  def test_create_geometry_segfault
+    # This used to segfault before moving the autorelease code to before
+    # the initialization. It didn't occur 100% of the time. The cause was
+    # GEOS taking ownership of CoordinateSequences and deleting them out from
+    # under us and GC blowing up.
+
+    assert_raises(RuntimeError) do
+      cs = Geos::CoordinateSequence.new(0, 2)
+      Geos.create_point(cs)
+      GC.start
+    end
+
+    assert_raises(RuntimeError) do
+      cs = Geos::CoordinateSequence.new(1, 2)
+      Geos.create_line_string(cs)
+      GC.start
+    end
+
+    assert_raises(RuntimeError) do
+      cs = Geos::CoordinateSequence.new(1, 2)
+      Geos.create_linear_ring(cs)
+      GC.start
+    end
+
+    assert_raises(RuntimeError) do
+      cs = Geos::CoordinateSequence.new([
+        [0, 0],
+        [0, 5],
+        [5, 5],
+        [0, 5]
+      ])
+      Geos.create_linear_ring(cs)
+      GC.start
+    end
+  end
 end

data/test/wkb_reader_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WkbReaderTests < Test::Unit::TestCase
+class WkbReaderTests < MiniTest::Unit::TestCase
   include TestHelper
 
   def setup
@@ -17,11 +17,11 @@ class WkbReaderTests < Test::Unit::TestCase
     else
       @wkb_reader.read(g)
     end
-    assert(geom)
+    refute_nil(geom)
     assert_equal(type_id, geom.type_id)
     assert_equal(geom_type, geom.geom_type)
-    assert(geom.is_a?(klass))
-    assert(read(expected).eql_exact?(geom, TOLERANCE))
+    assert_kind_of(klass, geom)
+    assert_geom_eql_exact(read(expected), geom)
     assert_equal(srid, geom.srid)
   end
 
@@ -185,4 +185,24 @@ class WkbReaderTests < Test::Unit::TestCase
       false
     )
   end
+
+  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)
+
+    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)
+  end
+
+  def test_read_hex_srid
+    assert_equal(43,
+      @wkb_reader.read_hex('01010000202B00000000000000000018400000000000001C40').srid)
+
+    assert_equal(4326,
+      @wkb_reader.read_hex('01010000202B00000000000000000018400000000000001C40', {
+        :srid => 4326
+      }).srid)
+  end
 end

data/test/wkb_writer_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WkbWriterTests < Test::Unit::TestCase
+class WkbWriterTests < MiniTest::Unit::TestCase
   include TestHelper
 
   def setup
@@ -198,7 +198,7 @@ class WkbWriterTests < Test::Unit::TestCase
   end
 
   def test_try_bad_byte_order_value
-    assert_raise(TypeError) do
+    assert_raises(TypeError) do
       wkb_tester(
         '010100008000000000000018400000000000001C400000000000002040',
         'POINT(6 7 8)',
@@ -209,7 +209,7 @@ class WkbWriterTests < Test::Unit::TestCase
       )
     end
 
-    assert_raise(TypeError) do
+    assert_raises(TypeError) do
       wkb_tester(
         '010100008000000000000018400000000000001C400000000000002040',
         'POINT(6 7 8)',
@@ -394,7 +394,7 @@ class WkbWriterTests < Test::Unit::TestCase
   end
 
   def test_try_bad_byte_order_value_binary
-    assert_raise(TypeError) do
+    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",
         'POINT(6 7 8)',
@@ -406,7 +406,7 @@ class WkbWriterTests < Test::Unit::TestCase
       )
     end
 
-    assert_raise(TypeError) do
+    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",
         'POINT(6 7 8)',

data/test/wkt_reader_tests.rb

@@ -2,16 +2,16 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WktReaderTests < Test::Unit::TestCase
+class WktReaderTests < MiniTest::Unit::TestCase
   include TestHelper
 
   def wkt_tester(type_id, geom_type, klass, *geoms)
     geoms.each do |g|
       geom = read(g)
-      assert(geom)
+      refute_nil(geom)
       assert_equal(type_id, geom.type_id)
       assert_equal(geom_type, geom.geom_type)
-      assert(geom.is_a?(klass))
+      assert_kind_of(klass, geom)
     end
   end
 
@@ -109,12 +109,17 @@ class WktReaderTests < Test::Unit::TestCase
     geom = read('LINEARRING(0 0, 1 1, 2 2, 3 3, 0 0)')
     assert_equal(Geos::GEOS_LINEARRING, geom.type_id)
     assert_equal('LinearRing', geom.geom_type)
-    assert(geom.is_a?(Geos::LinearRing))
+    assert_kind_of(Geos::LinearRing, geom)
   end
 
   def test_read_exception
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       read('gibberish')
     end
   end
+
+  def test_read_with_srid
+    assert_equal(0, read('POINT (0 0)').srid)
+    assert_equal(4326, read('POINT (0 0)', :srid => 4326).srid)
+  end
 end

data/test/wkt_writer_tests.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WktWriterTests < Test::Unit::TestCase
+class WktWriterTests < MiniTest::Unit::TestCase
   include TestHelper
 
   def test_write_point
@@ -91,12 +91,12 @@ class WktWriterTests < Test::Unit::TestCase
       assert_equal('POINT (3 2)', write(geom_2d))
 
       # 1 is invalid
-      assert_raise(RuntimeError) do
+      assert_raises(RuntimeError) do
         writer.output_dimensions = 1
       end
 
       # 4 is invalid
-      assert_raise(RuntimeError) do
+      assert_raises(RuntimeError) do
         writer.output_dimensions = 4
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -59,6 +59,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 email: dark.panda@gmail.com
 executables: []
@@ -94,9 +126,13 @@ files:
 - lib/ffi-geos/wkt_reader.rb
 - lib/ffi-geos/wkt_writer.rb
 - test/coordinate_sequence_tests.rb
+- test/geometry_collection_tests.rb
 - test/geometry_tests.rb
+- test/line_string_tests.rb
+- test/linear_ring_tests.rb
 - test/misc_tests.rb
 - test/point_tests.rb
+- test/polygon_tests.rb
 - test/prepared_geometry_tests.rb
 - test/strtree_tests.rb
 - test/test_helper.rb
@@ -125,15 +161,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
 test_files:
 - test/coordinate_sequence_tests.rb
+- test/geometry_collection_tests.rb
 - test/geometry_tests.rb
+- test/line_string_tests.rb
+- test/linear_ring_tests.rb
 - test/misc_tests.rb
 - test/point_tests.rb
+- test/polygon_tests.rb
 - test/prepared_geometry_tests.rb
 - test/strtree_tests.rb
 - test/test_helper.rb