activerecord-postgis-adapter 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 236c020f52dae956219d01fe115dbd8f409d4633
-  data.tar.gz: 3366b5fe7ec15d82409cd93ec935d66853c64ff3
+  metadata.gz: 27e0e15e44b3ab31f823c3444c2d9c570c9ec05d
+  data.tar.gz: 2bd3b9721d10bdf3b50ed54ba58ab64f86ab7fbb
 SHA512:
-  metadata.gz: 3ca731b9288775c0f39e135e452c5f7aef6e9fa57e819e2266b6eced126f3d6bc36812f554fd7b79526f9b6a524ca041166490ae75ab2a9ecb8c1142bdae646d
-  data.tar.gz: 28c3501a770cb128107612e9fb4202355ed088e56e8a4673fa45664d62719dd91dc13d7fa47d6a4ed4d36ef3a4a4d7e874289ab42c3d87b14763525272f07766
+  metadata.gz: 58aeefe5d9a09e2cf98572cb858cedd6b3d6b2d246b21d4b2885be09c7c697f910fe185a5037da9ed8b49e9090e9fd6161e6da66ccdf0e0493c4edd7e1d42062
+  data.tar.gz: 54d2983b42788fa200f3c2d36ee5d0c84f96362d05d59576216ecd4a986de63756a134e308a614dfeec9e267d4fd57bc76978134f15be6268348fcd8342adada

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.7.0 / 2014-04-04
+
+* Version 0.7.0 is for Rails 4.0.x
+* Require ruby 1.9.3+
+* Require ActiveRecord 4.0
+* Drop JRuby support (temporary)
+
 === 0.6.5 / 2013-06-24
 
 * Fixed stoopid syntax errors in rake db:gis:setup tass. (Pull requests by rhodrid and jdurand)

data/{lib/rgeo/active_record/postgis_adapter/railtie.rb → LICENSE.txt}

@@ -1,9 +1,5 @@
 # -----------------------------------------------------------------------------
-#
-# Railtie for PostGIS adapter
-#
-# -----------------------------------------------------------------------------
-# Copyright 2010-2012 Daniel Azuma
+# Copyright 2012 Daniel Azuma
 #
 # All rights reserved.
 #
@@ -30,10 +26,4 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
-puts 'WARNING: requiring "rgeo/active_record/postgis_adapter/railtie" is deprecated. Generally, the normal Bundle.require will do the trick. If you need to require the railtie explicitly, require "active_record/connection_adapters/postgis_adapter/railtie"'
-
-require 'active_record/connection_adapters/postgis_adapter/railtie'
+# -----------------------------------------------------------------------------

data/lib/active_record/connection_adapters/postgis_adapter.rb

@@ -1,62 +1,18 @@
-# -----------------------------------------------------------------------------
-#
-# PostGIS adapter for ActiveRecord
-#
-# -----------------------------------------------------------------------------
-# Copyright 2010-2012 Daniel Azuma
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
 # The activerecord-postgis-adapter gem installs the *postgis*
 # connection adapter into ActiveRecord.
 
 module ActiveRecord
-
   # All ActiveRecord adapters go in this namespace.
   # This adapter is installed into the PostGISAdapter submodule.
   module ConnectionAdapters
-
     # The PostGIS Adapter lives in this namespace.
     module PostGISAdapter
-
       # The name returned by the adapter_name method of this adapter.
       ADAPTER_NAME = 'PostGIS'.freeze
-
     end
-
   end
-
-
 end
 
-
 # :stopdoc:
 
 require 'active_record'
@@ -64,23 +20,8 @@ require 'active_record/connection_adapters/postgresql_adapter'
 require 'rgeo/active_record'
 
 case ::ActiveRecord::VERSION::MAJOR
-when 3
-  require 'active_record/connection_adapters/postgis_adapter/shared/version.rb'
-  require 'active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb'
-  require 'active_record/connection_adapters/postgis_adapter/rails3/main_adapter.rb'
-  require 'active_record/connection_adapters/postgis_adapter/rails3/spatial_table_definition.rb'
-  require 'active_record/connection_adapters/postgis_adapter/rails3/spatial_column.rb'
-  require 'active_record/connection_adapters/postgis_adapter/shared/arel_tosql.rb'
-  require 'active_record/connection_adapters/postgis_adapter/shared/setup.rb'
-  require 'active_record/connection_adapters/postgis_adapter/rails3/create_connection'
 when 4
-
-  # TEMP
-  if defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby'
-    raise "**** Sorry, activerecord-postgis-adapter does not yet support Rails 4 on JRuby ****"
-  end
-
-  require 'active_record/connection_adapters/postgis_adapter/shared/version.rb'
+  require 'active_record/connection_adapters/postgis_adapter/version.rb'
   require 'active_record/connection_adapters/postgis_adapter/shared/common_adapter_methods.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/main_adapter.rb'
   require 'active_record/connection_adapters/postgis_adapter/rails4/spatial_table_definition.rb'

data/lib/active_record/connection_adapters/postgis_adapter/rails4/create_connection.rb

@@ -1,88 +1,29 @@
-# -----------------------------------------------------------------------------
-#
-# PostGIS adapter for ActiveRecord
-#
-# -----------------------------------------------------------------------------
-# Copyright 2010-2012 Daniel Azuma
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
 module ActiveRecord  # :nodoc:
 
   module ConnectionHandling  # :nodoc:
+    require 'pg'
 
+    # Based on the default <tt>postgresql_connection</tt> definition from
+    # ActiveRecord.
 
-    if defined?(::RUBY_ENGINE) && ::RUBY_ENGINE == 'jruby'
-
-      require 'active_record/connection_adapters/jdbcpostgresql_adapter'
-      require 'active_record/connection_adapters/postgis_adapter/shared/jdbc_compat'
-
-
-      def postgis_connection(config_)
-        ::ActiveRecord::ConnectionAdapters::PostGISAdapter.create_jdbc_connection(self, config_)
-      end
-
-      alias_method :jdbcpostgis_connection, :postgis_connection
-
-
-    else
+    def postgis_connection(config_)
+      # FULL REPLACEMENT because we need to create a different class.
+      conn_params_ = config_.symbolize_keys
 
+      conn_params_.delete_if { |_, v_| v_.nil? }
 
-      require 'pg'
-
-
-      # Based on the default <tt>postgresql_connection</tt> definition from
-      # ActiveRecord.
-
-      def postgis_connection(config_)
-        # FULL REPLACEMENT because we need to create a different class.
-        conn_params_ = config_.symbolize_keys
-
-        conn_params_.delete_if { |_, v_| v_.nil? }
-
-        # Map ActiveRecords param names to PGs.
-        conn_params_[:user] = conn_params_.delete(:username) if conn_params_[:username]
-        conn_params_[:dbname] = conn_params_.delete(:database) if conn_params_[:database]
-
-        # Forward only valid config params to PGconn.connect.
-        conn_params_.keep_if { |k_, _| VALID_CONN_PARAMS.include?(k_) }
-
-        # The postgres drivers don't allow the creation of an unconnected PGconn object,
-        # so just pass a nil connection object for the time being.
-        ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter.new(nil, logger, conn_params_, config_)
-      end
+      # Map ActiveRecords param names to PGs.
+      conn_params_[:user] = conn_params_.delete(:username) if conn_params_[:username]
+      conn_params_[:dbname] = conn_params_.delete(:database) if conn_params_[:database]
 
+      # Forward only valid config params to PGconn.connect.
+      conn_params_.keep_if { |k_, _| VALID_CONN_PARAMS.include?(k_) }
 
+      # The postgres drivers don't allow the creation of an unconnected PGconn object,
+      # so just pass a nil connection object for the time being.
+      ::ActiveRecord::ConnectionAdapters::PostGISAdapter::MainAdapter.new(nil, logger, conn_params_, config_)
     end
 
-
   end
 
 end

data/lib/active_record/connection_adapters/postgis_adapter/rails4/databases.rake

@@ -1,42 +1,5 @@
-# -----------------------------------------------------------------------------
-#
-# PostGIS adapter for ActiveRecord
-#
-# -----------------------------------------------------------------------------
-# Copyright 2010-2012 Daniel Azuma
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
 # :stopdoc:
 
-
 namespace :db do
   namespace :gis do
     desc "Setup PostGIS data in the database"
@@ -51,5 +14,4 @@ namespace :db do
   end
 end
 
-
 # :startdoc:

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

@@ -1,59 +1,15 @@
-# -----------------------------------------------------------------------------
-#
-# PostGIS adapter for ActiveRecord
-#
-# -----------------------------------------------------------------------------
-# Copyright 2010-2012 Daniel Azuma
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of the copyright holder, nor the names of any other
-#   contributors to this software, may be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# -----------------------------------------------------------------------------
-;
-
-
 module ActiveRecord  # :nodoc:
-
   module ConnectionAdapters  # :nodoc:
-
     module PostGISAdapter  # :nodoc:
-
-
       class MainAdapter < PostgreSQLAdapter  # :nodoc:
-
-
         def initialize(*args_)
           # Overridden to change the visitor
           super
           @visitor = ::Arel::Visitors::PostGIS.new(self)
         end
 
-
         include PostGISAdapter::CommonAdapterMethods
 
-
         @@native_database_types = nil
 
         def native_database_types
@@ -63,7 +19,6 @@ module ActiveRecord  # :nodoc:
             :geography => {:name => 'geography'})
         end
 
-
         def type_cast(value_, column_, array_member_=false)
           if ::RGeo::Feature::Geometry.check_type(value_)
             ::RGeo::WKRep::WKBGenerator.new(:hex_format => true, :type_format => :ewkb, :emit_ewkb_srid => true).generate(value_)
@@ -72,22 +27,12 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-
         def columns(table_name_, name_=nil)
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We needed to return a spatial column subclass.
           table_name_ = table_name_.to_s
           spatial_info_ = spatial_column_info(table_name_)
           column_definitions(table_name_).collect do |col_name_, type_, default_, notnull_, oid_, fmod_|
-            # JDBC support: JDBC adapter returns a hash for column definitions,
-            # instead of an array of values.
-            if col_name_.kind_of?(::Hash)
-              notnull_ = col_name_["column_not_null"]
-              default_ = col_name_["column_default"]
-              type_ = col_name_["column_type"]
-              col_name_ = col_name_["column_name"]
-              # TODO: get oid and fmod from jdbc
-            end
             oid_ = OID::TYPE_MAP.fetch(oid_.to_i, fmod_.to_i) {
               OID::Identity.new
             }
@@ -96,7 +41,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-
         def indexes(table_name_, name_=nil)
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           result_ = query(<<-SQL, 'SCHEMA')
@@ -143,13 +87,11 @@ module ActiveRecord  # :nodoc:
           end.compact
         end
 
-
         def create_table_definition(name_, temporary_, options_)
           # Override to create a spatial table definition (post-4.0.0.beta1)
           PostGISAdapter::TableDefinition.new(native_database_types, name_, temporary_, options_, self)
         end
 
-
         def create_table(table_name_, options_={}, &block_)
           table_name_ = table_name_.to_s
           # Call super and snag the table definition
@@ -170,7 +112,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-
         def drop_table(table_name_, *options_)
           if postgis_lib_version.to_s.split('.').first.to_i == 1
             execute("DELETE from geometry_columns where f_table_name='#{quote_string(table_name_.to_s)}'")
@@ -178,7 +119,6 @@ module ActiveRecord  # :nodoc:
           super
         end
 
-
         def add_column(table_name_, column_name_, type_, options_={})
           table_name_ = table_name_.to_s
           column_name_ = column_name_.to_s
@@ -214,7 +154,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-
         def remove_column(table_name_, column_name_, type_=nil, options_={})
           table_name_ = table_name_.to_s
           column_name_ = column_name_.to_s
@@ -226,7 +165,6 @@ module ActiveRecord  # :nodoc:
           end
         end
 
-
         def add_index(table_name_, column_name_, options_={})
           # FULL REPLACEMENT. RE-CHECK ON NEW VERSIONS.
           # We have to fully-replace because of the gist_clause.
@@ -236,7 +174,6 @@ module ActiveRecord  # :nodoc:
           execute "CREATE #{index_type_} INDEX #{quote_column_name(index_name_)} ON #{quote_table_name(table_name_)}#{gist_clause_} (#{index_columns_})#{index_options_}"
         end
 
-
         def spatial_column_info(table_name_)
           info_ = query("SELECT f_geometry_column,coord_dimension,srid,type FROM geometry_columns WHERE f_table_name='#{quote_string(table_name_.to_s)}'")
           result_ = {}
@@ -259,12 +196,7 @@ module ActiveRecord  # :nodoc:
           result_
         end
 
-
       end
-
-
     end
-
   end
-
 end