activerecord-postgis-adapter 0.4.0 → 0.4.1

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Railtie for PostGIS adapter
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -40,25 +40,25 @@ require 'rails/railtie'
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module PostGISAdapter
-      
-      
+
+
       class Railtie < ::Rails::Railtie
-        
+
         rake_tasks do
           load ::File.expand_path('databases.rake', ::File.dirname(__FILE__))
         end
-        
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # PostGIS adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -37,15 +37,18 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module PostGISAdapter
-      
-      
+
+
       class SpatialColumn < ConnectionAdapters::PostgreSQLColumn
-        
-        
+
+
+        FACTORY_SETTINGS_CACHE = {}
+
+
         def initialize(factory_settings_, table_name_, name_, default_, sql_type_=nil, null_=true, opts_=nil)
           @factory_settings = factory_settings_
           @table_name = table_name_
@@ -94,35 +97,36 @@ module ActiveRecord
               @limit = {:no_constraints => true}
             end
           end
+          FACTORY_SETTINGS_CACHE[factory_settings_.object_id] = factory_settings_
         end
-        
-        
+
+
         attr_reader :geographic
         attr_reader :srid
         attr_reader :geometric_type
         attr_reader :has_z
         attr_reader :has_m
-        
+
         alias_method :geographic?, :geographic
         alias_method :has_z?, :has_z
         alias_method :has_m?, :has_m
-        
-        
+
+
         def spatial?
           type == :spatial
         end
-        
-        
+
+
         def has_spatial_constraints?
           !@srid.nil?
         end
-        
-        
+
+
         def klass
           type == :spatial ? ::RGeo::Feature::Geometry : super
         end
-        
-        
+
+
         def type_cast(value_)
           if type == :spatial
             SpatialColumn.convert_to_geometry(value_, @factory_settings, @table_name, name,
@@ -131,28 +135,29 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def type_cast_code(var_name_)
           if type == :spatial
             "::ActiveRecord::ConnectionAdapters::PostGISAdapter::SpatialColumn.convert_to_geometry("+
-              "#{var_name_}, self.class.rgeo_factory_settings, self.class.table_name, "+
+              "#{var_name_}, ::ActiveRecord::ConnectionAdapters::PostGISAdapter::SpatialColumn::"+
+              "FACTORY_SETTINGS_CACHE[#{@factory_settings.object_id}], #{@table_name.inspect}, "+
               "#{name.inspect}, #{@geographic ? 'true' : 'false'}, #{@srid.inspect}, "+
               "#{@has_z ? 'true' : 'false'}, #{@has_m ? 'true' : 'false'})"
           else
             super
           end
         end
-        
-        
+
+
         private
-        
-        
+
+
         def simplified_type(sql_type_)
           sql_type_ =~ /geography|geometry|point|linestring|polygon/i ? :spatial : super
         end
-        
-        
+
+
         def self.convert_to_geometry(input_, factory_settings_, table_name_, column_, geographic_, srid_, has_z_, has_m_)
           if srid_
             constraints_ = {:geographic => geographic_, :has_z_coordinate => has_z_,
@@ -180,15 +185,15 @@ module ActiveRecord
             nil
           end
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # PostGIS adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -37,14 +37,14 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module PostGISAdapter
-      
-      
+
+
       class SpatialTableDefinition < ConnectionAdapters::TableDefinition
-        
+
         def column(name_, type_, options_={})
           if (info_ = @base.spatial_column_constructor(type_.to_sym))
             type_ = options_[:type] || info_[:type] || type_
@@ -71,74 +71,74 @@ module ActiveRecord
           end
           self
         end
-        
+
         def to_sql
           @columns.find_all{ |c_| !c_.respond_to?(:geographic?) || c_.geographic? }.map{ |c_| c_.to_sql } * ', '
         end
-        
+
         def non_geographic_spatial_columns
           @columns.find_all{ |c_| c_.respond_to?(:geographic?) && !c_.geographic? }
         end
-        
+
       end
-      
-      
+
+
       module SpatialColumnDefinitionMethods
-        
+
         def spatial_type
           @spatial_type
         end
-        
+
         def geographic?
           @geographic
         end
-        
+
         def srid
           @srid ? @srid.to_i : (geographic? ? 4326 : -1)
         end
-        
+
         def has_z?
           @has_z
         end
-        
+
         def has_m?
           @has_m
         end
-        
+
         def set_geographic(value_)
           @geographic = value_ ? true : false
         end
-        
+
         def set_spatial_type(value_)
           @spatial_type = value_.to_s
         end
-        
+
         def set_srid(value_)
           @srid = value_
         end
-        
+
         def set_has_z(value_)
           @has_z = value_ ? true : false
         end
-        
+
         def set_has_m(value_)
           @has_m = value_ ? true : false
         end
-        
+
         def sql_type
           type_ = spatial_type.upcase.gsub('_', '')
           type_ << 'Z' if has_z?
           type_ << 'M' if has_m?
           "GEOGRAPHY(#{type_},#{srid})"
         end
-        
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # PostGIS adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,22 +41,22 @@ end
 
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module PostGISAdapter
-      
-      
+
+
       # Current version of PostGISAdapter as a frozen string
       VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../../Version').strip.freeze
-      
+
       # Current version of PostGISAdapter as a Versionomy object, if the
       # Versionomy gem is available; otherwise equal to VERSION_STRING.
       VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
-      
-      
+
+
     end
-    
+
   end
-  
+
 end

data/lib/rgeo/active_record/postgis_adapter/railtie.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Railtie for PostGIS adapter
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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