activerecord-postgis-adapter 1.0.0 → 1.1.0

data/test/{tc_nested_class.rb → nested_class_test.rb}

@@ -1,19 +1,15 @@
-require 'minitest/autorun'
-require 'rgeo/active_record/adapter_test_helper'
-
+require 'test_helper'
 
 module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
+        class NestedClassTest < BASE_TEST_CLASS  # :nodoc:
+          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
 
-        class TestNestedClass < ::MiniTest::Test  # :nodoc:
-
-          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
-          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
           include AdapterTestHelper
 
-
           module Foo
             def self.table_name_prefix
               'foo_'
@@ -22,26 +18,22 @@ module RGeo
             end
           end
 
-
           define_test_methods do
 
-
             def test_nested_model
               Foo::Bar.class_eval do
-                establish_connection(TestNestedClass::DATABASE_CONFIG)
+                establish_connection(DATABASE_CONFIG)
               end
-              Foo::Bar.connection.create_table(:foo_bars) do |t_|
-                t_.column 'latlon', :point, :srid => 3785
+              Foo::Bar.connection.create_table(:foo_bars) do |t|
+                t.column 'latlon', :point, :srid => 3785
               end
               Foo::Bar.all
               Foo::Bar.connection.drop_table(:foo_bars)
             end
 
-
           end
 
         end
-
       end
     end
   end

data/test/setup_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module RGeo
+  module ActiveRecord  # :nodoc:
+    module PostGISAdapter  # :nodoc:
+      module Tests  # :nodoc:
+        class SpatialQueriesTest < BASE_TEST_CLASS  # :nodoc:
+
+          def test_ignore_tables
+            assert_equal %w(geometry_columns spatial_ref_sys layer topology), ::ActiveRecord::SchemaDumper.ignore_tables
+          end
+
+        end
+      end
+    end
+  end
+end

data/test/spatial_queries_test.rb

@@ -0,0 +1,105 @@
+require 'test_helper'
+
+module RGeo
+  module ActiveRecord  # :nodoc:
+    module PostGISAdapter  # :nodoc:
+      module Tests  # :nodoc:
+        class SpatialQueriesTest < BASE_TEST_CLASS  # :nodoc:
+
+          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
+
+          include AdapterTestHelper
+
+          define_test_methods do
+
+            def populate_ar_class(content)
+              klass = create_ar_class
+              case content
+              when :mercator_point
+                klass.connection.create_table(:spatial_test) do |t|
+                  t.column 'latlon', :point, :srid => 3785
+                end
+              when :latlon_point_geographic
+                klass.connection.create_table(:spatial_test) do |t|
+                  t.column 'latlon', :point, :srid => 4326, :geographic => true
+                end
+              when :path_linestring
+                klass.connection.create_table(:spatial_test) do |t|
+                  t.column 'path', :line_string, :srid => 3785
+                end
+              end
+              klass
+            end
+
+            def test_query_point
+              klass = populate_ar_class(:mercator_point)
+              obj = klass.new
+              obj.latlon = @factory.point(1.0, 2.0)
+              obj.save!
+              id = obj.id
+              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.0, 2.0)).first
+              assert_nil(obj3)
+            end
+
+            def test_query_point_wkt
+              klass = populate_ar_class(:mercator_point)
+              obj = klass.new
+              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)
+            end
+
+            def test_query_st_distance
+              klass = populate_ar_class(:mercator_point)
+              obj = klass.new
+              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)
+            end
+
+            def test_query_st_distance_from_constant
+              klass = populate_ar_class(:mercator_point)
+              obj = klass.new
+              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)
+            end
+
+            def test_query_st_length
+              klass = populate_ar_class(:path_linestring)
+              obj = klass.new
+              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)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+require 'minitest/autorun'
+require 'rgeo/active_record/adapter_test_helper'
+
+BASE_TEST_CLASS = if ActiveRecord::VERSION::STRING > '4.1'
+                    Minitest::Test
+                  else
+                    MiniTest::Unit::TestCase
+                  end

data/test/test_tasks.rb

@@ -0,0 +1,111 @@
+require 'test_helper'
+
+module RGeo
+  module ActiveRecord  # :nodoc:
+    module PostGISAdapter  # :nodoc:
+      module Tests  # :nodoc:
+        class TestTasks < BASE_TEST_CLASS  # :nodoc:
+          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database.yml'
+          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__) + '/database_local.yml'
+
+          class << self
+            def before_open_database(args)
+              @new_database_config = args[:config].merge('database' => 'postgis_adapter_test2')
+              @new_database_config.stringify_keys!
+            end
+            attr_reader :new_database_config
+          end
+
+          include AdapterTestHelper
+
+          def cleanup_tables
+            ::ActiveRecord::Base.remove_connection
+            ::ActiveRecord::Base.clear_active_connections!
+            TestTasks::DEFAULT_AR_CLASS.connection.execute("DROP DATABASE IF EXISTS \"postgis_adapter_test2\"")
+          end
+
+          define_test_methods do
+            def test_create_database_from_extension_in_public_schema
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config)
+              ::ActiveRecord::Base.connection.select_values("SELECT * from public.spatial_ref_sys")
+            end
+
+            def test_empty_sql_dump
+              filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename)
+              ::FileUtils.mkdir_p(::File.dirname(filename))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TestTasks.new_database_config, filename)
+              sql = ::File.read(filename)
+              assert(sql !~ /CREATE/)
+            end
+
+            def test_basic_geography_sql_dump
+              filename = ::File.expand_path('../tmp/tmp.sql', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename)
+              ::FileUtils.mkdir_p(::File.dirname(filename))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              ::ActiveRecord::Base.connection.create_table(:spatial_test) do |t|
+                t.point "latlon", :geographic => true
+              end
+              ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TestTasks.new_database_config, filename)
+              data = ::File.read(filename)
+              assert(data.index('latlon geography(Point,4326)'))
+            end
+
+            def test_empty_schema_dump
+              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename)
+              ::FileUtils.mkdir_p(::File.dirname(filename))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              require 'active_record/schema_dumper'
+              ::File.open(filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(::ActiveRecord::Base.connection, file)
+              end
+              data = ::File.read(filename)
+              assert(data.index('ActiveRecord::Schema'))
+            end
+
+            def test_basic_geometry_schema_dump
+              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename)
+              ::FileUtils.mkdir_p(::File.dirname(filename))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              conn = ::ActiveRecord::Base.connection
+              conn.create_table(:spatial_test) do |t|
+                t.geometry 'object1'
+                t.spatial "object2", :limit => {:srid=>conn.default_srid, :type=>"geometry"}
+              end
+              require 'active_record/schema_dumper'
+              ::File.open(filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(conn, file)
+              end
+              data = ::File.read(filename)
+              assert(data.index("t.spatial \"object1\", limit: {:srid=>#{conn.default_srid}, :type=>\"geometry\"}"))
+              assert(data.index("t.spatial \"object2\", limit: {:srid=>#{conn.default_srid}, :type=>\"geometry\"}"))
+            end
+
+            def test_basic_geography_schema_dump
+              filename = ::File.expand_path('../tmp/tmp.rb', ::File.dirname(__FILE__))
+              ::FileUtils.rm_f(filename)
+              ::FileUtils.mkdir_p(::File.dirname(filename))
+              ::ActiveRecord::Tasks::DatabaseTasks.create(TestTasks.new_database_config.merge('schema_search_path' => 'public,postgis'))
+              conn = ::ActiveRecord::Base.connection
+              conn.create_table(:spatial_test) do |t|
+                t.point "latlon1", :geographic => true
+                t.spatial "latlon2", :limit => {:srid=>4326, :type=>"point", :geographic=>true}
+              end
+              require 'active_record/schema_dumper'
+              ::File.open(filename, "w:utf-8") do |file|
+                ::ActiveRecord::SchemaDumper.dump(conn, file)
+              end
+              data = ::File.read(filename)
+              assert(data.index('t.spatial "latlon1", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
+              assert(data.index('t.spatial "latlon2", limit: {:srid=>4326, :type=>"point", :geographic=>true}'))
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
-- Daniel Azuma
+- Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -53,37 +53,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: This is an ActiveRecord connection adapter for PostGIS. It is based on
   the stock PostgreSQL adapter, but provides built-in support for the spatial extensions
   provided by PostGIS. It uses the RGeo library to represent spatial data in Ruby.
-email: dazuma@gmail.com
+email: dazuma@gmail.com, parhameter@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -110,13 +96,15 @@ files:
 - lib/active_record/connection_adapters/postgis_adapter/version.rb
 - lib/activerecord-postgis-adapter.rb
 - lib/activerecord/postgis/adapter.rb
+- test/basic_test.rb
 - test/database.yml
-- test/tc_basic.rb
-- test/tc_ddl.rb
-- test/tc_nested_class.rb
-- test/tc_spatial_queries.rb
-- test/tc_tasks.rb
-homepage: http://dazuma.github.com/activerecord-postgis-adapter
+- test/ddl_test.rb
+- test/nested_class_test.rb
+- test/setup_test.rb
+- test/spatial_queries_test.rb
+- test/test_helper.rb
+- test/test_tasks.rb
+homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
 - BSD
 metadata: {}
@@ -141,10 +129,12 @@ signing_key:
 specification_version: 4
 summary: An ActiveRecord adapter for PostGIS, based on RGeo.
 test_files:
+- test/basic_test.rb
 - test/database.yml
-- test/tc_basic.rb
-- test/tc_ddl.rb
-- test/tc_nested_class.rb
-- test/tc_spatial_queries.rb
-- test/tc_tasks.rb
+- test/ddl_test.rb
+- test/nested_class_test.rb
+- test/setup_test.rb
+- test/spatial_queries_test.rb
+- test/test_helper.rb
+- test/test_tasks.rb
 has_rdoc: 

data/test/tc_basic.rb

@@ -1,212 +0,0 @@
-require 'minitest/autorun'
-require 'rgeo/active_record/adapter_test_helper'
-
-
-module RGeo
-  module ActiveRecord  # :nodoc:
-    module PostGISAdapter  # :nodoc:
-      module Tests  # :nodoc:
-
-        class TestBasic < ::MiniTest::Test  # :nodoc:
-
-          DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
-          OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
-
-          include AdapterTestHelper
-
-          define_test_methods do
-
-
-            def populate_ar_class(content_)
-              klass_ = create_ar_class
-              case content_
-              when :mercator_point
-                klass_.connection.create_table(:spatial_test) do |t_|
-                  t_.column 'latlon', :point, :srid => 3785
-                end
-              when :latlon_point_geographic
-                klass_.connection.create_table(:spatial_test) do |t_|
-                  t_.column 'latlon', :point, :srid => 4326, :geographic => true
-                end
-              when :no_constraints
-                klass_.connection.create_table(:spatial_test) do |t_|
-                  t_.column 'geo', :geometry, :no_constraints => true
-                end
-              end
-              klass_
-            end
-
-
-            def test_version
-              refute_nil(::ActiveRecord::ConnectionAdapters::PostGISAdapter::VERSION)
-            end
-
-
-            def test_postgis_available
-              connection_ = create_ar_class.connection
-              assert_equal('PostGIS', connection_.adapter_name)
-              refute_nil(connection_.postgis_lib_version)
-            end
-
-
-            def test_set_and_get_point
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.new
-              assert_nil(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
-
-
-            def test_set_and_get_point_from_wkt
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.new
-              assert_nil(obj_.latlon)
-              obj_.latlon = 'POINT(1 2)'
-              assert_equal(@factory.point(1.0, 2.0), obj_.latlon)
-              assert_equal(3785, obj_.latlon.srid)
-            end
-
-
-            def test_save_and_load_point
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.new
-              obj_.latlon = @factory.point(1.0, 2.0)
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.find(id_)
-              assert_equal(@factory.point(1.0, 2.0), obj2_.latlon)
-              assert_equal(3785, obj2_.latlon.srid)
-              assert_equal(true, ::RGeo::Geos.is_geos?(obj2_.latlon))
-            end
-
-
-            def test_save_and_load_geographic_point
-              klass_ = populate_ar_class(:latlon_point_geographic)
-              obj_ = klass_.new
-              obj_.latlon = @factory.point(1.0, 2.0)
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.find(id_)
-              assert_equal(@geographic_factory.point(1.0, 2.0), obj2_.latlon)
-              assert_equal(4326, obj2_.latlon.srid)
-              assert_equal(false, ::RGeo::Geos.is_geos?(obj2_.latlon))
-            end
-
-
-            def test_save_and_load_point_from_wkt
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.new
-              obj_.latlon = 'POINT(1 2)'
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.find(id_)
-              assert_equal(@factory.point(1.0, 2.0), obj2_.latlon)
-              assert_equal(3785, obj2_.latlon.srid)
-            end
-
-
-            def test_set_point_bad_wkt
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.create(:latlon => 'POINT (x)')
-              assert_nil(obj_.latlon)
-            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_|
-                t_.column(:shape, :geometry)
-                t_.line_string(:path, :srid => 3785)
-                t_.point(:latlon, :geographic => true)
-              end
-              klass_.connection.change_table(:spatial_test) do |t_|
-                t_.index(:latlon, :spatial => true)
-              end
-              klass_.class_eval do
-                self.rgeo_factory_generator = ::RGeo::Geos.method(:factory)
-                set_rgeo_factory_for_column(:latlon, ::RGeo::Geographic.spherical_factory)
-              end
-              rec_ = klass_.new
-              rec_.latlon = 'POINT(-122 47)'
-              loc_ = rec_.latlon
-              assert_equal(47, loc_.latitude)
-              rec_.shape = loc_
-              assert_equal(true, ::RGeo::Geos.is_geos?(rec_.shape))
-            end
-
-
-            # no_constraints no longer supported in PostGIS 2.0
-            def _test_save_and_load_no_constraints
-              klass_ = populate_ar_class(:no_constraints)
-              factory1_ = ::RGeo::Cartesian.preferred_factory(:srid => 3785)
-              factory2_ = ::RGeo::Cartesian.preferred_factory(:srid => 2000)
-              obj_ = klass_.new
-              obj_.geo = factory1_.point(1.0, 2.0)
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.find(id_)
-              assert_equal(factory1_.point(1.0, 2.0), obj2_.geo)
-              assert_equal(3785, obj2_.geo.srid)
-              obj2_.geo = factory2_.point(3.0, 4.0)
-              obj2_.save!
-              obj3_ = klass_.find(id_)
-              assert_equal(factory2_.point(3.0, 4.0), obj3_.geo)
-              assert_equal(2000, obj3_.geo.srid)
-            end
-
-
-            def test_point_to_json
-              klass_ = populate_ar_class(:mercator_point)
-              obj_ = klass_.new
-              assert_match(/"latlon":null/, obj_.to_json)
-              obj_.latlon = @factory.point(1.0, 2.0)
-              assert_match(/"latlon":"POINT\s\(1\.0\s2\.0\)"/, obj_.to_json)
-            end
-
-
-            def test_custom_column
-              klass_ = populate_ar_class(:mercator_point)
-              rec_ = klass_.new
-              rec_.latlon = 'POINT(0 0)'
-              rec_.save
-              refute_nil(klass_.select("CURRENT_TIMESTAMP as ts").first.ts)
-            end
-
-
-          end
-
-        end
-
-      end
-    end
-  end
-end