ffi-geos 0.5.0 → 1.0.0

data/test/wkb_reader_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WkbReaderTests < MiniTest::Unit::TestCase
+class WkbReaderTests < Minitest::Test
   include TestHelper
 
   def setup
@@ -206,4 +206,16 @@ class WkbReaderTests < MiniTest::Unit::TestCase
         :srid => 4326
       }).srid)
   end
+
+  def test_read_parse_error
+    assert_raises(Geos::WkbReader::ParseError) do
+      @wkb_reader.read("FOO")
+    end
+  end
+
+  def test_read_hex_parse_error
+    assert_raises(Geos::WkbReader::ParseError) do
+      @wkb_reader.read_hex("FOO")
+    end
+  end
 end

data/test/wkb_writer_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WkbWriterTests < MiniTest::Unit::TestCase
+class WkbWriterTests < Minitest::Test
   include TestHelper
 
   def setup
@@ -432,6 +432,32 @@ class WkbWriterTests < MiniTest::Unit::TestCase
     geom = read('POINT(1 2 3)')
     geom.srid = 4326
 
+    tester = lambda { |expected, *args|
+      expected.force_encoding('BINARY') if expected.respond_to?(:force_encoding)
+
+      assert_equal(
+        expected,
+        @wkb_writer.write(geom, *args)
+      )
+    }
+
+    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
+      }
+    ]
+
+    tester[
+      "\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xF0\x3F\x00\x00\x00\x00\x00\x00\x00\x40"
+    ]
+  end
+
+  def test_write_hex_with_options
+    skip unless ENV['FORCE_TESTS'] || defined?(Geos::FFIGeos)
+
+    geom = read('POINT(1 2 3)')
+    geom.srid = 4326
+
     assert_equal('0101000020E6100000000000000000F03F0000000000000040', @wkb_writer.write_hex(geom, {
       :include_srid => true
     }))
@@ -440,11 +466,11 @@ class WkbWriterTests < MiniTest::Unit::TestCase
   end
 
   def test_illegal_output_dimensions
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       @wkb_writer.output_dimensions = 10
     end
 
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       @wkb_writer.output_dimensions = 0
     end
   end

data/test/wkt_reader_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class WktReaderTests < MiniTest::Unit::TestCase
+class WktReaderTests < Minitest::Test
   include TestHelper
 
   def wkt_tester(type_id, geom_type, klass, *geoms)
@@ -114,7 +114,7 @@ class WktReaderTests < MiniTest::Unit::TestCase
   end
 
   def test_read_exception
-    assert_raises(RuntimeError) do
+    assert_raises(Geos::WktReader::ParseError) do
       read('gibberish')
     end
   end

data/test/wkt_writer_tests.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-geos
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi