activerecord-spatial 1.0.0 → 2.0.0

data/test/geography_column_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class GeographyColumnTests < ActiveRecordSpatialTestCase
@@ -22,7 +22,7 @@ class GeographyColumnTests < ActiveRecordSpatialTestCase
   end
 
   def test_coord_dimension_for
-    assert_equal(2, FooGeography.coord_dimension_for(:the_geom))
+    assert_nil(FooGeography.coord_dimension_for(:the_geom))
     assert_equal(2, FooGeography.coord_dimension_for(:the_other_geom))
   end
 
@@ -37,4 +37,3 @@ class GeographyColumnTests < ActiveRecordSpatialTestCase
     assert_equal(4326, FooGeography.geography_column_by_name(:the_other_geom).spatial_ref_sys.srid)
   end
 end
-

data/test/geometry_column_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class GeometryColumnTests < ActiveRecordSpatialTestCase
@@ -37,4 +37,3 @@ class GeometryColumnTests < ActiveRecordSpatialTestCase
     assert_equal(4326, Foo.geometry_column_by_name(:the_other_geom).spatial_ref_sys.srid)
   end
 end
-

data/test/models/bar.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('bars')
+unless ActiveRecordSpatialTestCase.table_exists?('bars')
   ActiveRecord::Migration.create_table(:bars) do |t|
     t.text :name
   end
@@ -12,6 +12,5 @@ class Bar < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
-  self.create_spatial_column_accessors!
+  create_spatial_column_accessors!
 end
-

data/test/models/blort.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('blorts')
+unless ActiveRecordSpatialTestCase.table_exists?('blorts')
   ActiveRecord::Migration.create_table(:blorts) do |t|
     t.text :name
     t.integer :foo_id
@@ -9,4 +9,3 @@ end
 class Blort < ActiveRecord::Base
   belongs_to :foo
 end
-

data/test/models/foo.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('foos')
+unless ActiveRecordSpatialTestCase.table_exists?('foos')
   ActiveRecord::Migration.create_table(:foos) do |t|
     t.text :name
   end
@@ -12,6 +12,5 @@ class Foo < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
-  self.create_spatial_column_accessors!
+  create_spatial_column_accessors!
 end
-

data/test/models/foo3d.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('foo3ds')
+unless ActiveRecordSpatialTestCase.table_exists?('foo3ds')
   ActiveRecord::Migration.create_table(:foo3ds) do |t|
     t.text :name
   end
@@ -12,6 +12,5 @@ class Foo3d < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
-  self.create_spatial_column_accessors!
+  create_spatial_column_accessors!
 end
-

data/test/models/foo_geography.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('foo_geographies')
+unless ActiveRecordSpatialTestCase.table_exists?('foo_geographies')
   ActiveRecord::Migration.create_table(:foo_geographies) do |t|
     t.text :name
     t.column :the_geom, :geography
@@ -11,6 +11,5 @@ class FooGeography < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
-  self.create_spatial_column_accessors!
+  create_spatial_column_accessors!
 end
-

data/test/models/zortable.rb

@@ -1,5 +1,5 @@
 
-if !ARBC.table_exists?('zortables')
+unless ActiveRecordSpatialTestCase.table_exists?('zortables')
   ActiveRecord::Migration.create_table(:zortables) do |t|
     t.text :name
     t.text :zortable_type
@@ -12,6 +12,5 @@ class Zortable < ActiveRecord::Base
   include ActiveRecordSpatial::SpatialColumns
   include ActiveRecordSpatial::SpatialScopes
 
-  self.create_spatial_column_accessors!
+  create_spatial_column_accessors!
 end
-

data/test/spatial_function_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialFunctionTests < ActiveRecordSpatialTestCase
@@ -11,7 +11,7 @@ class SpatialFunctionTests < ActiveRecordSpatialTestCase
   def test_geom_arg_option
     assert_equal(
       %{ST_distance("foos"."the_geom", '010100000000000000000000000000000000000000'::geometry)},
-      Foo.spatial_function(:distance, :geom_arg => 'POINT(0 0)').to_sql
+      Foo.spatial_function(:distance, geom_arg: 'POINT(0 0)').to_sql
     )
   end
 
@@ -25,7 +25,7 @@ class SpatialFunctionTests < ActiveRecordSpatialTestCase
   def test_column_option
     assert_equal(
       %{ST_distance("foos"."the_other_geom", ST_SetSRID('010100000000000000000000000000000000000000'::geometry, 4326))},
-      Foo.spatial_function(:distance, 'POINT(0 0)', :column => 'the_other_geom').to_sql
+      Foo.spatial_function(:distance, 'POINT(0 0)', column: 'the_other_geom').to_sql
     )
   end
 
@@ -33,11 +33,9 @@ class SpatialFunctionTests < ActiveRecordSpatialTestCase
     assert_equal(
       %{ST_distance("foos"."the_other_geom", ST_SetSRID('010100000000000000000000000000000000000000'::geometry, 4326))},
       Foo.spatial_function(:distance, {
-        :class => Blort,
-        :value => 'POINT(0 0)'
-      }, {
-        :column => 'the_other_geom'
-      }).to_sql
+        class: Blort,
+        value: 'POINT(0 0)'
+      }, column: 'the_other_geom').to_sql
     )
   end
 
@@ -45,33 +43,30 @@ class SpatialFunctionTests < ActiveRecordSpatialTestCase
     assert_equal(
       %{ST_distance("foos"."the_other_geom", ST_SetSRID('010100000000000000000000000000000000000000'::geometry, 4326))},
       Foo.spatial_function(:distance, {
-        :class => 'Blort',
-        :value => 'POINT(0 0)'
-      }, {
-        :column => 'the_other_geom'
-      }).to_sql
+        class: 'Blort',
+        value: 'POINT(0 0)'
+      }, column: 'the_other_geom').to_sql
     )
   end
 
   def test_invert_option
     assert_equal(
       %{ST_distance('010100000000000000000000000000000000000000'::geometry, "foos"."the_geom")},
-      Foo.spatial_function(:distance, 'POINT(0 0)', :invert => true).to_sql
+      Foo.spatial_function(:distance, 'POINT(0 0)', invert: true).to_sql
     )
   end
 
   def test_use_index_option
     assert_equal(
       %{_ST_distance("foos"."the_geom", '010100000000000000000000000000000000000000'::geometry)},
-      Foo.spatial_function(:distance, 'POINT(0 0)', :use_index => false).to_sql
+      Foo.spatial_function(:distance, 'POINT(0 0)', use_index: false).to_sql
     )
   end
 
   def test_allow_null_option
     assert_equal(
       %{(ST_distance("foos"."the_geom", '010100000000000000000000000000000000000000'::geometry) OR "foos"."the_geom" IS NULL)},
-      Foo.spatial_function(:distance, 'POINT(0 0)', :allow_null => true).to_sql
+      Foo.spatial_function(:distance, 'POINT(0 0)', allow_null: true).to_sql
     )
   end
 end
-

data/test/spatial_scopes_geographies_tests.rb

@@ -1,5 +1,5 @@
 
-$: << File.dirname(__FILE__)
+$LOAD_PATH << File.dirname(__FILE__)
 require 'test_helper'
 
 class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
@@ -13,36 +13,34 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def test_covers
-    ids_tester(:st_covers, 'POINT(0 0)', [ 3 ], :conditions => {
-      :id => [ 3 ]
+    ids_tester(:st_covers, 'POINT(0 0)', [3], conditions: {
+      id: [3]
     })
   end
 
   def test_coveredby
-    ids_tester(:st_coveredby, 'POLYGON((-6 -6, -6 6, 6 6, 6 -6, -6 -6))', [ 1 ], :conditions => {
-      :id => [ 1, 2 ]
+    ids_tester(:st_coveredby, 'POLYGON((-6 -6, -6 6, 6 6, 6 -6, -6 -6))', [1], conditions: {
+      id: [1, 2]
     })
   end
 
   def test_intersects
-    ids_tester(:st_intersects, 'LINESTRING(-5 -5, 10 10)', [ 2, 3 ])
+    ids_tester(:st_intersects, 'LINESTRING(-5 -5, 10 10)', [2, 3])
   end
 
   def test_dwithin
-    ids_tester(:st_dwithin, [ 'POINT(5 5)', 10 ], [ 3 ])
+    ids_tester(:st_dwithin, ['POINT(5 5)', 10], [3])
   end
 
   def test_allow_null
-    begin
-      foo = FooGeography.create(:name => 'four')
-      ids_tester(:st_covers, [ 'POINT(3 3)', { :allow_null => true } ], [ 3, foo.id ])
-    ensure
-      FooGeography.find_by_name('four').destroy
-    end
+    foo = FooGeography.create(name: 'four')
+    ids_tester(:st_covers, ['POINT(3 3)', { allow_null: true }], [3, foo.id])
+  ensure
+    FooGeography.find_by_name('four').destroy
   end
 
   def test_with_column
-    assert_equal([3], FooGeography.st_covers('POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('POINT(7 7)', column: :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_with_srid_switching
@@ -54,7 +52,7 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def test_with_srid_transform
-    assert_equal([3], FooGeography.st_covers('SRID=4269; POINT(7 7)', :column => :the_other_geom).to_a.collect(&:id).sort)
+    assert_equal([3], FooGeography.st_covers('SRID=4269; POINT(7 7)', column: :the_other_geom).to_a.collect(&:id).sort)
   end
 
   def test_order_by_st_distance
@@ -62,7 +60,7 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_distance_desc
-    assert_equal([2, 1, 3], FooGeography.order_by_st_distance('POINT(1 1)', :desc => true).to_a.collect(&:id))
+    assert_equal([2, 1, 3], FooGeography.order_by_st_distance('POINT(1 1)', desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area
@@ -70,7 +68,7 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   end
 
   def test_order_by_st_area_desc
-    assert_equal([3, 1, 2], FooGeography.order_by_st_area(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], FooGeography.order_by_st_area(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_length
@@ -84,7 +82,7 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
       [3, 1, 2]
     end
 
-    assert_equal(expected, FooGeography.order_by_st_length(:desc => true).where('true = true').to_a.collect(&:id))
+    assert_equal(expected, FooGeography.order_by_st_length(desc: true).where('true = true').to_a.collect(&:id))
   end
 
   def test_order_by_st_perimeter
@@ -96,11 +94,10 @@ class SpatialScopesGeographiesTests < ActiveRecordSpatialTestCase
   def test_order_by_st_perimeter_desc
     skip('requires PostGIS 2+') unless FooGeography.respond_to?(:order_by_st_perimeter)
 
-    assert_equal([3, 1, 2], FooGeography.order_by_st_perimeter(:desc => true).to_a.collect(&:id))
+    assert_equal([3, 1, 2], FooGeography.order_by_st_perimeter(desc: true).to_a.collect(&:id))
   end
 
   def test_order_by_st_area_with_desc_symbol
     assert_equal([3, 1, 2], FooGeography.order_by_st_area(:desc).to_a.collect(&:id))
   end
 end
-