ffi-geos 0.0.1.beta1 → 0.0.1.beta2

data/test/prepared_geometry_tests.rb

@@ -6,23 +6,69 @@ if defined?(Geos::PreparedGeometry)
   class PreparedGeometryTests < Test::Unit::TestCase
     include TestHelper
 
-    def test_contains_properly
-      geom_a = read('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))').to_prepared
-      geom_b = read('POLYGON((2 2, 2 3, 3 3, 3 2, 2 2))')
+    POINT_A = 'POINT(0 0)'
+    POINT_B = 'POINT(5 0)'
+    POINT_C = 'POINT(15 15)'
+    LINESTRING_A = 'LINESTRING(0 0, 10 0)'
+    LINESTRING_B = 'LINESTRING(5 -5, 5 5)'
+    LINESTRING_C = 'LINESTRING(5 0, 15 0)'
+    LINESTRING_D = 'LINESTRING(0 0, 5 0, 10 0)'
+    POLYGON_A = 'POLYGON((0 0, 10 0, 10 10, 0 10, 0 0))'
+    POLYGON_B = 'POLYGON((5 -5, 5 5, 15 5, 15 -5, 5 -5))'
 
-      assert(geom_a.contains_properly?(geom_b))
+    def relationship_tester(method, *expected)
+      [
+        [ POINT_A, POINT_A ],
+        [ POINT_A, LINESTRING_A ],
+        [ POINT_B, LINESTRING_A ],
+        [ LINESTRING_B, LINESTRING_A ],
+        [ LINESTRING_C, LINESTRING_A ],
+        [ LINESTRING_D, LINESTRING_A ],
+        [ POLYGON_A, POLYGON_B ],
+        [ POLYGON_A, POINT_C ],
+      ].each_with_index do |(geom_a, geom_b), i|
+        geom_a = read(geom_a).to_prepared
+        geom_b = read(geom_b)
 
-      geom_a = read('POLYGON((2 2, 2 3, 3 3, 3 2, 2 2))').to_prepared
-      geom_b = read('POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))')
+        value = geom_a.send(method, geom_b)
+        assert_equal(expected[i], value)
+      end
+    end
+
+    def test_disjoint
+      relationship_tester(:disjoint?, false, false, false, false, false, false, false, true)
+    end
 
-      assert(!geom_a.contains_properly?(geom_b))
+    def test_touches
+      relationship_tester(:touches?, false, true, false, false, false, false, false, false)
     end
 
     def test_intersects
-      geom_a = read('LINESTRING(0 0, 10 10)').to_prepared
-      geom_b = read('LINESTRING(0 10, 10 0)')
+      relationship_tester(:intersects?, true, true, true, true, true, true, true, false)
+    end
+
+    def test_crosses
+      relationship_tester(:crosses?, false, false, false, true, false, false, false, false)
+    end
+
+    def test_within
+      relationship_tester(:within?, true, false, true, false, false, true, false, false)
+    end
+
+    def test_contains
+      relationship_tester(:contains?, true, false, false, false, false, true, false, false)
+    end
+
+    def test_overlaps
+      relationship_tester(:overlaps?, false, false, false, false, true, false, true, false)
+    end
+
+    def test_covers
+      relationship_tester(:covers?, true, false, false, false, false, true, false, false)
+    end
 
-      assert(geom_a.intersects?(geom_b))
+    def test_covered_by
+      relationship_tester(:covered_by?, true, true, true, false, false, true, false, false)
     end
   end
 end

data/test/utils_tests.rb

@@ -206,7 +206,7 @@ class UtilsTests < Test::Unit::TestCase
     assert_equal(1, geom.num_geometries)
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_multi_point)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_point)
     def test_create_multi_point
       @writer.rounding_precision = 0
       assert_equal('MULTIPOINT EMPTY', write(Geos.create_multi_point))
@@ -226,7 +226,7 @@ class UtilsTests < Test::Unit::TestCase
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_multi_line_string)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_line_string)
     def test_create_multi_line_string
       @writer.rounding_precision = 0
       assert_equal('MULTILINESTRING EMPTY', write(Geos.create_multi_line_string))
@@ -246,7 +246,7 @@ class UtilsTests < Test::Unit::TestCase
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_multi_polygon)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_polygon)
     def test_create_multi_polygon
       @writer.rounding_precision = 0
       assert_equal('MULTIPOLYGON EMPTY', write(Geos.create_multi_polygon))
@@ -266,7 +266,7 @@ class UtilsTests < Test::Unit::TestCase
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_geometry_collection)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_geometry_collection)
     def test_create_geometry_collection
       @writer.rounding_precision = 0
       assert_equal('GEOMETRYCOLLECTION EMPTY', write(Geos.create_geometry_collection))
@@ -278,6 +278,11 @@ class UtilsTests < Test::Unit::TestCase
       )
     end
 
+    def test_create_geometry_collection_with_constants_and_symbols
+      assert_kind_of(Geos::MultiLineString, Geos.create_collection(Geos::GeomTypes::GEOS_MULTILINESTRING))
+      assert_kind_of(Geos::MultiLineString, Geos.create_collection(:multi_line_string))
+    end
+
     def test_create_bad_geometry_collection
       assert_raise(TypeError) do
         Geos.create_geometry_collection(
@@ -289,43 +294,43 @@ class UtilsTests < Test::Unit::TestCase
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_point)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_point)
     def test_create_empty_point
       assert_equal('POINT EMPTY', write(Geos.create_empty_point))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_line_string)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_line_string)
     def test_create_empty_line_string
       assert_equal('LINESTRING EMPTY', write(Geos.create_empty_line_string))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_polygon)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_polygon)
     def test_create_empty_polygon
       assert_equal('POLYGON EMPTY', write(Geos.create_empty_polygon))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_multi_point)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_multi_point)
     def test_create_empty_multi_point
       assert_equal('MULTIPOINT EMPTY', write(Geos.create_empty_multi_point))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_multi_line_string)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_multi_line_string)
     def test_create_empty_multi_line_string
       assert_equal('MULTILINESTRING EMPTY', write(Geos.create_empty_multi_line_string))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_multi_polygon)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_multi_polygon)
     def test_create_empty_multi_polygon
       assert_equal('MULTIPOLYGON EMPTY', write(Geos.create_empty_multi_polygon))
     end
   end
 
-  if ENV['FORCE_TESTS'] || Geos.method_defined?(:create_empty_geometry_collection)
+  if ENV['FORCE_TESTS'] || Geos.respond_to?(:create_empty_geometry_collection)
     def test_create_empty_geometry_collection
       assert_equal('GEOMETRYCOLLECTION EMPTY', write(Geos.create_empty_geometry_collection))
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ffi-geos
 version: !ruby/object:Gem::Version 
-  hash: 62196393
+  hash: 62196399
   prerelease: 6
   segments: 
   - 0
   - 0
   - 1
   - beta
-  - 1
-  version: 0.0.1.beta1
+  - 2
+  version: 0.0.1.beta2
 platform: ruby
 authors: 
 - J Smith
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-14 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: []
 
 description: An ffi wrapper for GEOS, a C++ port of the Java Topology Suite (JTS).
@@ -33,6 +33,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- ffi-geos.gemspec
+- lib/buffer_params.rb
 - lib/coordinate_sequence.rb
 - lib/ffi-geos.rb
 - lib/geometry.rb