activerecord-postgis-adapter 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18cc2ab739bf03f97b736b5cd82d07ab340486cd
-  data.tar.gz: 7f2dee610840113f94fd189baa59003e10f9afd2
+  metadata.gz: 1d5794e492a6374fc116f335ff8479b594c666f1
+  data.tar.gz: e5ad43bd812c617dee1f37d3332b16e2a54cf662
 SHA512:
-  metadata.gz: 19606ec67a62af3ff989698c6ccc41a0511934fc326d30b38f4e21d7b9a09a52a5831850fe22ae23a5596b32997f2e93d253be02ed679f16da92b7b4d92f2fc6
-  data.tar.gz: 93f5d82f78520b7be8bf3a6d7ed17200d93af0f3850b3a00bf965282f0cec358e9a979cd4902b978495f94ba9f0184cbde5add0233a59ab360a10cca331ecbdd
+  metadata.gz: a50bfec3c23b81fe7ed5df48d2099e78bef8ab48e5ed4a1a72dd36b2a586a65ac3def49088f0adf7336ed2365b415051e384b15fbf584713d054aa703956e504
+  data.tar.gz: 29e8c1573d012b33fb5580db8ba9e8ed4d5e33e213da169fb4422a8728d90bcb874d5085183787654aec8a50bd0a12506e39b6b8b6c6e180f02b2807953fbefc

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

@@ -11,9 +11,9 @@ module Arel  # :nodoc:
       include RGeo::ActiveRecord::SpatialToSql
 
       FUNC_MAP = {
-        'st_wkttosql' => 'ST_GeomFromEWKT',
+        "st_wkttosql" => "ST_GeomFromEWKT",
       }
-      
+
       def st_func(standard_name)
         FUNC_MAP[standard_name.downcase] || standard_name
       end
@@ -25,8 +25,6 @@ module Arel  # :nodoc:
       def visit_RGeo_ActiveRecord_SpatialNamedFunction(node, collector)
         aggregate(st_func(node.name), node, collector)
       end
-
     end
-
   end
 end

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

@@ -1,13 +1,12 @@
-if RUBY_ENGINE == 'jruby'
-  require 'active_record/connection_adapters/jdbcpostgresql_adapter'
+if RUBY_ENGINE == "jruby"
+  require "active_record/connection_adapters/jdbcpostgresql_adapter"
 else
-  require 'pg'
+  require "pg"
 end
 
 module ActiveRecord  # :nodoc:
   module ConnectionHandling  # :nodoc:
-
-    if RUBY_ENGINE == 'jruby'
+    if RUBY_ENGINE == "jruby"
 
       def postgis_connection(config)
         config[:adapter_class] = ConnectionAdapters::PostGISAdapter
@@ -39,6 +38,5 @@ module ActiveRecord  # :nodoc:
       end
 
     end
-
   end
 end

data/lib/active_record/connection_adapters/postgis/databases.rake

@@ -7,7 +7,7 @@ namespace :db do
       ActiveRecord::Base.configurations
         .values_at(*environments)
         .compact
-        .reject{ |config| config["database"].blank? }
+        .reject { |config| config["database"].blank? }
         .each do |config|
           ActiveRecord::ConnectionAdapters::PostGIS::PostGISDatabaseTasks.new(config).setup_gis
         end

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

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

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

@@ -2,7 +2,6 @@ module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
       class PostGISDatabaseTasks < ::ActiveRecord::Tasks::PostgreSQLDatabaseTasks  # :nodoc:
-
         def initialize(config)
           super
           ensure_installation_configs
@@ -19,9 +18,9 @@ module ActiveRecord  # :nodoc:
         # Override to set the database owner and call setup_gis
         def create(master_established = false)
           establish_master_connection unless master_established
-          extra_configs = { 'encoding' => encoding }
-          extra_configs['owner'] = username if has_su?
-          connection.create_database(configuration['database'], configuration.merge(extra_configs))
+          extra_configs = { "encoding" => encoding }
+          extra_configs["owner"] = username if has_su?
+          connection.create_database(configuration["database"], configuration.merge(extra_configs))
           setup_gis
         rescue ::ActiveRecord::StatementInvalid => error
           if /database .* already exists/ === error.message
@@ -36,23 +35,23 @@ module ActiveRecord  # :nodoc:
         # Override to use su_username and su_password
         def establish_master_connection
           establish_connection(configuration.merge(
-            'database'           => 'postgres',
-            'password'           => su_password,
-            'schema_search_path' => 'public',
-            'username'           => su_username,
+            "database"           => "postgres",
+            "password"           => su_password,
+            "schema_search_path" => "public",
+            "username"           => su_username,
           ))
         end
 
         def establish_su_connection
           establish_connection(configuration.merge(
-            'password'           => su_password,
-            'schema_search_path' => 'public',
-            'username'           => su_username,
+            "password"           => su_password,
+            "schema_search_path" => "public",
+            "username"           => su_username,
           ))
         end
 
         def username
-          @username ||= configuration['username']
+          @username ||= configuration["username"]
         end
 
         def quoted_username
@@ -60,64 +59,64 @@ module ActiveRecord  # :nodoc:
         end
 
         def password
-          @password ||= configuration['password']
+          @password ||= configuration["password"]
         end
 
         def su_username
-          @su_username ||= configuration['su_username'] || username
+          @su_username ||= configuration["su_username"] || username
         end
 
         def su_password
-          @su_password ||= configuration['su_password'] || password
+          @su_password ||= configuration["su_password"] || password
         end
 
         def has_su?
-          @has_su = configuration.include?('su_username') unless defined?(@has_su)
+          @has_su = configuration.include?("su_username") unless defined?(@has_su)
           @has_su
         end
 
         def search_path
-          @search_path ||= configuration['schema_search_path'].to_s.strip.split(',').map(&:strip)
+          @search_path ||= configuration["schema_search_path"].to_s.strip.split(",").map(&:strip)
         end
 
         def extension_names
           @extension_names ||= begin
-            extensions = configuration['postgis_extension']
+            extensions = configuration["postgis_extension"]
             case extensions
             when ::String
-              extensions.split(',')
+              extensions.split(",")
             when ::Array
               extensions
             else
-              ['postgis']
+              ["postgis"]
             end
           end
         end
 
         def ensure_installation_configs
-          if configuration['setup'] == 'default' && !configuration['postgis_extension']
-            share_dir = `pg_config --sharedir`.strip rescue '/usr/share'
-            control_file = ::File.expand_path('extension/postgis.control', share_dir)
+          if configuration["setup"] == "default" && !configuration["postgis_extension"]
+            share_dir = `pg_config --sharedir`.strip rescue "/usr/share"
+            control_file = ::File.expand_path("extension/postgis.control", share_dir)
             if ::File.readable?(control_file)
-              configuration['postgis_extension'] = 'postgis'
+              configuration["postgis_extension"] = "postgis"
             end
           end
         end
 
         def setup_gis_from_extension
           extension_names.each do |extname|
-            if extname == 'postgis_topology'
-              raise ::ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path.include?('topology')
+            if extname == "postgis_topology"
+              raise ::ArgumentError, "'topology' must be in schema_search_path for postgis_topology" unless search_path.include?("topology")
               connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} SCHEMA topology")
             else
-              if (postgis_schema = configuration['postgis_schema'])
+              if (postgis_schema = configuration["postgis_schema"])
                 schema_clause = "WITH SCHEMA #{postgis_schema}"
                 unless schema_exists?(postgis_schema)
                   connection.execute("CREATE SCHEMA #{postgis_schema}")
                   connection.execute("GRANT ALL ON SCHEMA #{postgis_schema} TO PUBLIC")
                 end
               else
-                schema_clause = ''
+                schema_clause = ""
               end
 
               connection.execute("CREATE EXTENSION IF NOT EXISTS #{extname} #{schema_clause}")
@@ -131,7 +130,6 @@ module ActiveRecord  # :nodoc:
       end
 
       ::ActiveRecord::Tasks::DatabaseTasks.register_task(/postgis/, PostGISDatabaseTasks)
-
     end
   end
 end

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

@@ -1,5 +1,5 @@
-require 'rails/railtie'
-require 'active_record/connection_adapters/postgis_adapter'
+require "rails/railtie"
+require "active_record/connection_adapters/postgis_adapter"
 
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:

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

@@ -10,7 +10,7 @@ module ActiveRecord
             oid = get_oid_type(oid.to_i, fmod.to_i, column_name, type)
             default_value = extract_value_from_default(oid, default)
             default_function = extract_default_function(default_value, default)
-            new_column(table_name, column_name, default_value, oid, type, notnull == 'f', default_function)
+            new_column(table_name, column_name, default_value, oid, type, notnull == "f", default_function)
           end
         end
 
@@ -18,7 +18,7 @@ module ActiveRecord
         def new_column(table_name, column_name, default, cast_type, sql_type = nil, null = true, default_function = nil)
           # JDBC gets true/false in Rails 4, where other platforms get 't'/'f' strings.
           if null.is_a?(String)
-            null = (null == 't')
+            null = (null == "t")
           end
 
           column_info = spatial_column_info(table_name).get(column_name, sql_type)
@@ -49,7 +49,7 @@ module ActiveRecord
         def type_to_sql(type, limit = nil, precision = nil, scale = nil)
           case type
           when :geometry, :geography
-            "#{ type.to_s }(#{ limit })"
+            "#{type}(#{limit})"
           else
             super
           end
@@ -96,14 +96,12 @@ module ActiveRecord
             multi_polygon
             st_point
             st_polygon
-            )
-            .each do |geo_type|
-              map.register_type(geo_type) do |oid, _, sql_type|
-                OID::Spatial.new(oid, sql_type)
-              end
+          ).each do |geo_type|
+            map.register_type(geo_type) do |oid, _, sql_type|
+              OID::Spatial.new(oid, sql_type)
             end
+          end
         end
-
       end
     end
   end

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

@@ -1,11 +1,9 @@
 module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
-
       def self.initial_setup
-        ::ActiveRecord::SchemaDumper.ignore_tables |= %w[geometry_columns spatial_ref_sys layer topology]
+        ::ActiveRecord::SchemaDumper.ignore_tables |= %w(geometry_columns spatial_ref_sys layer topology)
       end
-
     end
   end
 end

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

@@ -2,7 +2,6 @@ module ActiveRecord  # :nodoc:
   module ConnectionAdapters  # :nodoc:
     module PostGIS  # :nodoc:
       class SpatialColumn < ConnectionAdapters::PostgreSQLColumn  # :nodoc:
-
         # sql_type examples:
         #   "Geometry(Point,4326)"
         #   "Geography(Point,4326)"

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

@@ -16,7 +16,7 @@ module ActiveRecord  # :nodoc:
             type = row[3]
             dimension = row[1].to_i
             has_m = !!(type =~ /m$/i)
-            type.sub!(/m$/, '')
+            type.sub!(/m$/, "")
             has_z = dimension > 3 || dimension == 3 && !has_m
             result[name] = {
               dimension: dimension,

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

@@ -50,7 +50,7 @@ module ActiveRecord  # :nodoc:
           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 << ",#{options[:srid] || 4326}"
           spatial_type
         end
 
@@ -61,12 +61,12 @@ module ActiveRecord  # :nodoc:
             value << self.class.geo_type(spatial_type)
             value << "Z" if has_z?
             value << "M" if has_m?
-            value << ",#{ srid }"
+            value << ",#{srid}"
           end
         end
 
         def self.geo_type(type = "GEOMETRY")
-          g_type = type.to_s.gsub("_", "").upcase
+          g_type = type.to_s.delete("_").upcase
           return "POINT" if g_type == "STPOINT"
           return "POLYGON" if g_type == "STPOLYGON"
           g_type
@@ -116,7 +116,6 @@ module ActiveRecord  # :nodoc:
           @has_m = !!value
         end
       end
-
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module PostGIS
-      VERSION = '3.1.0'.freeze
+      VERSION = "3.1.1".freeze
     end
   end
 end

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -3,24 +3,24 @@
 
 # :stopdoc:
 
-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'
-require 'active_record/connection_adapters/postgis/spatial_column_info'
-require 'active_record/connection_adapters/postgis/spatial_table_definition'
-require 'active_record/connection_adapters/postgis/spatial_column'
-require 'active_record/connection_adapters/postgis/arel_tosql'
-require 'active_record/connection_adapters/postgis/setup'
-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'
+require "active_record/connection_adapters/postgresql_adapter"
+require "rgeo-activerecord"
+require "active_record/connection_adapters/postgis/version"
+require "active_record/connection_adapters/postgis/column_methods"
+require "active_record/connection_adapters/postgis/schema_statements"
+require "active_record/connection_adapters/postgis/spatial_column_info"
+require "active_record/connection_adapters/postgis/spatial_table_definition"
+require "active_record/connection_adapters/postgis/spatial_column"
+require "active_record/connection_adapters/postgis/arel_tosql"
+require "active_record/connection_adapters/postgis/setup"
+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
 
 if defined?(::Rails::Railtie)
-  load ::File.expand_path('postgis/railtie.rb', ::File.dirname(__FILE__))
+  load ::File.expand_path("postgis/railtie.rb", ::File.dirname(__FILE__))
 end
 
 # :startdoc:
@@ -70,18 +70,18 @@ module ActiveRecord
 
       def srs_database_columns
         {
-          auth_name_column: 'auth_name',
-          auth_srid_column: 'auth_srid',
-          proj4text_column: 'proj4text',
-          srtext_column:    'srtext',
+          auth_name_column: "auth_name",
+          auth_srid_column: "auth_srid",
+          proj4text_column: "proj4text",
+          srtext_column:    "srtext",
         }
       end
 
       def quote(value, column = nil)
         if RGeo::Feature::Geometry.check_type(value)
-          "'#{ RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value) }'"
+          "'#{RGeo::WKRep::WKBGenerator.new(hex_format: true, type_format: :ewkb, emit_ewkb_srid: true).generate(value)}'"
         elsif value.is_a?(RGeo::Cartesian::BoundingBox)
-          "'#{ value.min_x },#{ value.min_y },#{ value.max_x },#{ value.max_y }'::box"
+          "'#{value.min_x},#{value.min_y},#{value.max_x},#{value.max_y}'::box"
         else
           super
         end

data/lib/activerecord-postgis-adapter.rb

@@ -1 +1 @@
-require 'active_record/connection_adapters/postgis_adapter.rb'
+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: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -118,15 +118,6 @@ files:
 - lib/active_record/connection_adapters/postgis/version.rb
 - lib/active_record/connection_adapters/postgis_adapter.rb
 - lib/activerecord-postgis-adapter.rb
-- test/basic_test.rb
-- test/database.yml
-- test/ddl_test.rb
-- test/nested_class_test.rb
-- test/setup_test.rb
-- test/spatial_queries_test.rb
-- test/tasks_test.rb
-- test/test_helper.rb
-- test/type_test.rb
 homepage: http://github.com/rgeo/activerecord-postgis-adapter
 licenses:
 - BSD
@@ -147,17 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for PostGIS, based on RGeo.
-test_files:
-- test/basic_test.rb
-- test/database.yml
-- test/ddl_test.rb
-- test/nested_class_test.rb
-- test/setup_test.rb
-- test/spatial_queries_test.rb
-- test/tasks_test.rb
-- test/test_helper.rb
-- test/type_test.rb
+test_files: []
+has_rdoc: