activerecord-postgis-adapter 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7c6e57d0893ca27232ee81eee995ddaeb1044e60
-  data.tar.gz: 2df9405b4f59de606e5aa606de8b2745656bc50d
+SHA256:
+  metadata.gz: 84c3b75edc2182ada4966426b861993e3803641ac9183c62da248a844ed95152
+  data.tar.gz: a0d17e9e4e13ec24083c5747a1cc2108c9a16282395bd8c3bce7e8c8ae721992
 SHA512:
-  metadata.gz: 4b0bacebd939405ab3a7d3481107d12d0251008f4822196baf34e88c1f9b8aae5b83bab632f6dfacf413a34a76a391dcee579e0eab51051b2101250cd1e50191
-  data.tar.gz: 3bf3734ad9c9239cff532de08fa596c239036e5f937bc8986b8dfc62b4f0d4a39062504bfe7d8610c87d417e7eb5005d571e2b2270bc69213dfcd7d9db7b44cc
+  metadata.gz: e5235e3de502775bfeccd608933137a2911ad425f26ec5ae6e64f7f21393fdadf6e3f4311b532e69c9caeeca604b963e01daabc42d7900688f016d9dcb1c252d
+  data.tar.gz: 3343c51a6bdbb1f99053e2fc66afc10a678686138ba6b5e314bbb14905047d5be0ace6505b1f5bc034247e4852f320130fff2fa0cfe39e0d78f6f0a866b4fbb6

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/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = "4.0.4"
+      VERSION = "4.0.5"
     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"
@@ -20,7 +28,7 @@ require "active_record/connection_adapters/postgis/postgis_database_tasks"
 ::ActiveRecord::ConnectionAdapters::PostGIS.initial_setup
 
 if defined?(::Rails::Railtie)
-  load ::File.expand_path("postgis/railtie.rb", ::File.dirname(__FILE__))
+  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: 4.0.4
+  version: 4.0.5
 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: