activerecord-spatialite-adapter 0.4.0 → 0.4.1

data/lib/active_record/connection_adapters/spatialite_adapter/native_format_parser.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # SpatiaLite adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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
@@ -35,29 +35,29 @@
 
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module SpatiaLiteAdapter
-      
-      
+
+
       # A utility class that parses the native (internal) SpatiaLite
       # format. This is used to read and return an attribute value as an
       # RGeo object.
-      
+
       class NativeFormatParser
-        
-        
+
+
         # Create a parser that generates features using the given factory.
-        
+
         def initialize(factory_)
           @factory = factory_
         end
-        
-        
+
+
         # Parse the given binary data and return an object.
         # Raises ::RGeo::Error::ParseError on failure.
-        
+
         def parse(data_)
           if data_[0,1] =~ /[0-9a-fA-F]/
             data_ = [data_].pack('H*')
@@ -73,8 +73,8 @@ module ActiveRecord
           end
           obj_
         end
-        
-        
+
+
         def _parse_object(contained_)  # :nodoc:
           _get_byte(contained_ ? 0x69 : 0x7c)
           type_code_ = _get_integer
@@ -100,27 +100,27 @@ module ActiveRecord
             raise ::RGeo::Error::ParseError, "Unknown type value: #{type_code_}."
           end
         end
-        
-        
+
+
         def _parse_line_string  # :nodoc:
           count_ = _get_integer
           coords_ = _get_doubles(2 * count_)
           @factory.line_string((0...count_).map{ |i_| @factory.point(*coords_[2*i_,2]) })
         end
-        
-        
+
+
         def _start_scanner(data_)  # :nodoc:
           @_data = data_
           @_len = data_.length
           @_pos = 38
         end
-        
-        
+
+
         def _clean_scanner  # :nodoc:
           @_data = nil
         end
-        
-        
+
+
         def _get_byte(expect_=nil)  # :nodoc:
           if @_pos + 1 > @_len
             raise ::RGeo::Error::ParseError, "Not enough bytes left to fulfill 1 byte"
@@ -133,8 +133,8 @@ module ActiveRecord
           end
           val_
         end
-        
-        
+
+
         def _get_integer  # :nodoc:
           if @_pos + 4 > @_len
             raise ::RGeo::Error::ParseError, "Not enough bytes left to fulfill 1 integer"
@@ -143,8 +143,8 @@ module ActiveRecord
           @_pos += 4
           str_.unpack("#{@little_endian ? 'V' : 'N'}").first
         end
-        
-        
+
+
         def _get_doubles(count_)  # :nodoc:
           len_ = 8 * count_
           if @_pos + len_ > @_len
@@ -154,13 +154,13 @@ module ActiveRecord
           @_pos += len_
           str_.unpack("#{@little_endian ? 'E' : 'G'}*")
         end
-        
-        
+
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Railtie for SpatiaLite adapter
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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 RGeo
-  
+
   module ActiveRecord
-    
+
     module SpatialiteAdapter
-      
-      
+
+
       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/spatialite_adapter/spatial_column.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # SpatiaLite adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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,19 @@
 # :stopdoc:
 
 module ActiveRecord
-  
+
   module ConnectionAdapters
-    
+
     module SpatiaLiteAdapter
-      
-      
+
+
       class SpatialColumn < ConnectionAdapters::SQLiteColumn
-        
-        
+
+
+        FACTORY_SETTINGS_CACHE = {}
+
+
+
         def initialize(factory_settings_, table_name_, name_, default_, sql_type_=nil, null_=true)
           @factory_settings = factory_settings_
           @table_name = table_name_
@@ -55,31 +59,32 @@ module ActiveRecord
           if type == :spatial
             @limit = {:srid => @srid, :type => @geometric_type.type_name.underscore}
           end
+          FACTORY_SETTINGS_CACHE[factory_settings_.object_id] = factory_settings_
         end
-        
-        
+
+
         def set_srid(val_)
           @srid = val_
           if type == :spatial
             @limit[:srid] = @srid
           end
         end
-        
-        
+
+
         attr_reader :srid
         attr_reader :geometric_type
-        
-        
+
+
         def spatial?
           type == :spatial
         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, @srid)
@@ -87,27 +92,28 @@ module ActiveRecord
             super
           end
         end
-        
-        
+
+
         def type_cast_code(var_name_)
           if type == :spatial
             "::ActiveRecord::ConnectionAdapters::SpatiaLiteAdapter::SpatialColumn.convert_to_geometry("+
-              "#{var_name_}, self.class.rgeo_factory_settings, self.class.table_name, "+
+              "#{var_name_}, ::ActiveRecord::ConnectionAdapters::SpatiaLiteAdapter::SpatialColumn::"+
+              "FACTORY_SETTINGS_CACHE[#{@factory_settings.object_id}], #{@table_name.inspect}, "+
               "#{name.inspect}, #{@srid})"
           else
             super
           end
         end
-        
-        
+
+
         private
-        
-        
+
+
         def simplified_type(sql_type_)
           sql_type_ =~ /geometry|point|linestring|polygon/i ? :spatial : super
         end
-        
-        
+
+
         def self.convert_to_geometry(input_, factory_settings_, table_name_, column_name_, column_srid_)
           case input_
           when ::RGeo::Feature::Geometry
@@ -128,15 +134,15 @@ module ActiveRecord
             nil
           end
         end
-        
-        
+
+
       end
-      
-       
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc:

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

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # SpatiaLite adapter for ActiveRecord
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2010 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 SpatiaLiteAdapter
-      
-      
+
+
       class SpatialTableDefinition < ConnectionAdapters::TableDefinition
-        
+
         def column(name_, type_, options_={})
           if (info_ = @base.spatial_column_constructor(type_.to_sym))
             options_[:type] ||= info_[:type] || type_
@@ -60,43 +60,43 @@ module ActiveRecord
           end
           self
         end
-        
+
         def to_sql
           @columns.find_all{ |c_| !c_.respond_to?(:srid) }.map{ |c_| c_.to_sql } * ', '
         end
-        
+
         def spatial_columns
           @columns.find_all{ |c_| c_.respond_to?(:srid) }
         end
-        
+
       end
-      
-      
+
+
       module SpatialColumnDefinitionMethods  # :nodoc:
-        
+
         def spatial_type
           defined?(@spatial_type) && @spatial_type
         end
-        
+
         def srid
           defined?(@srid) ? @srid : 4326
         end
-        
+
         def set_spatial_type(value_)
           @spatial_type = value_.to_s
         end
-        
+
         def set_srid(value_)
           @srid = value_
         end
-        
+
       end
-      
-      
+
+
     end
-    
+
   end
-  
+
 end
 
 # :startdoc: