activerecord-postgis-adapter 3.0.0.beta2 → 3.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4134b225eb23433b9805a83ec978ae7fe5c9ee5b
-  data.tar.gz: 7cd3ca0bea4ccd9c6b51a0e6eb646e82acc55eb0
+  metadata.gz: b0d04c38823d342013ab3f6499e63555c327ae7d
+  data.tar.gz: 431f6916e008760398744c063d50732dc6474eea
 SHA512:
-  metadata.gz: fff96e4437bda957061ef02a4ef9bcb7bd34463387947f39f4de46efddd00212724f54977460f6e796f938b51ef0ae840fde8f45df974a61f048d9304c05cd4f
-  data.tar.gz: ed3977486ef32fe77dc7e62bbfff5ed96af537f8f6c9509218a3ea3cb25770d5e05d86fa57b006fce32a65994185b951f8287b1a03f92d572684ed2aa304a6c3
+  metadata.gz: f54ee77aca056fd2ab87c0af53782feb597e157a70862e23e509e4df17feca439b07de46d384e77a04e067089e78b230d186d9064a76cfe0268f2e3d640593fb
+  data.tar.gz: 065f3afcfbd9fc945125f4dcf7270cfa5a82e4cde7a9d9174ed05cb545a14f0a391c6b63ba614791ac50a082420f1efca0bc2d6c8c7060b91386f19f78663ad6

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -12,10 +12,7 @@ end
 
 # :stopdoc:
 
-require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
-require 'rgeo/active_record'
-
 require 'active_record/connection_adapters/postgis_adapter/version'
 require 'active_record/connection_adapters/postgis_adapter/schema_statements'
 require 'active_record/connection_adapters/postgis_adapter/main_adapter'

data/lib/active_record/connection_adapters/postgis_adapter/oid/spatial.rb

@@ -11,7 +11,12 @@ module ActiveRecord
           #   "geometry(Geography,4326)"
           def initialize(oid, sql_type)
             @geo_type, @srid, @has_z, @has_m = self.class.parse_sql_type(sql_type)
-            @factory_generator = RGeo::Geographic.spherical_factory(srid: 4326) if oid =~ /geography/
+            if oid =~ /geography/
+              factory_opts = {srid: (@srid || 4326)}
+              factory_opts[:has_z_coordinate] = @has_z
+              factory_opts[:has_m_coordinate] = @has_m
+              @factory_generator = RGeo::Geographic.spherical_factory(factory_opts)
+            end
           end
 
           # sql_type: geometry, geometry(Point), geometry(Point,4326), ...
@@ -87,7 +92,6 @@ module ActiveRecord
             return if value.nil?
             RGeo::WKRep::WKBParser.new(@factory_generator, support_ewkb: true).parse(value)
           rescue RGeo::Error::ParseError
-            puts "\ncast failed!!\n\n"
             nil
           end
 

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

@@ -30,6 +30,7 @@ module ActiveRecord
                             cast_type,
                             sql_type,
                             null,
+                            default_function,
                             column_info)
         end
 

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

@@ -9,7 +9,7 @@ module ActiveRecord  # :nodoc:
         # cast_type example classes:
         #   OID::Spatial
         #   OID::Integer
-        def initialize(factory_settings, table_name, name, default, cast_type, sql_type = nil, null = true, opts = nil)
+        def initialize(factory_settings, table_name, name, default, cast_type, sql_type = nil, null = true, default_function = nil, opts = nil)
           @factory_settings = factory_settings
           @table_name = table_name
           @geographic = !!(sql_type =~ /geography\(/i)
@@ -29,7 +29,7 @@ module ActiveRecord  # :nodoc:
             # @geometric_type = geo_type_from_sql_type(sql_type)
             build_from_sql_type(sql_type)
           end
-          super(name, default, cast_type, sql_type, null)
+          super(name, default, cast_type, sql_type, null, default_function)
           if spatial?
             if @srid
               @limit = { srid: @srid, type: geometric_type.type_name.underscore }

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGISAdapter
-      VERSION = '3.0.0.beta2'.freeze
+      VERSION = '3.0.0.beta3'.freeze
     end
   end
 end

data/test/ddl_test.rb

@@ -197,7 +197,17 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     assert_equal RGeo::Feature::Point, klass.columns.last.geometric_type
   end
 
-  def test_create_geometry_with_options
+  def test_create_geometry_using_shortcut_with_srid
+    klass.connection.create_table(:spatial_models, force: true) do |t|
+      t.geometry 'latlon', srid: 4326
+    end
+    klass.reset_column_information
+    col = klass.columns.last
+    assert_equal RGeo::Feature::Geometry, col.geometric_type
+    assert_equal({ srid: 4326, type: 'geometry' }, col.limit)
+  end
+
+  def test_create_polygon_with_options
     klass.connection.create_table(:spatial_models, force: true) do |t|
       t.column 'region', :st_polygon, has_m: true, srid: 3785
     end

data/test/tasks_test.rb

@@ -35,10 +35,12 @@ class TasksTest < ActiveSupport::TestCase  # :nodoc:
     setup_database_tasks
     connection.create_table(:spatial_test, force: true) do |t|
       t.st_point "latlon", geographic: true
+      t.geometry "geo_col", srid: 4326
     end
     ActiveRecord::Tasks::DatabaseTasks.structure_dump(NEW_CONNECTION, tmp_sql_filename)
     data = File.read(tmp_sql_filename)
     assert(data.index('latlon geography(Point,4326)'))
+    assert(data.index('geo_col geometry(Geometry,4326)'))
   end
 
   def test_index_sql_dump

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.