activerecord-postgis-adapter 0.5.1 → 0.6.0

data/lib/active_record/connection_adapters/postgis_adapter/shared/railtie.rb

@@ -0,0 +1,66 @@
+# -----------------------------------------------------------------------------
+#
+# PostGIS adapter for ActiveRecord
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+unless defined?(::ActiveRecord::ConnectionAdapters::PostGISAdapter::Railtie)
+
+  module ActiveRecord  # :nodoc:
+
+    module ConnectionAdapters  # :nodoc:
+
+      module PostGISAdapter  # :nodoc:
+
+
+        class Railtie < ::Rails::Railtie  # :nodoc:
+
+          rake_tasks do
+            directory_ = case ::ActiveRecord::VERSION::MAJOR
+              when 3 then 'rails3'
+              when 4 then 'rails4'
+              else raise "Unsupported ActiveRecord version #{::ActiveRecord::VERSION::STRING}"
+            end
+            load ::File.expand_path("../#{directory_}/databases.rake", ::File.dirname(__FILE__))
+          end
+
+        end
+
+
+      end
+
+    end
+
+  end
+
+end

data/lib/active_record/connection_adapters/postgis_adapter/shared/setup.rb

@@ -0,0 +1,57 @@
+# -----------------------------------------------------------------------------
+#
+# PostGIS adapter for ActiveRecord
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+module ActiveRecord  # :nodoc:
+
+  module ConnectionAdapters  # :nodoc:
+
+    module PostGISAdapter  # :nodoc:
+
+
+      def self.initial_setup
+        gis_ignore_tables_ = ['geometry_columns', 'spatial_ref_sys', 'layer', 'topology']
+        ignore_tables_ = ::ActiveRecord::SchemaDumper.ignore_tables
+        gis_ignore_tables_.each do |table_|
+          ignore_tables_ << table_ unless ignore_tables_.include?(table_)
+        end
+      end
+
+
+    end
+
+  end
+
+end

data/lib/active_record/connection_adapters/postgis_adapter/{version.rb → shared/version.rb}

@@ -48,7 +48,7 @@ module ActiveRecord
 
 
       # Current version of PostGISAdapter as a frozen string
-      VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../../Version').strip.freeze
+      VERSION_STRING = ::File.read(::File.expand_path('../../../../../Version', ::File.dirname(__FILE__))).strip.freeze
 
       # Current version of PostGISAdapter as a Versionomy object, if the
       # Versionomy gem is available; otherwise equal to VERSION_STRING.

data/lib/activerecord-postgis-adapter.rb

@@ -0,0 +1,37 @@
+# -----------------------------------------------------------------------------
+#
+# PostGIS adapter for ActiveRecord
+#
+# -----------------------------------------------------------------------------
+# Copyright 2010-2012 Daniel Azuma
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'active_record/connection_adapters/postgis_adapter.rb'

data/lib/rgeo/active_record/postgis_adapter/railtie.rb

@@ -34,6 +34,6 @@
 ;
 
 
-puts "WARNING: rgeo/active_record/postgis_adapter/railtie is deprecated. Please use active_record/connection_adapters/postgis_adapter/railtie."
+puts 'WARNING: requiring "rgeo/active_record/postgis_adapter/railtie" is deprecated. Generally, the normal Bundle.require will do the trick. If you need to require the railtie explicitly, require "active_record/connection_adapters/postgis_adapter/railtie"'
 
 require 'active_record/connection_adapters/postgis_adapter/railtie'

data/test/tc_basic.rb

@@ -33,7 +33,7 @@
 # -----------------------------------------------------------------------------
 ;
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
 
@@ -42,7 +42,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestBasic < ::Test::Unit::TestCase  # :nodoc:
+        class TestBasic < ::MiniTest::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
@@ -72,14 +72,14 @@ module RGeo
 
 
             def test_version
-              assert_not_nil(::ActiveRecord::ConnectionAdapters::PostGISAdapter::VERSION)
+              refute_nil(::ActiveRecord::ConnectionAdapters::PostGISAdapter::VERSION)
             end
 
 
             def test_postgis_available
               connection_ = create_ar_class.connection
               assert_equal('PostGIS', connection_.adapter_name)
-              assert_not_nil(connection_.postgis_lib_version)
+              refute_nil(connection_.postgis_lib_version)
             end
 
 
@@ -87,8 +87,8 @@ module RGeo
               klass_ = populate_ar_class(:mercator_point)
               obj_ = klass_.new
               assert_nil(obj_.latlon)
-              obj_.latlon = @factory.point(1, 2)
-              assert_equal(@factory.point(1, 2), obj_.latlon)
+              obj_.latlon = @factory.point(1.0, 2.0)
+              assert_equal(@factory.point(1.0, 2.0), obj_.latlon)
               assert_equal(3785, obj_.latlon.srid)
             end
 
@@ -98,7 +98,7 @@ module RGeo
               obj_ = klass_.new
               assert_nil(obj_.latlon)
               obj_.latlon = 'POINT(1 2)'
-              assert_equal(@factory.point(1, 2), obj_.latlon)
+              assert_equal(@factory.point(1.0, 2.0), obj_.latlon)
               assert_equal(3785, obj_.latlon.srid)
             end
 
@@ -106,7 +106,7 @@ module RGeo
             def test_save_and_load_point
               klass_ = populate_ar_class(:mercator_point)
               obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
+              obj_.latlon = @factory.point(1.0, 2.0)
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
@@ -119,7 +119,7 @@ module RGeo
             def test_save_and_load_geographic_point
               klass_ = populate_ar_class(:latlon_point_geographic)
               obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
+              obj_.latlon = @factory.point(1.0, 2.0)
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
@@ -136,7 +136,7 @@ module RGeo
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
-              assert_equal(@factory.point(1, 2), obj2_.latlon)
+              assert_equal(@factory.point(1.0, 2.0), obj2_.latlon)
               assert_equal(3785, obj2_.latlon.srid)
             end
 
@@ -148,6 +148,33 @@ module RGeo
             end
 
 
+            def test_set_point_wkt_wrong_type
+              klass_ = populate_ar_class(:mercator_point)
+              assert_raises(::ActiveRecord::StatementInvalid) do
+                klass_.create(:latlon => 'LINESTRING(1 2, 3 4, 5 6)')
+              end
+            end
+
+
+            def test_custom_factory
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.point(:latlon, :srid => 4326)
+              end
+              factory_ = ::RGeo::Geographic.simple_mercator_factory
+              klass_.class_eval do
+                set_rgeo_factory_for_column(:latlon, factory_)
+              end
+              rec_ = klass_.new
+              rec_.latlon = 'POINT(-122 47)'
+              assert_equal(factory_, rec_.latlon.factory)
+              rec_.save!
+              assert_equal(factory_, rec_.latlon.factory)
+              rec2_ = klass_.find(rec_.id)
+              assert_equal(factory_, rec2_.latlon.factory)
+            end
+
+
             def test_readme_example
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -177,16 +204,16 @@ module RGeo
               factory1_ = ::RGeo::Cartesian.preferred_factory(:srid => 3785)
               factory2_ = ::RGeo::Cartesian.preferred_factory(:srid => 2000)
               obj_ = klass_.new
-              obj_.geo = factory1_.point(1, 2)
+              obj_.geo = factory1_.point(1.0, 2.0)
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.find(id_)
-              assert_equal(factory1_.point(1, 2), obj2_.geo)
+              assert_equal(factory1_.point(1.0, 2.0), obj2_.geo)
               assert_equal(3785, obj2_.geo.srid)
-              obj2_.geo = factory2_.point(3, 4)
+              obj2_.geo = factory2_.point(3.0, 4.0)
               obj2_.save!
               obj3_ = klass_.find(id_)
-              assert_equal(factory2_.point(3,4), obj3_.geo)
+              assert_equal(factory2_.point(3.0, 4.0), obj3_.geo)
               assert_equal(2000, obj3_.geo.srid)
             end
 
@@ -195,7 +222,7 @@ module RGeo
               klass_ = populate_ar_class(:mercator_point)
               obj_ = klass_.new
               assert_match(/"latlon":null/, obj_.to_json)
-              obj_.latlon = @factory.point(1, 2)
+              obj_.latlon = @factory.point(1.0, 2.0)
               assert_match(/"latlon":"POINT\s\(1\.0\s2\.0\)"/, obj_.to_json)
             end
 
@@ -205,7 +232,7 @@ module RGeo
               rec_ = klass_.new
               rec_.latlon = 'POINT(0 0)'
               rec_.save
-              assert_not_nil(klass_.select("CURRENT_TIMESTAMP as ts").first.ts)
+              refute_nil(klass_.select("CURRENT_TIMESTAMP as ts").first.ts)
             end
 
 

data/test/tc_ddl.rb

@@ -33,7 +33,7 @@
 # -----------------------------------------------------------------------------
 ;
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
 
@@ -42,7 +42,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestDDL < ::Test::Unit::TestCase  # :nodoc:
+        class TestDDL < ::MiniTest::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'

data/test/tc_nested_class.rb

@@ -33,7 +33,7 @@
 # -----------------------------------------------------------------------------
 ;
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
 
@@ -42,7 +42,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestNestedClass < ::Test::Unit::TestCase  # :nodoc:
+        class TestNestedClass < ::MiniTest::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'

data/test/tc_spatial_queries.rb

@@ -33,7 +33,7 @@
 # -----------------------------------------------------------------------------
 ;
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
 
@@ -42,7 +42,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestSpatialQueries < ::Test::Unit::TestCase  # :nodoc:
+        class TestSpatialQueries < ::MiniTest::Unit::TestCase  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
@@ -74,12 +74,13 @@ module RGeo
             def test_query_point
               klass_ = populate_ar_class(:mercator_point)
               obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
+              obj_.latlon = @factory.point(1.0, 2.0)
               obj_.save!
               id_ = obj_.id
-              obj2_ = klass_.where(:latlon => @factory.multi_point([@factory.point(1, 2)])).first
+              obj2_ = klass_.where(:latlon => @factory.multi_point([@factory.point(1.0, 2.0)])).first
+              refute_nil(obj2_)
               assert_equal(id_, obj2_.id)
-              obj3_ = klass_.where(:latlon => @factory.point(2, 2)).first
+              obj3_ = klass_.where(:latlon => @factory.point(2.0, 2.0)).first
               assert_nil(obj3_)
             end
 
@@ -87,10 +88,11 @@ module RGeo
             def test_query_point_wkt
               klass_ = populate_ar_class(:mercator_point)
               obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
+              obj_.latlon = @factory.point(1.0, 2.0)
               obj_.save!
               id_ = obj_.id
               obj2_ = klass_.where(:latlon => 'SRID=3785;POINT(1 2)').first
+              refute_nil(obj2_)
               assert_equal(id_, obj2_.id)
               obj3_ = klass_.where(:latlon => 'SRID=3785;POINT(2 2)').first
               assert_nil(obj3_)
@@ -103,10 +105,11 @@ module RGeo
               def test_query_st_distance
                 klass_ = populate_ar_class(:mercator_point)
                 obj_ = klass_.new
-                obj_.latlon = @factory.point(1, 2)
+                obj_.latlon = @factory.point(1.0, 2.0)
                 obj_.save!
                 id_ = obj_.id
                 obj2_ = klass_.where(klass_.arel_table[:latlon].st_distance('SRID=3785;POINT(2 3)').lt(2)).first
+                refute_nil(obj2_)
                 assert_equal(id_, obj2_.id)
                 obj3_ = klass_.where(klass_.arel_table[:latlon].st_distance('SRID=3785;POINT(2 3)').gt(2)).first
                 assert_nil(obj3_)
@@ -116,10 +119,11 @@ module RGeo
               def test_query_st_distance_from_constant
                 klass_ = populate_ar_class(:mercator_point)
                 obj_ = klass_.new
-                obj_.latlon = @factory.point(1, 2)
+                obj_.latlon = @factory.point(1.0, 2.0)
                 obj_.save!
                 id_ = obj_.id
                 obj2_ = klass_.where(::Arel.spatial('SRID=3785;POINT(2 3)').st_distance(klass_.arel_table[:latlon]).lt(2)).first
+                refute_nil(obj2_)
                 assert_equal(id_, obj2_.id)
                 obj3_ = klass_.where(::Arel.spatial('SRID=3785;POINT(2 3)').st_distance(klass_.arel_table[:latlon]).gt(2)).first
                 assert_nil(obj3_)
@@ -129,10 +133,11 @@ module RGeo
               def test_query_st_length
                 klass_ = populate_ar_class(:path_linestring)
                 obj_ = klass_.new
-                obj_.path = @factory.line(@factory.point(1, 2), @factory.point(3, 2))
+                obj_.path = @factory.line(@factory.point(1.0, 2.0), @factory.point(3.0, 2.0))
                 obj_.save!
                 id_ = obj_.id
                 obj2_ = klass_.where(klass_.arel_table[:path].st_length.eq(2)).first
+                refute_nil(obj2_)
                 assert_equal(id_, obj2_.id)
                 obj3_ = klass_.where(klass_.arel_table[:path].st_length.gt(3)).first
                 assert_nil(obj3_)