activerecord-postgis-adapter 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 86c9222def52fff846e2a810afb1ff873c38c3c9
-  data.tar.gz: 56df8e96c3557c5e7f219dfe4db98cd515840847
+SHA256:
+  metadata.gz: 55d8ccb80a5af7b9cb4bdf9ccc538a17bb5049581c8e064ea32158ffa8087970
+  data.tar.gz: bc50927ccd18b0a6c17e6e73159cbc40b83a9e9bbcbe8c20a0265ad0915d091d
 SHA512:
-  metadata.gz: 63ba97d3c64f37a431e95793be0f43a40648deeea1e53c80fbb3dac216ec0dbac9c1c4beba1a30e69e3cb5ee42a733b623252cc179ebdc03d11599ceb9ca2bb6
-  data.tar.gz: 1fccafc33a9ad1495696e42d48b9ba7dba79e56d35c0e5150acf1721ebc395898efd8a8916804f916198c565dbfb37c3a6dce327599e37d8817a65f1b4791510
+  metadata.gz: dd1c8bdd0daedc8eb52c7d92a56468efe6efb93cfbd04468e00cafbf12899e47cbb0f087a59177e12f96e1b796cfa7f1afeba5f20e28435d9274cd7681ea2977
+  data.tar.gz: 826ff90f7b07ad036ca114e01ee2088a9bbcb5bb724099a77d49ea64ddd548e12112f1bae02b8a2b415488c03be3688e7fc7be7c86d7aa95078efff8fab8481e

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

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

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

@@ -24,9 +24,9 @@ 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(1).split(",")
+              params = Regexp.last_match(2).split(",")
               if params.size > 1
                 if params.first =~ /([a-z]+[^zm])(z?)(m?)/i
                   has_z = Regexp.last_match(2).length > 0

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

@@ -1,12 +1,9 @@
-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 ::File.expand_path("databases.rake", ::File.dirname(__FILE__))
+          load "active_record/connection_adapters/postgis/databases.rake"
         end
       end
     end

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

@@ -14,8 +14,6 @@ module ActiveRecord  # :nodoc:
             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
-
             options[:limit] = ColumnDefinitionUtils.limit_from_options(geo_type, options)
             options[:spatial_type] = geo_type
             column = super(name, base_type, options)

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "5.0.2"
+      VERSION = "5.0.3"
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -3,8 +3,16 @@
 
 # :stopdoc:
 
-require "active_record/connection_adapters/postgresql_adapter"
 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 "active_record/connection_adapters/postgis/version"
 require "active_record/connection_adapters/postgis/column_methods"
 require "active_record/connection_adapters/postgis/schema_statements"
@@ -17,10 +25,10 @@ require "active_record/connection_adapters/postgis/oid/spatial"
 require "active_record/connection_adapters/postgis/create_connection"
 require "active_record/connection_adapters/postgis/postgis_database_tasks"
 
-::ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
+ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
 
-if defined?(::Rails::Railtie)
-  load ::File.expand_path("postgis/railtie.rb", ::File.dirname(__FILE__))
+if defined?(Rails::Railtie)
+  require "active_record/connection_adapters/postgis/railtie"
 end
 
 # :startdoc:

data/lib/activerecord-postgis-adapter.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgis-adapter
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
 test_files: []
-has_rdoc: