activerecord-spatialite-adapter 0.2.3 → 0.3.0

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

@@ -0,0 +1,64 @@
+# -----------------------------------------------------------------------------
+# 
+# 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,
+#   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.
+# -----------------------------------------------------------------------------
+;
+
+
+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

@@ -0,0 +1,135 @@
+# -----------------------------------------------------------------------------
+# 
+# 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,
+#   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:
+
+module ActiveRecord
+  
+  module ConnectionAdapters
+    
+    module SpatiaLiteAdapter
+      
+      
+      class SpatialColumn < ConnectionAdapters::SQLiteColumn
+        
+        
+        def initialize(name_, default_, sql_type_=nil, null_=true)
+          super(name_, default_, sql_type_, null_)
+          @geometric_type = ::RGeo::ActiveRecord.geometric_type_from_name(sql_type_)
+          @srid = 0
+          if type == :spatial
+            @limit = {:srid => @srid, :type => @geometric_type.type_name.underscore}
+          end
+          @ar_class = ::ActiveRecord::Base
+        end
+        
+        
+        def set_ar_class(val_)
+          @ar_class = val_
+        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_)
+          type == :spatial ? SpatialColumn.convert_to_geometry(value_, @ar_class, name, @srid) : super
+        end
+        
+        
+        def type_cast_code(var_name_)
+          type == :spatial ? "::ActiveRecord::ConnectionAdapters::SpatiaLiteAdapter::SpatialColumn.convert_to_geometry(#{var_name_}, self.class, #{name.inspect}, #{@srid})" : super
+        end
+        
+        
+        private
+        
+        
+        def simplified_type(sql_type_)
+          sql_type_ =~ /geometry|point|linestring|polygon/i ? :spatial : super
+        end
+        
+        
+        def self.convert_to_geometry(input_, ar_class_, column_name_, column_srid_)
+          case input_
+          when ::RGeo::Feature::Geometry
+            factory_ = ar_class_.rgeo_factory_for_column(column_name_, :srid => column_srid_)
+            ::RGeo::Feature.cast(input_, factory_)
+          when ::String
+            if input_.length == 0
+              nil
+            else
+              factory_ = ar_class_.rgeo_factory_for_column(column_name_, :srid => column_srid_)
+              if input_[0,1] == "\x00"
+                NativeFormatParser.new(factory_).parse(input_) rescue nil
+              else
+                ::RGeo::WKRep::WKTParser.new(factory_, :support_ewkt => true).parse(input_)
+              end
+            end
+          else
+            nil
+          end
+        end
+        
+        
+      end
+      
+       
+    end
+    
+  end
+  
+end
+
+# :startdoc:

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

@@ -0,0 +1,102 @@
+# -----------------------------------------------------------------------------
+# 
+# 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,
+#   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:
+
+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_
+            type_ = :spatial
+          end
+          super(name_, type_, options_)
+          if type_ == :spatial
+            col_ = self[name_]
+            col_.extend(SpatialColumnDefinitionMethods) unless col_.respond_to?(:srid)
+            options_.merge!(col_.limit) if col_.limit.is_a?(::Hash)
+            col_.set_spatial_type(options_[:type])
+            col_.set_srid(options_[:srid].to_i)
+          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:

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

@@ -0,0 +1,63 @@
+# -----------------------------------------------------------------------------
+# 
+# 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,
+#   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.
+# -----------------------------------------------------------------------------
+;
+
+
+begin
+  require 'versionomy'
+rescue ::LoadError
+end
+
+
+module ActiveRecord
+  
+  module ConnectionAdapters
+    
+    module SpatiaLiteAdapter
+      
+      
+      # Current version of SpatiaLiteAdapter as a frozen string
+      VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../../Version').strip.freeze
+      
+      # Current version of SpatiaLiteAdapter 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/spatialite_adapter/railtie.rb

@@ -34,25 +34,6 @@
 ;
 
 
-require 'rails/railtie'
+puts "WARNING: rgeo/active_record/spatialite_adapter/railtie is deprecated. Please use active_record/connection_adapters/spatialite_adapter/railtie."
 
-
-module RGeo
-  
-  module ActiveRecord
-    
-    module SpatialiteAdapter
-      
-      class Railtie < ::Rails::Railtie
-        
-        rake_tasks do
-          load "rgeo/active_record/spatialite_adapter/databases.rake"
-        end
-        
-      end
-      
-    end
-    
-  end
-  
-end
+require 'active_record/connection_adapters/spatialite_adapter/railtie'

data/test/tc_basic.rb

@@ -76,6 +76,11 @@ module RGeo
             end
             
             
+            def test_version
+              assert_not_nil(::ActiveRecord::ConnectionAdapters::SpatiaLiteAdapter::VERSION)
+            end
+            
+            
             def test_meta_data_present
               result_ = DEFAULT_AR_CLASS.connection.select_value("SELECT COUNT(*) FROM spatial_ref_sys").to_i
               assert_not_equal(0, result_)
@@ -113,7 +118,7 @@ module RGeo
               klass_.connection.change_table(:spatial_test) do |t_|
                 t_.index([:latlon], :spatial => true)
               end
-              assert(klass_.connection.spatial_indexes(:spatial_test).last.spatial)
+              assert(klass_.connection.indexes(:spatial_test).last.spatial)
               assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='idx_spatial_test_latlon'").to_i)
               klass_.connection.drop_table(:spatial_test)
               assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='idx_spatial_test_latlon'").to_i)
@@ -206,29 +211,58 @@ module RGeo
             end
             
             
-            def test_query_point
-              klass_ = populate_ar_class(:latlon_point)
-              obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.where(:latlon => @factory.multi_point([@factory.point(1, 2)])).first
-              assert_equal(id_, obj2_.id)
-              obj3_ = klass_.where(:latlon => @factory.multi_point([@factory.point(2, 2)])).first
-              assert_nil(obj3_)
+            def test_create_simple_geometry_using_shortcut
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.geometry 'latlon'
+              end
+              assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+              assert_equal(::RGeo::Feature::Geometry, klass_.columns.last.geometric_type)
+              assert(klass_.cached_attributes.include?('latlon'))
+              klass_.connection.drop_table(:spatial_test)
+              assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end
             
             
-            def test_query_point_wkt
-              klass_ = populate_ar_class(:latlon_point)
-              obj_ = klass_.new
-              obj_.latlon = @factory.point(1, 2)
-              obj_.save!
-              id_ = obj_.id
-              obj2_ = klass_.where(:latlon => 'POINT(1 2)').first
-              assert_equal(id_, obj2_.id)
-              obj3_ = klass_.where(:latlon => 'POINT(2 2)').first
-              assert_nil(obj3_)
+            def test_create_point_geometry_using_shortcut
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.point 'latlon'
+              end
+              assert_equal(::RGeo::Feature::Point, klass_.columns.last.geometric_type)
+              assert(klass_.cached_attributes.include?('latlon'))
+            end
+            
+            
+            def test_create_geometry_with_options
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.column 'region', :polygon, :srid => 3785
+              end
+              assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+              col_ = klass_.columns.last
+              assert_equal(::RGeo::Feature::Polygon, col_.geometric_type)
+              assert_equal(3785, col_.srid)
+              assert_equal({:srid => 3785, :type => 'polygon'}, col_.limit)
+              assert(klass_.cached_attributes.include?('region'))
+              klass_.connection.drop_table(:spatial_test)
+              assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+            end
+            
+            
+            def test_create_geometry_using_limit
+              klass_ = create_ar_class
+              klass_.connection.create_table(:spatial_test) do |t_|
+                t_.spatial 'region', :limit => {:srid => 3785, :type => :polygon}
+              end
+              assert_equal(1, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
+              col_ = klass_.columns.last
+              assert_equal(::RGeo::Feature::Polygon, col_.geometric_type)
+              assert_equal(3785, col_.srid)
+              assert_equal({:srid => 3785, :type => 'polygon'}, col_.limit)
+              assert(klass_.cached_attributes.include?('region'))
+              klass_.connection.drop_table(:spatial_test)
+              assert_equal(0, klass_.connection.select_value("SELECT COUNT(*) FROM geometry_columns WHERE f_table_name='spatial_test'").to_i)
             end