activerecord-spatial 1.0.0 → 2.0.0

data/test/spatial_scopes_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialScopesTests < ActiveRecordSpatialTestCase
@@ -13,82 +13,80 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_contains
-    ids_tester(:st_contains, 'POINT(3 3)', [ 3 ])
+    ids_tester(:st_contains, 'POINT(3 3)', [3])
   end
 
   def test_containsproperly
-    ids_tester(:st_containsproperly, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+    ids_tester(:st_containsproperly, 'LINESTRING(-4 -4, 4 4)', [3])
   end
 
   def test_covers
-    ids_tester(:st_covers, 'LINESTRING(-4 -4, 4 4)', [ 3 ])
+    ids_tester(:st_covers, 'LINESTRING(-4 -4, 4 4)', [3])
   end
 
   def test_coveredby
-    ids_tester(:st_coveredby, 'POLYGON((-6 -6, -6 6, 6 6, 6 -6, -6 -6))', [ 1, 3 ])
+    ids_tester(:st_coveredby, 'POLYGON((-6 -6, -6 6, 6 6, 6 -6, -6 -6))', [1, 3])
   end
 
   def test_crosses
-    ids_tester(:st_crosses, 'LINESTRING(-6 -6, 4 4)', [ 3 ])
+    ids_tester(:st_crosses, 'LINESTRING(-6 -6, 4 4)', [3])
   end
 
   def test_disjoint
-    ids_tester(:st_disjoint, 'POINT(100 100)', [ 1, 2, 3 ])
+    ids_tester(:st_disjoint, 'POINT(100 100)', [1, 2, 3])
   end
 
   def test_equal
-    ids_tester(:st_equals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [ 3 ])
+    ids_tester(:st_equals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [3])
   end
 
   def test_intersects
-    ids_tester(:st_intersects, 'LINESTRING(-5 -5, 10 10)', [ 1, 2, 3 ])
+    ids_tester(:st_intersects, 'LINESTRING(-5 -5, 10 10)', [1, 2, 3])
   end
 
   def test_orderingequals
-    ids_tester(:st_orderingequals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [ 3 ])
+    ids_tester(:st_orderingequals, 'POLYGON((-5 -5, -5 5, 5 5, 5 -5, -5 -5))', [3])
   end
 
   def test_overlaps
-    ids_tester(:st_overlaps, 'POLYGON((-6 -6, -5 0, 0 0, 0 -5, -6 -6))', [ 3 ])
+    ids_tester(:st_overlaps, 'POLYGON((-6 -6, -5 0, 0 0, 0 -5, -6 -6))', [3])
   end
 
   def test_touches
-    ids_tester(:st_touches, 'POLYGON((-5 -5, -5 -10, -10 -10, -10 -5, -5 -5))', [ 3 ])
+    ids_tester(:st_touches, 'POLYGON((-5 -5, -5 -10, -10 -10, -10 -5, -5 -5))', [3])
   end
 
   def test_within
-    ids_tester(:st_within, 'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))', [ 1, 2 ])
+    ids_tester(:st_within, 'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))', [1, 2])
   end
 
   def test_dwithin
-    ids_tester(:st_dwithin, [ 'POINT(5 5)', 10 ], [ 1, 2, 3 ])
+    ids_tester(:st_dwithin, ['POINT(5 5)', 10], [1, 2, 3])
   end
 
   def test_dfullywithin
-    ids_tester(:st_dfullywithin, [ 'POINT(5 5)', 10 ], [ 1, 2 ])
+    ids_tester(:st_dfullywithin, ['POINT(5 5)', 10], [1, 2])
   end
 
   def test_geometry_type
-    ids_tester(:st_geometry_type, 'ST_Point', [ 1, 2 ])
-    ids_tester(:st_geometry_type, [ 'ST_Point', 'ST_Polygon' ], [ 1, 2, 3 ])
-    ids_tester(:st_geometry_type, [ 'ST_MultiLineString' ], [])
+    ids_tester(:st_geometry_type, 'ST_Point', [1, 2])
+    ids_tester(:st_geometry_type, %w{ ST_Point ST_Polygon }, [1, 2, 3])
+    ids_tester(:st_geometry_type, ['ST_MultiLineString'], [])
   end
 
   def test_allow_null
-    begin
-      foo = Foo.create(:name => 'four')
-      ids_tester(:st_contains, [ 'POINT(3 3)', { :allow_null => true } ], [ 3, foo.id ])
-    ensure
-      Foo.find_by_name('four').destroy
-    end
+    foo = Foo.create(name: 'four')
+    ids_tester(:st_contains, ['POINT(3 3)', { allow_null: true }], [3, foo.id])
+  ensure
+    Foo.find_by_name('four').destroy
   end
 
   def test_nil_relationship
-    assert_equal([ 1, 2, 3 ], Foo.st_within(nil).to_a.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_within(nil).to_a.collect(&:id).sort)
   end
 
   def test_with_column
-    assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', :column => :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('POINT(100 100)', column: :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_with_srid_switching
@@ -101,8 +99,8 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_with_srid_transform
-    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4269; POINT(100 100)', :column => :the_other_geom).to_a.collect(&:id).sort)
-    assert_equal([3], Foo.st_contains('SRID=4269; POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([1, 2, 3], Foo.st_disjoint('SRID=4269; POINT(100 100)', column: :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([3], Foo.st_contains('SRID=4269; POINT(7 7)', column: :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_order_by_st_distance
@@ -110,7 +108,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_distance_desc
-    assert_equal([2, 1, 3], Foo.order_by_st_distance('POINT(1 1)', :desc => true).to_a.collect(&:id))
+    assert_equal([2, 1, 3], Foo.order_by_st_distance('POINT(1 1)', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_distance_sphere
@@ -118,7 +116,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_distance_sphere_desc
-    assert_equal([2, 1, 3], Foo.order_by_st_distance_sphere('POINT(1 1)', :desc => true).to_a.collect(&:id))
+    assert_equal([2, 1, 3], Foo.order_by_st_distance_sphere('POINT(1 1)', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_max_distance
@@ -126,7 +124,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_max_distance_desc
-    assert_equal([2, 3, 1], Foo.order_by_st_maxdistance('POINT(1 1)', :desc => true).to_a.collect(&:id))
+    assert_equal([2, 3, 1], Foo.order_by_st_maxdistance('POINT(1 1)', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area
@@ -134,7 +132,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_area_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_area(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_area(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_ndims
@@ -142,7 +140,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_ndims_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_ndims(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_ndims(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_npoints
@@ -150,7 +148,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_npoints_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_npoints(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_npoints(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_nrings
@@ -158,7 +156,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_nrings_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_nrings(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_nrings(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_numgeometries
@@ -166,7 +164,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_numgeometries_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numgeometries(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_numgeometries(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorring
@@ -174,7 +172,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_numinteriorring_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorring(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorring(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_numinteriorrings
@@ -182,7 +180,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_numinteriorrings_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorrings(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_numinteriorrings(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_numpoints
@@ -190,7 +188,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_numpoints_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_numpoints(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_numpoints(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d
@@ -198,7 +196,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_length3d_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length3d(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_length3d(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length
@@ -206,7 +204,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_length_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_length(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d
@@ -214,7 +212,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_length2d_desc
-    assert_equal([1, 2, 3], Foo.order_by_st_length2d(:desc => true).to_a.collect(&:id))
+    assert_equal([1, 2, 3], Foo.order_by_st_length2d(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length3d_spheroid
@@ -228,7 +226,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       [1, 2, 3]
     end
 
-    assert_equal(expected, Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).to_a.collect(&:id))
+    assert_equal(expected, Foo.order_by_st_length3d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length2d_spheroid
@@ -236,7 +234,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_length2d_spheroid_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_length2d_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length_spheroid
@@ -250,7 +248,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       [1, 2, 3]
     end
 
-    assert_equal(expected, Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).to_a.collect(&:id))
+    assert_equal(expected, Foo.order_by_st_length_spheroid('SPHEROID["WGS 84", 6378137, 298.257223563]', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter
@@ -258,7 +256,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_perimeter_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_perimeter(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter2d
@@ -266,7 +264,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_perimeter2d_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter2d(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_perimeter2d(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter3d
@@ -274,7 +272,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_perimeter3d_desc
-    assert_equal([3, 1, 2], Foo.order_by_st_perimeter3d(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], Foo.order_by_st_perimeter3d(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_hausdorffdistance
@@ -282,7 +280,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_hausdorffdistance_desc
-    assert_equal([2, 3, 1], Foo.order_by_st_hausdorffdistance('POINT(1 1)', :desc => true).to_a.collect(&:id))
+    assert_equal([2, 3, 1], Foo.order_by_st_hausdorffdistance('POINT(1 1)', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_hausdorffdistance_with_densify_frac
@@ -294,7 +292,7 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_distance_spheroid_desc
-    assert_equal([1, 3, 2], Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]', :desc => true).to_a.collect(&:id))
+    assert_equal([1, 3, 2], Foo.order_by_st_distance_spheroid('POINT(10 10)', 'SPHEROID["WGS 84", 6378137, 298.257223563]', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_with_desc_symbol
@@ -304,13 +302,25 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   def test_3dintersects
     skip('ST_3dintersects is unavailable') unless Foo3d.respond_to?(:st_3dintersects)
 
-    ids_tester(:st_3dintersects, 'LINESTRING(-5 -5 -5, 10 10 10)', [ 1, 3 ], Foo3d)
+    expected = if ActiveRecordSpatial::POSTGIS[:lib] >= '2.2'
+      [1, 2, 3]
+    else
+      [1, 3]
+    end
+
+    ids_tester(:st_3dintersects, 'LINESTRING(-5 -5 -5, 10 10 10)', expected, Foo3d)
   end
 
   def test_3ddistance
     skip('ST_3ddistance is unavailable') unless Foo3d.respond_to?(:order_by_st_3ddistance)
 
-    assert_equal([3, 2, 1], Foo3d.order_by_st_3ddistance('POINT(10 10)').to_a.collect(&:id))
+    expected = if ActiveRecordSpatial::POSTGIS[:lib] >= '2.2'
+      [2, 3, 1]
+    else
+      [3, 2, 1]
+    end
+
+    assert_equal(expected, Foo3d.order_by_st_3ddistance('POINT(10 10)').to_a.collect(&:id))
   end
 
   def test_3dmaxdistance
@@ -322,13 +332,13 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
   def test_3ddwithin
     skip('ST_3ddwithin is unavailable') unless Foo3d.respond_to?(:st_3ddwithin)
 
-    ids_tester(:st_3ddwithin, [ 'LINESTRING(-5 -5 -5, 10 10 10)', 10 ], [ 1, 2, 3 ], Foo3d)
+    ids_tester(:st_3ddwithin, ['LINESTRING(-5 -5 -5, 10 10 10)', 10], [1, 2, 3], Foo3d)
   end
 
   def test_3ddfullywithin
     skip('ST_3ddfullywithin is unavilable') unless Foo3d.respond_to?(:st_3ddfullywithin)
 
-    ids_tester(:st_3ddfullywithin, [ 'LINESTRING(-10 -10 -10, 10 10 10)', 100 ], [ 1, 2, 3 ], Foo3d)
+    ids_tester(:st_3ddfullywithin, ['LINESTRING(-10 -10 -10, 10 10 10)', 100], [1, 2, 3], Foo3d)
   end
 
   def test_order_by_with_column_wrapper
@@ -337,9 +347,9 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     assert_sql(/ST_envelope\("foos"."the_geom"\)/) do
       values = Foo.
         order_by_st_perimeter(
-          :desc => true,
-          :column => {
-            :wrapper => :envelope
+          desc: true,
+          column: {
+            wrapper: :envelope
           }
         ).to_a.collect(&:id)
     end
@@ -353,10 +363,10 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     assert_sql(/ST_geometryn\("foos"."the_geom", 1\)/) do
       values = Foo.
         order_by_st_perimeter(
-          :desc => true,
-          :column => {
-            :wrapper => {
-              :geometryn => 1
+          desc: true,
+          column: {
+            wrapper: {
+              geometryn: 1
             }
           }
         ).to_a.collect(&:id)
@@ -371,10 +381,10 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     assert_sql(/ST_snap\("foos"."the_geom", 'POINT \(0 0\)', 1.0\)/) do
       values = Foo.
         order_by_st_perimeter(
-          :desc => true,
-          :column => {
-            :wrapper => {
-              :snap => [
+          desc: true,
+          column: {
+            wrapper: {
+              snap: [
                 'POINT (0 0)',
                 1.0
               ]
@@ -393,8 +403,8 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       values = Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
-          :column => {
-            :wrapper => :centroid
+          column: {
+            wrapper: :centroid
           }
         ).to_a.collect(&:id)
     end
@@ -409,9 +419,9 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
       values = Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
-          :column => {
-            :wrapper => {
-              :geometryn => 1
+          column: {
+            wrapper: {
+              geometryn: 1
             }
           }
         ).to_a.collect(&:id)
@@ -420,16 +430,16 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     assert_equal([1, 2], values)
   end
 
-    def test_relationship_with_column_wrapper_and_options
+  def test_relationship_with_column_wrapper_and_options
     values = nil
 
     assert_sql(/ST_snap\("foos"."the_geom", 'POINT \(0 0\)', 1.0\)/) do
       values = Foo.
         st_within(
           'POLYGON((-5 -5, 5 10, 20 20, 10 5, -5 -5))',
-          :column => {
-            :wrapper => {
-              :snap => [
+          column: {
+            wrapper: {
+              snap: [
                 'POINT (0 0)',
                 1.0
               ]
@@ -441,4 +451,3 @@ class SpatialScopesTests < ActiveRecordSpatialTestCase
     assert_equal([1, 2], values)
   end
 end
-