activerecord-postgis-adapter 0.7.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f82fbbcef576636f810f2e8377d0b8ccbb18984c
-  data.tar.gz: 6b5a4d0cb7364ca9a065505a27e8d93781cdcb39
+  metadata.gz: 578cf1645006c531d621eec0e5053b6d95565c5a
+  data.tar.gz: 961688115ef7f7b687867c2779b6079eecca4048
 SHA512:
-  metadata.gz: 0e706c148799b75f93653e4f87eaffc9dce2f57375c1c380e80006056ea672663756e684b19da3e80ab9f1c71e23c99662db7151d4d6a68aaa38eed580910a31
-  data.tar.gz: 22aed0f63250fae535d9d81e988f0b3dd0929b7a9979bad6e0c1a0fc27f2a2cfe6864d4d23976ccccf9b3d1932e7e44ede08338bc7cf122e5a64a48d3bb11d95
+  metadata.gz: b67b0163560b4b28dda0118698b15b423c8f55e55c89f8593d3655eefde8c128a348e75483ed0ef479a15fda1e7af3394eb61ee60c59199e86dc5dd3339d9612
+  data.tar.gz: 639952e0e47566dfd8e33a9979c28f002b0fa6b13b6db3b90a73b9b1f9b931e9891cc5ad20c97c3ebcd3fbf5fa5d932848df172149bcdaa0b9a08a8f391a8fb7

data/History.rdoc

@@ -1,4 +1,14 @@
-=== 0.7.0 / 2014-04-04
+=== 1.0.0 / 2014-05-06
+
+* Require rgeo-activerecord 1.0.0
+* Require ActiveRecord 4.1
+
+=== 0.7.1 / 2014-05-06
+
+* Updates for the Rails 4.0.x-compatible adapater can be found on the 0.7-stable branch
+* Require rgeo-activerecord 0.6.0, which includes bug fixes for Rails 4.0.x
+
+=== 0.7.0 / 2014-05-06
 
 * Version 0.7.0 is for Rails 4.0.x
 * Require ruby 1.9.3+

data/lib/active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb

@@ -33,7 +33,7 @@ module ActiveRecord  # :nodoc:
           table_name_ = table_name_.to_s
           spatial_info_ = spatial_column_info(table_name_)
           column_definitions(table_name_).collect do |col_name_, type_, default_, notnull_, oid_, fmod_|
-            oid_ = OID::TYPE_MAP.fetch(oid_.to_i, fmod_.to_i) {
+            oid_ = type_map.fetch(oid_.to_i, fmod_.to_i) {
               OID::Identity.new
             }
             SpatialColumn.new(@rgeo_factory_settings, table_name_, col_name_, default_, oid_, type_,
@@ -87,9 +87,9 @@ module ActiveRecord  # :nodoc:
           end.compact
         end
 
-        def create_table_definition(name_, temporary_, options_)
+        def create_table_definition(name_, temporary_, options_, as_=nil)
           # Override to create a spatial table definition (post-4.0.0.beta1)
-          PostGISAdapter::TableDefinition.new(native_database_types, name_, temporary_, options_, self)
+          PostGISAdapter::TableDefinition.new(native_database_types, name_, temporary_, options_, as_, self)
         end
 
         def create_table(table_name_, options_={}, &block_)
@@ -112,13 +112,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-        def drop_table(table_name_, *options_)
-          if postgis_lib_version.to_s.split('.').first.to_i == 1
-            execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
-          end
-          super
-        end
-
         def add_column(table_name_, column_name_, type_, options_={})
           table_name_ = table_name_.to_s
           column_name_ = column_name_.to_s
@@ -134,7 +127,7 @@ module ActiveRecord  # :nodoc:
               type_ = (options_[:type] || info_[:type] || type_).to_s.gsub('_', '').upcase
               has_z_ = options_[:has_z]
               has_m_ = options_[:has_m]
-              srid_ = (options_[:srid] || -1).to_i
+              srid_ = (options_[:srid] || PostGISAdapter::DEFAULT_SRID).to_i
               if options_[:geographic]
                 type_ << 'Z' if has_z_
                 type_ << 'M' if has_m_

data/lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_column.rb

@@ -11,14 +11,13 @@ module ActiveRecord  # :nodoc:
         def initialize(factory_settings_, table_name_, name_, default_, oid_type_, sql_type_=nil, null_=true, opts_=nil)
           @factory_settings = factory_settings_
           @table_name = table_name_
-          @geographic = sql_type_ =~ /geography/i ? true : false
+          @geographic = !!(sql_type_ =~ /geography/i)
           if opts_
             # This case comes from an entry in the geometry_columns table
-            @geometric_type = ::RGeo::ActiveRecord.geometric_type_from_name(opts_[:type]) ||
-              ::RGeo::Feature::Geometry
+            @geometric_type = ::RGeo::ActiveRecord.geometric_type_from_name(opts_[:type]) || ::RGeo::Feature::Geometry
             @srid = opts_[:srid].to_i
-            @has_z = opts_[:has_z] ? true : false
-            @has_m = opts_[:has_m] ? true : false
+            @has_z = !!opts_[:has_z]
+            @has_m = !!opts_[:has_m]
           elsif @geographic
             # Geographic type information is embedded in the SQL type
             @geometric_type = ::RGeo::Feature::Geometry

data/lib/active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb

@@ -7,10 +7,10 @@ module ActiveRecord  # :nodoc:
 
       class TableDefinition < ConnectionAdapters::PostgreSQLAdapter::TableDefinition  # :nodoc:
 
-        def initialize(types_, name_, temporary_, options_, base_)
+        def initialize(types_, name_, temporary_, options_, as_, base_)
           @base = base_
           @spatial_columns_hash = {}
-          super(types_, name_, temporary_, options_)
+          super(types_, name_, temporary_, options_, as_)
         end
 
         def column(name_, type_, options_={})
@@ -80,7 +80,11 @@ module ActiveRecord  # :nodoc:
         end
 
         def srid
-          @srid ? @srid.to_i : (geographic? ? 4326 : -1)
+          if @srid
+            @srid.to_i
+          else
+            geographic? ? 4326 : PostGISAdapter::DEFAULT_SRID
+          end
         end
 
         def has_z?

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

@@ -5,6 +5,9 @@ module ActiveRecord  # :nodoc:
         :geography => {:type => 'geometry', :geographic => true}
       )
 
+      # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
+      DEFAULT_SRID = 0
+
       module CommonAdapterMethods  # :nodoc:
         def set_rgeo_factory_settings(factory_settings_)
           @rgeo_factory_settings = factory_settings_
@@ -22,9 +25,8 @@ module ActiveRecord  # :nodoc:
           @postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
         end
 
-        # http://postgis.17.x6.nabble.com/Default-SRID-td5001115.html
         def default_srid
-          0
+          DEFAULT_SRID
         end
 
         def srs_database_columns

data/lib/active_record/connection_adapters/postgis_adapter/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = "0.7.1".freeze
+      VERSION = "1.0.0".freeze
     end
   end
 end

data/test/tc_basic.rb

@@ -7,7 +7,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestBasic < ::MiniTest::Unit::TestCase  # :nodoc:
+        class TestBasic < ::MiniTest::Test  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'

data/test/tc_ddl.rb

@@ -1,21 +1,16 @@
 require 'minitest/autorun'
 require 'rgeo/active_record/adapter_test_helper'
 
-
 module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-
-        class TestDDL < ::MiniTest::Unit::TestCase  # :nodoc:
-
+        class TestDDL < ::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 test_create_simple_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -26,13 +21,12 @@ module RGeo
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(true, col_.has_spatial_constraints?)
               assert_equal(false, col_.geographic?)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
+              assert_equal(0, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_create_no_constraints_geometry
               klass_ = create_ar_class
@@ -50,7 +44,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_simple_geography
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -65,7 +58,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_point_geometry
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -75,7 +67,6 @@ module RGeo
               assert(klass_.cached_attributes.include?('latlon'))
             end
 
-
             def test_create_geometry_with_index
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -87,7 +78,6 @@ module RGeo
               assert(klass_.connection.indexes(:spatial_test).last.spatial)
             end
 
-
             def test_add_geometry_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -100,7 +90,7 @@ module RGeo
               assert_equal(2, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -110,7 +100,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_add_no_constraints_geometry_column
               klass_ = create_ar_class
@@ -124,7 +113,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Geometry, cols_[-2].geometric_type)
               assert_nil(cols_[-2].srid)
@@ -134,7 +123,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             def test_add_geography_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -147,7 +135,7 @@ module RGeo
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-3].geometric_type)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-3].srid)
+              assert_equal(0, cols_[-3].srid)
               assert_equal(true, cols_[-3].has_spatial_constraints?)
               assert_equal(::RGeo::Feature::Point, cols_[-2].geometric_type)
               assert_equal(4326, cols_[-2].srid)
@@ -157,7 +145,6 @@ module RGeo
               assert_equal(false, cols_[-1].has_spatial_constraints?)
             end
 
-
             def test_drop_geometry_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -171,11 +158,10 @@ module RGeo
               cols_ = klass_.columns
               assert_equal(::RGeo::Feature::Geometry, cols_[-1].geometric_type)
               assert_equal('latlon', cols_[-1].name)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, cols_[-1].srid)
+              assert_equal(0, cols_[-1].srid)
               assert_equal(false, cols_[-1].geographic?)
             end
 
-
             def test_drop_geography_column
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -196,7 +182,6 @@ module RGeo
               assert_equal(false, cols_[-2].geographic?)
             end
 
-
             def test_create_simple_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -206,13 +191,12 @@ module RGeo
               col_ = klass_.columns.last
               assert_equal(::RGeo::Feature::Geometry, col_.geometric_type)
               assert_equal(false, col_.geographic?)
-              assert_equal(if(klass_.connection.postgis_lib_version >= "2") then 0 else -1 end, col_.srid)
+              assert_equal(0, col_.srid)
               assert(klass_.cached_attributes.include?('latlon'))
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             # no_constraints no longer supported in PostGIS 2.0
             def _test_create_no_constraints_geometry_using_shortcut
               klass_ = create_ar_class
@@ -229,11 +213,9 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_simple_geography_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
-                # t_.method_missing(:geometry, 'latlon', :geographic => true)
                 t_.geometry 'latlon', :geographic => true
               end
               col_ = klass_.columns.last
@@ -244,7 +226,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_point_geometry_using_shortcut
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -254,7 +235,6 @@ module RGeo
               assert(klass_.cached_attributes.include?('latlon'))
             end
 
-
             def test_create_geometry_with_options
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -273,7 +253,6 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
             def test_create_geometry_using_limit
               klass_ = create_ar_class
               klass_.connection.create_table(:spatial_test) do |t_|
@@ -292,11 +271,8 @@ module RGeo
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
 
-
           end
-
         end
-
       end
     end
   end

data/test/tc_nested_class.rb

@@ -7,7 +7,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestNestedClass < ::MiniTest::Unit::TestCase  # :nodoc:
+        class TestNestedClass < ::MiniTest::Test  # :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

@@ -7,7 +7,7 @@ module RGeo
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
 
-        class TestSpatialQueries < ::MiniTest::Unit::TestCase  # :nodoc:
+        class TestSpatialQueries < ::MiniTest::Test  # :nodoc:
 
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'

data/test/tc_tasks.rb

@@ -5,7 +5,7 @@ module RGeo
   module ActiveRecord  # :nodoc:
     module PostGISAdapter  # :nodoc:
       module Tests  # :nodoc:
-        class TestTasks < ::MiniTest::Unit::TestCase  # :nodoc:
+        class TestTasks < ::MiniTest::Test  # :nodoc:
           DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database.yml'
           OVERRIDE_DATABASE_CONFIG_PATH = ::File.dirname(__FILE__)+'/database_local.yml'
 
@@ -51,7 +51,7 @@ module RGeo
               end
               ::ActiveRecord::Tasks::DatabaseTasks.structure_dump(TestTasks.new_database_config, filename_)
               data_ = ::File.read(filename_)
-              assert(data_.index('latlon postgis.geography(Point,4326)'))
+              assert(data_.index('latlon geography(Point,4326)'))
             end
 
             def test_empty_schema_dump

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement