activerecord-postgis-adapter 4.1.2 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b7f31291d3a3bac2b1ebe80cd26338922c4a5f1ec7df74fee00a2584e6540800
-  data.tar.gz: b2d85cda7e6d77806f8bce76cc9fa7bff74be5955e769bd263a307ad93736ee0
+SHA1:
+  metadata.gz: 7b3f788f4ff2a7994a5b09fe55a85fb34e4c07af
+  data.tar.gz: 150c100ea1c01b61c118a3072780514c313cd44d
 SHA512:
-  metadata.gz: 047ed7b22f3ed708e9a2bd4c61c89f5ee9a0b816cf95a92d3edfb0337408b59e3582c21fae299269bda70ca814f6e69e62139ca8928780b2ff738df2a52b528e
-  data.tar.gz: 1425b7e58930b20a9c48d3c9f089a8fdbf85a5248bd96fc8b0e9f0d680a634ba3dee22b8b0b1499ce00db033df37634a67bab3e9bb07b0946e96433b080a1d03
+  metadata.gz: 4cb6baff936647c96561d781260d6cd3b61e56130ea87c337d4285050686f81b68c5130fdcd4696684583fccdcba6ec21a1b602ed542ad2bdc648eba71474899
+  data.tar.gz: 41c64f27461a9fa46d1046fb9e8376ad5fa80ad5737dbd4d0b26e25b13891363a83f059be730eec27fe742fa21e41c68720c4629a797b09a589a7ece3d3ea429

data/lib/active_record/connection_adapters/postgis/column_methods.rb

@@ -43,8 +43,8 @@ module ActiveRecord
           column(name, :st_polygon, options)
         end
       end
-    end
 
-    PostgreSQL::Table.include PostGIS::ColumnMethods
+      PostgreSQL::Table.send(:include, ColumnMethods)
+    end
   end
 end

data/lib/active_record/connection_adapters/postgis/create_connection.rb

@@ -30,7 +30,7 @@ module ActiveRecord  # :nodoc:
         conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
         # Forward only valid config params to PGconn.connect.
-        valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:requiressl]
+        valid_conn_param_keys = PGconn.conndefaults_hash.keys + [:requiressl]
         conn_params.slice!(*valid_conn_param_keys)
 
         # The postgres drivers don't allow the creation of an unconnected PGconn object,

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

@@ -24,16 +24,21 @@ module ActiveRecord
           def self.parse_sql_type(sql_type)
             geo_type, srid, has_z, has_m = nil, 0, false, false
 
-            if sql_type =~ /(geography|geometry)\((.*)\)$/i
+            if sql_type =~ /[geography,geometry]\((.*)\)$/i
               # geometry(Point,4326)
-              params = Regexp.last_match(2).split(",")
-              if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
-                has_z = Regexp.last_match(2).length > 0
-                has_m = Regexp.last_match(3).length > 0
-                geo_type = Regexp.last_match(1)
-              end
-              if params.last =~ /(\d+)/
-                srid = Regexp.last_match(1).to_i
+              params = Regexp.last_match(1).split(",")
+              if params.size > 1
+                if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
+                  has_z = Regexp.last_match(2).length > 0
+                  has_m = Regexp.last_match(3).length > 0
+                  geo_type = Regexp.last_match(1)
+                end
+                if params.last =~ /(\d+)/
+                  srid = Regexp.last_match(1).to_i
+                end
+              else
+                # geometry(Point)
+                geo_type = params[0]
               end
             else
               # geometry

data/lib/active_record/connection_adapters/postgis/railtie.rb

@@ -1,9 +1,12 @@
+require "rails/railtie"
+require "active_record/connection_adapters/postgis_adapter"
+
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
       class Railtie < ::Rails::Railtie  # :nodoc:
         rake_tasks do
-          load "active_record/connection_adapters/postgis/databases.rake"
+          load ::File.expand_path("databases.rake", ::File.dirname(__FILE__))
         end
       end
     end

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

@@ -6,7 +6,7 @@ module ActiveRecord
         # pass table_name to #new_column
         def columns(table_name)
           # Limit, precision, and scale are all handled by the superclass.
-          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod, collation, comment|
+          column_definitions(table_name).map do |column_name, type, default, notnull, oid, fmod, collation|
             oid = oid.to_i
             fmod = fmod.to_i
             type_metadata = fetch_type_metadata(column_name, type, oid, fmod)
@@ -14,12 +14,12 @@ module ActiveRecord
             default_value = extract_value_from_default(default)
 
             default_function = extract_default_function(default_value, default)
-            new_column(table_name, column_name, default_value, cast_type, type_metadata, !notnull, default_function, collation, comment)
+            new_column(table_name, column_name, default_value, cast_type, type_metadata, !notnull, default_function, collation)
           end
         end
 
         # override
-        def new_column(table_name, column_name, default, cast_type, sql_type_metadata = nil, null = true, default_function = nil, collation = nil, comment = nil)
+        def new_column(table_name, column_name, default, cast_type, sql_type_metadata = nil, null = true, default_function = nil, collation = nil)
           # JDBC gets true/false in Rails 4, where other platforms get 't'/'f' strings.
           if null.is_a?(String)
             null = (null == "t")
@@ -34,7 +34,6 @@ module ActiveRecord
                             table_name,
                             default_function,
                             collation,
-                            comment,
                             cast_type,
                             column_info)
         end
@@ -52,10 +51,10 @@ module ActiveRecord
         #
         # type_to_sql(:geography, "Point,4326")
         # => "geography(Point,4326)"
-        def type_to_sql(type, limit = nil, precision = nil, scale = nil, array = nil)
+        def type_to_sql(type, options = {})
           case type
           when :geometry, :geography
-            "#{type}(#{limit})"
+            "#{type}(#{options[:limit]})"
           else
             super
           end

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

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

data/lib/active_record/connection_adapters/postgis/spatial_table_definition.rb

@@ -11,109 +11,42 @@ module ActiveRecord  # :nodoc:
               options.merge!(limit) if limit.is_a?(::Hash)
             end
 
-            geo_type = ColumnDefinition.geo_type(options[:type] || type || info[:type])
+            geo_type = ColumnDefinitionUtils.geo_type(options[:type] || type || info[:type])
             base_type = info[:type] || (options[:geographic] ? :geography : :geometry)
 
             # puts name.dup << " - " << type.to_s << " - " << options.to_s << " :: " << geo_type.to_s << " - " << base_type.to_s
 
-            if options[:geographic]
-              options[:limit] = ColumnDefinition.options_to_limit(geo_type, options)
-            end
+            options[:limit] = ColumnDefinitionUtils.limit_from_options(geo_type, options)
+            options[:spatial_type] = geo_type
             column = super(name, base_type, options)
-            column.spatial_type = geo_type
-            column.geographic = options[:geographic]
-            column.srid = options[:srid]
-            column.has_z = options[:has_z]
-            column.has_m = options[:has_m]
           else
             column = super(name, type, options)
           end
 
           column
         end
-
-        private
-
-        def create_column_definition(name, type)
-          if PostGISAdapter.spatial_column_options(type.to_sym)
-            PostGIS::ColumnDefinition.new(name, type)
-          else
-            super
-          end
-        end
       end
 
-      class ColumnDefinition < PostgreSQL::ColumnDefinition
-        # needs to accept the spatial type? or figure out from limit ?
-
-        def self.options_to_limit(type, options = {})
-          spatial_type = geo_type(type)
-          spatial_type << "Z" if options[:has_z]
-          spatial_type << "M" if options[:has_m]
-          spatial_type << ",#{options[:srid] || 4326}"
-          spatial_type
-        end
-
-        # limit is how column options are passed to #type_to_sql
-        # returns: "Point,4326"
-        def limit
-          "".tap do |value|
-            value << self.class.geo_type(spatial_type)
-            value << "Z" if has_z?
-            value << "M" if has_m?
-            value << ",#{srid}"
+      module ColumnDefinitionUtils
+        class << self
+          def geo_type(type = "GEOMETRY")
+            g_type = type.to_s.delete("_").upcase
+            return "POINT" if g_type == "STPOINT"
+            return "POLYGON" if g_type == "STPOLYGON"
+            g_type
           end
-        end
-
-        def self.geo_type(type = "GEOMETRY")
-          g_type = type.to_s.delete("_").upcase
-          return "POINT" if g_type == "STPOINT"
-          return "POLYGON" if g_type == "STPOLYGON"
-          g_type
-        end
-
-        def spatial_type
-          @spatial_type
-        end
-
-        def spatial_type=(value)
-          @spatial_type = value.to_s
-        end
 
-        def geographic?
-          @geographic
-        end
-
-        def geographic=(value)
-          @geographic = !!value
-        end
-
-        def srid
-          if @srid
-            @srid.to_i
-          else
-            geographic? ? 4326 : PostGISAdapter::DEFAULT_SRID
+          def limit_from_options(type, options = {})
+            spatial_type = geo_type(type)
+            spatial_type << "Z" if options[:has_z]
+            spatial_type << "M" if options[:has_m]
+            spatial_type << ",#{options[:srid] || default_srid(options)}"
+            spatial_type
           end
-        end
-
-        def srid=(value)
-          @srid = value
-        end
 
-        def has_z?
-          @has_z
-        end
-
-        def has_z=(value)
-          @has_z = !!value
-        end
-
-        def has_m?
-          @has_m
-        end
-
-        def has_m=(value)
-          @has_m = !!value
+          def default_srid(options)
+            options[:geographic] ? 4326 : PostGISAdapter::DEFAULT_SRID
+          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "4.1.2"
+      VERSION = "5.0.1"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -3,16 +3,8 @@
 
 # :stopdoc:
 
-require "rgeo/active_record"
-
-# autoload AbstractAdapter to avoid circular require and void context warnings
-module ActiveRecord
-  module ConnectionAdapters
-    AbstractAdapter
-  end
-end
-
 require "active_record/connection_adapters/postgresql_adapter"
+require "rgeo/active_record"
 require "active_record/connection_adapters/postgis/version"
 require "active_record/connection_adapters/postgis/column_methods"
 require "active_record/connection_adapters/postgis/schema_statements"
@@ -28,7 +20,7 @@ require "active_record/connection_adapters/postgis/postgis_database_tasks"
 ::ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
 
 if defined?(::Rails::Railtie)
-  require "active_record/connection_adapters/postgis/railtie"
+  load ::File.expand_path("postgis/railtie.rb", ::File.dirname(__FILE__))
 end
 
 # :startdoc:
@@ -94,7 +86,7 @@ module ActiveRecord
         }
       end
 
-      def quote(value, column = nil)
+      def quote(value)
         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)

data/lib/activerecord-postgis-adapter.rb

@@ -1 +1 @@
-require "active_record/connection_adapters/postgis_adapter"
+require "active_record/connection_adapters/postgis_adapter.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 5.0.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rgeo-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.