activerecord-postgis-adapter 2.2.2 → 3.0.0.beta1

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require 'minitest/autorun'
 require 'minitest/pride'
+require 'mocha/mini_test'
 require 'rgeo/active_record/adapter_test_helper'
 
 begin
@@ -7,3 +8,22 @@ begin
 rescue LoadError
   # ignore
 end
+
+class ActiveSupport::TestCase
+  self.test_order = :sorted
+
+  DATABASE_CONFIG_PATH = File.dirname(__FILE__) << '/database.yml'
+
+  class SpatialModel < ActiveRecord::Base
+    establish_connection YAML.load_file(DATABASE_CONFIG_PATH)
+  end
+
+  def factory
+    RGeo::Cartesian.preferred_factory(srid: 3785)
+  end
+
+  def geographic_factory
+    RGeo::Geographic.spherical_factory(srid: 4326)
+  end
+
+end

data/test/type_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+
+class TypeTest < ActiveSupport::TestCase
+  def test_parse_simple_type
+    assert_equal ["geometry", 0, false, false], spatial.parse_sql_type("geometry")
+    assert_equal ["geography", 0, false, false], spatial.parse_sql_type("geography")
+  end
+
+  def test_parse_geo_type
+    assert_equal ["Point", 0, false, false], spatial.parse_sql_type("geography(Point)")
+    assert_equal ["Polygon", 0, false, false], spatial.parse_sql_type("geography(Polygon)")
+  end
+
+  def test_parse_type_with_srid
+    assert_equal ["Point", 4326, false, false], spatial.parse_sql_type("geography(Point,4326)")
+    assert_equal ["Polygon", 4327, true, false], spatial.parse_sql_type("geography(PolygonZ,4327)")
+    assert_equal ["Point", 4328, false, true], spatial.parse_sql_type("geography(PointM,4328)")
+    assert_equal ["Point", 4329, true, true], spatial.parse_sql_type("geography(PointZM,4329)")
+  end
+
+  private
+
+  def spatial
+    ActiveRecord::ConnectionAdapters::PostGISAdapter::OID::Spatial
+  end
+end

metadata

@@ -1,77 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -97,12 +105,13 @@ files:
 - LICENSE.txt
 - lib/active_record/connection_adapters/postgis_adapter.rb
 - lib/active_record/connection_adapters/postgis_adapter/arel_tosql.rb
-- lib/active_record/connection_adapters/postgis_adapter/common_adapter_methods.rb
 - lib/active_record/connection_adapters/postgis_adapter/create_connection.rb
 - lib/active_record/connection_adapters/postgis_adapter/databases.rake
 - lib/active_record/connection_adapters/postgis_adapter/main_adapter.rb
+- lib/active_record/connection_adapters/postgis_adapter/oid/spatial.rb
 - lib/active_record/connection_adapters/postgis_adapter/postgis_database_tasks.rb
 - lib/active_record/connection_adapters/postgis_adapter/railtie.rb
+- lib/active_record/connection_adapters/postgis_adapter/schema_statements.rb
 - lib/active_record/connection_adapters/postgis_adapter/setup.rb
 - lib/active_record/connection_adapters/postgis_adapter/spatial_column.rb
 - lib/active_record/connection_adapters/postgis_adapter/spatial_column_info.rb
@@ -119,6 +128,7 @@ files:
 - test/spatial_queries_test.rb
 - test/tasks_test.rb
 - test/test_helper.rb
+- test/type_test.rb
 homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
 - BSD
@@ -134,12 +144,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
@@ -153,4 +163,5 @@ test_files:
 - test/spatial_queries_test.rb
 - test/tasks_test.rb
 - test/test_helper.rb
+- test/type_test.rb
 has_rdoc: 

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

@@ -1,53 +0,0 @@
-module ActiveRecord  # :nodoc:
-  module ConnectionAdapters  # :nodoc:
-    module PostGISAdapter  # :nodoc:
-      SPATIAL_COLUMN_CONSTRUCTORS = ::RGeo::ActiveRecord::DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS.merge(
-        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
-        end
-
-        def adapter_name
-          PostGISAdapter::ADAPTER_NAME
-        end
-
-        def spatial_column_constructor(name)
-          PostGISAdapter::SPATIAL_COLUMN_CONSTRUCTORS[name]
-        end
-
-        def postgis_lib_version
-          @postgis_lib_version ||= select_value("SELECT PostGIS_Lib_Version()")
-        end
-
-        def default_srid
-          DEFAULT_SRID
-        end
-
-        def srs_database_columns
-          {
-            auth_name_column: 'auth_name',
-            auth_srid_column: 'auth_srid',
-            proj4text_column: 'proj4text',
-            srtext_column:    'srtext',
-          }
-        end
-
-        def quote(value, column=nil)
-          if ::RGeo::Feature::Geometry.check_type(value)
-            "'#{::RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value)}'"
-          elsif value.is_a?(::RGeo::Cartesian::BoundingBox)
-            "'#{value.min_x},#{value.min_y},#{value.max_x},#{value.max_y}'::box"
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end