activerecord-postgis-adapter 3.0.0.beta4 → 3.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c4921aa89cd6c33269ff6f2850140020602440b
-  data.tar.gz: 6a32214e6ccc587ee9ca8c7bdcf29290725d9143
+  metadata.gz: da8f856d4cf24c6499865f61ffca7aa83dfde847
+  data.tar.gz: bb1f2d2716ef65650d7a438a62554e5f07cea2b0
 SHA512:
-  metadata.gz: c4b7f244e186d445554d57be503cd02d6f9cc3f6ead1d3d0f2db5bba7300f9b3a34b0f4f12184984fa7bbf4a3048a4114e6a80be148f2d871cdf1ed59fd286e8
-  data.tar.gz: aac5a7ac04094aca372a331f1c560f9a208c35a119d520d02cebb7258675a7615c7dd262079ed765f15b2e375b5156d1cbd4152a8532f97ca3d081193d608171
+  metadata.gz: 0aae508c94cd5a4d07e72e451b024f69fefb955db49213700490d7a71007cf3f0c7306479b6292e1b98fc841a7b3868bb26b3f91eb6ec916f0d9a47246dea898
+  data.tar.gz: 68e42bce528929b082443e7afc6736e80a4d1c89084300e3a648f0574486bae913937a46650153fb357f4f90be69619bbecf9325479e6376821b6d9ccf147179

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

@@ -30,10 +30,6 @@ module ActiveRecord  # :nodoc:
         #   PostGISAdapter::SchemaCreation.new self
         # end
 
-        def set_rgeo_factory_settings(factory_settings)
-          @rgeo_factory_settings = factory_settings
-        end
-
         def adapter_name
           "PostGIS".freeze
         end

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

@@ -10,13 +10,8 @@ module ActiveRecord
           #   "geometry(Polygon,4326) NOT NULL"
           #   "geometry(Geography,4326)"
           def initialize(oid, sql_type)
+            @sql_type = sql_type
             @geo_type, @srid, @has_z, @has_m = self.class.parse_sql_type(sql_type)
-            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), ...
@@ -52,12 +47,19 @@ module ActiveRecord
             [geo_type, srid, has_z, has_m]
           end
 
-          def factory_generator
-            @factory_generator
+          def spatial_factory
+            @spatial_factory ||=
+              RGeo::ActiveRecord::SpatialFactoryStore.instance.factory(
+                geo_type: @geo_type,
+                has_m:    @has_m,
+                has_z:    @has_z,
+                sql_type: @sql_type,
+                srid:     @srid,
+              )
           end
 
           def geographic?
-            !!factory_generator
+            @sql_type =~ /geography/
           end
 
           def spatial?
@@ -90,16 +92,14 @@ module ActiveRecord
 
           def cast_value(value)
             return if value.nil?
-            RGeo::WKRep::WKBParser.new(@factory_generator, support_ewkb: true).parse(value)
+            RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true).parse(value)
           rescue RGeo::Error::ParseError
             nil
           end
 
           # convert WKT string into RGeo object
           def parse_wkt(string)
-            # factory = factory_settings.get_column_factory(table_name, column, constraints)
-            factory = @factory_generator || RGeo::ActiveRecord::RGeoFactorySettings.new
-            wkt_parser(factory, string).parse(string)
+            wkt_parser(string).parse(string)
           rescue RGeo::Error::ParseError
             nil
           end
@@ -108,14 +108,13 @@ module ActiveRecord
             string[0] == "\x00" || string[0] == "\x01" || string[0, 4] =~ /[0-9a-fA-F]{4}/
           end
 
-          def wkt_parser(factory, string)
+          def wkt_parser(string)
             if binary_string?(string)
-              RGeo::WKRep::WKBParser.new(factory, support_ewkb: true, default_srid: @srid)
+              RGeo::WKRep::WKBParser.new(spatial_factory, support_ewkb: true, default_srid: @srid)
             else
-              RGeo::WKRep::WKTParser.new(factory, support_ewkt: true, default_srid: @srid)
+              RGeo::WKRep::WKTParser.new(spatial_factory, support_ewkt: true, default_srid: @srid)
             end
           end
-
         end
       end
     end

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

@@ -23,8 +23,7 @@ module ActiveRecord
 
           column_info = spatial_column_info(table_name).get(column_name, sql_type)
 
-          SpatialColumn.new(@rgeo_factory_settings,
-                            table_name,
+          SpatialColumn.new(table_name,
                             column_name,
                             default,
                             cast_type,

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

@@ -9,8 +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, default_function = nil, opts = nil)
-          @factory_settings = factory_settings
+        def initialize(table_name, name, default, cast_type, sql_type = nil, null = true, default_function = nil, opts = nil)
           @table_name = table_name
           @geographic = !!(sql_type =~ /geography\(/i)
           if opts
@@ -62,11 +61,6 @@ module ActiveRecord  # :nodoc:
           cast_type.respond_to?(:spatial?) && cast_type.spatial?
         end
 
-        # TODO: delete - unused?
-        def has_spatial_constraints?
-          !!@srid
-        end
-
         private
 
         def set_geometric_type_from_name(name)

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

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

data/test/basic_test.rb

@@ -87,19 +87,25 @@ class BasicTest < ActiveSupport::TestCase  # :nodoc:
 
   def test_custom_factory
     klass = SpatialModel
-    klass.connection.create_table(:spatial_test, force: true) do |t|
-      t.st_point(:latlon, srid: 4326)
-    end
-    factory = RGeo::Geographic.simple_mercator_factory
-    klass.class_eval do
-      set_rgeo_factory_for_column(:latlon, factory)
+    klass.connection.create_table(:spatial_models, force: true) do |t|
+      t.st_polygon(:area, srid: 4326)
     end
-    assert_equal factory, klass.rgeo_factory_for_column(:latlon)
+    klass.reset_column_information
+    custom_factory = RGeo::Geographic.spherical_factory(buffer_resolution: 8, srid: 4326)
+    spatial_factory_store.register(custom_factory, geo_type: "polygon", srid: 4326)
     object = klass.new
-    assert_equal factory, object.class.rgeo_factory_for_column(:latlon)
+    area = custom_factory.point(1, 2).buffer(3)
+    object.area = area
+    object.save!
+    object.reload
+    assert_equal area.to_s, object.area.to_s
+    spatial_factory_store.clear
   end
 
   def test_readme_example
+    spatial_factory_store.register(
+      RGeo::Geographic.spherical_factory, geo_type: "point", sql_type: "geography")
+
     klass = SpatialModel
     klass.connection.create_table(:spatial_models, force: true) do |t|
       t.column(:shape, :geometry)
@@ -111,16 +117,15 @@ class BasicTest < ActiveSupport::TestCase  # :nodoc:
     klass.connection.change_table(:spatial_models) do |t|
       t.index(:latlon, using: :gist)
     end
-    klass.class_eval do
-      self.rgeo_factory_generator = RGeo::Geos.method(:factory)
-      set_rgeo_factory_for_column(:latlon, RGeo::Geographic.spherical_factory)
-    end
+
     object = klass.new
     object.latlon = 'POINT(-122 47)'
     point = object.latlon
     assert_equal 47, point.latitude
     object.shape = point
     # assert_equal true, RGeo::Geos.is_geos?(object.shape)
+
+    spatial_factory_store.clear
   end
 
   def test_point_to_json
@@ -148,5 +153,8 @@ class BasicTest < ActiveSupport::TestCase  # :nodoc:
     end
     SpatialModel.reset_column_information
   end
-end
 
+  def spatial_factory_store
+    RGeo::ActiveRecord::SpatialFactoryStore.instance
+  end
+end

data/test/ddl_test.rb

@@ -30,7 +30,7 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     assert_equal 1, count_geometry_columns
     col = klass.columns.last
     assert_equal RGeo::Feature::Geometry, col.geometric_type
-    assert_equal true, col.has_spatial_constraints?
+    assert_equal true, col.spatial?
     assert_equal false, col.geographic?
     assert_equal 0, col.srid
     klass.connection.drop_table(:spatial_models)
@@ -44,7 +44,7 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     klass.reset_column_information
     col = klass.columns.last
     assert_equal RGeo::Feature::Geometry, col.geometric_type
-    assert_equal true, col.has_spatial_constraints?
+    assert_equal true, col.spatial?
     assert_equal true, col.geographic?
     assert_equal 4326, col.srid
     assert_equal 0, count_geometry_columns
@@ -82,13 +82,13 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     columns = klass.columns
     assert_equal RGeo::Feature::Geometry, columns[-3].geometric_type
     assert_equal 0, columns[-3].srid
-    assert_equal true, columns[-3].has_spatial_constraints?
+    assert_equal true, columns[-3].spatial?
     assert_equal RGeo::Feature::Point, columns[-2].geometric_type
     assert_equal 4326, columns[-2].srid
     assert_equal false, columns[-2].geographic?
-    assert_equal true, columns[-2].has_spatial_constraints?
+    assert_equal true, columns[-2].spatial?
     assert_nil columns[-1].geometric_type
-    assert_equal false, columns[-1].has_spatial_constraints?
+    assert_equal false, columns[-1].spatial?
   end
 
   def test_add_geometry_column_null_false
@@ -117,13 +117,13 @@ class DDLTest < ActiveSupport::TestCase  # :nodoc:
     cols_ = klass.columns
     assert_equal RGeo::Feature::Geometry, cols_[-3].geometric_type
     assert_equal 0, cols_[-3].srid
-    assert_equal true, cols_[-3].has_spatial_constraints?
+    assert_equal true, cols_[-3].spatial?
     assert_equal RGeo::Feature::Point, cols_[-2].geometric_type
     assert_equal 4326, cols_[-2].srid
     assert_equal true, cols_[-2].geographic?
-    assert_equal true, cols_[-2].has_spatial_constraints?
+    assert_equal true, cols_[-2].spatial?
     assert_nil cols_[-1].geometric_type
-    assert_equal false, cols_[-1].has_spatial_constraints?
+    assert_equal false, cols_[-1].spatial?
   end
 
   def test_drop_geometry_column

data/test/test_helper.rb

@@ -1,7 +1,8 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/mini_test'
-require 'rgeo/active_record/adapter_test_helper'
+require 'active_record'
+require 'activerecord-postgis-adapter'
 
 begin
   require 'byebug'
@@ -26,4 +27,7 @@ class ActiveSupport::TestCase
     RGeo::Geographic.spherical_factory(srid: 4326)
   end
 
+  def spatial_factory_store
+    RGeo::ActiveRecord::SpatialFactoryStore.instance
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta4
+  version: 3.0.0.beta5
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement