rgeo-activerecord 0.2.1 → 0.2.2

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.2.2 / 2011-01-06
+
+* Some adjustments to the Arel integration for future Arel compatibility. (Thanks to Aaron Patterson.)
+* Support code for hacking ActiveRecord's rake tasks.
+
 === 0.2.1 / 2010-12-27
 
 * Support for RGeo features as nodes in the Arel AST.

data/Version

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rgeo/active_record/arel_modifications.rb

@@ -64,52 +64,34 @@ module Arel
   
   # :stopdoc:
   
+  
+  # Hack Attributes dispatcher to recognize geometry columns.
+  # This is deprecated but necessary to support legacy Arel versions.
   module Attributes
-    
-    # New attribute type for geometry-valued column
-    class Geometry < Attribute; end
-    
-    # Hack Attributes dispatcher to recognize geometry columns
     class << self
-      alias_method :for_without_geometry, :for
-      def for(column_)
-        column_.type == :geometry ? Geometry : for_without_geometry(column_)
+      if method_defined?(:for)
+        alias_method :for_without_geometry, :for
+        def for(column_)
+          column_.type == :geometry ? Attribute : for_without_geometry(column_)
+        end
       end
     end
-    
   end
   
   module Visitors
     
-    # Hack visit dispatcher to recognize RGeo features as nodes.
-    # We need a special dispatcher code because the default dispatcher
-    # triggers on class name. RGeo features tend to have opaque classes.
-    class Visitor
-      alias_method :visit_without_rgeo_types, :visit
-      def visit(object_)
-        if object_.kind_of?(::RGeo::Feature::Instance) && respond_to?(:visit_RGeo_Feature_Instance)
-          visit_RGeo_Feature_Instance(object_)
-        else
-          visit_without_rgeo_types(object_)
-        end
-      end
-    end
-    
     # Dot visitor handlers for geometry attributes and values.
     class Dot
-      alias :visit_Arel_Attributes_Geometry :visit_Arel_Attribute
       alias :visit_RGeo_Feature_Instance :visit_String
     end
     
     # DepthFirst visitor handlers for geometry attributes and values.
     class DepthFirst
-      alias :visit_Arel_Attributes_Geometry :visit_Arel_Attribute
       alias :visit_RGeo_Feature_Instance :terminal
     end
     
     # ToSql visitor handlers for geometry attributes and values.
     class ToSql
-      alias :visit_Arel_Attributes_Geometry :visit_Arel_Attributes_Attribute
       alias :visit_RGeo_Feature_Instance :visit_String
     end
     

data/lib/rgeo/active_record/common.rb

@@ -62,32 +62,55 @@ module RGeo
         standard_name_
       end
       
+      # Returns true if the given node is of spatial type-- that is, if
+      # it is a spatial literal or a reference to a spatial attribute.
+      def node_has_spatial_type?(node_)
+        case node_
+        when ::Arel::Attribute
+          @connection.instance_variable_set(:@_getting_columns, true)
+          begin
+            col_ = @engine.columns_hash[node_.name.to_s]
+            col_ && col_.respond_to?(:spatial?) && col_.spatial?
+          ensure
+            @connection.instance_variable_set(:@_getting_columns, false)
+          end
+        when ::RGeo::Feature::Instance
+          true
+        else
+          false
+        end
+      end
+      
+      # Generates SQL for a spatial node.
+      def visit_spatial(node_)
+        case node_
+        when ::String
+          "#{st_func('ST_WKTToSQL')}(#{visit_String(node_)})"
+        when ::RGeo::Feature::Instance
+          visit_RGeo_Feature_Instance(node_)
+        else
+          visit(node_)
+        end
+      end
+      
       def visit_Arel_Nodes_Equality(node_)  # :nodoc:
         right_ = node_.right
         left_ = node_.left
-        if left_.kind_of?(::Arel::Attributes::Geometry)
-          case right_
-          when ::RGeo::Feature::Instance
-            return "#{st_func('ST_Equals')}(#{visit(left_)}, #{visit(right_)})"
-          when ::String
-            return "#{st_func('ST_Equals')}(#{visit(left_)}, #{st_func('ST_WKTToSQL')}(#{visit(right_)}))"
-          end
+        if !@connection.instance_variable_get(:@_getting_columns) && (node_has_spatial_type?(right_) || node_has_spatial_type?(left_))
+          "#{st_func('ST_Equals')}(#{visit_spatial(left_)}, #{visit_spatial(right_)})"
+        else
+          super
         end
-        super
       end
       
       def visit_Arel_Nodes_NotEqual(node_)  # :nodoc:
         right_ = node_.right
         left_ = node_.left
-        if left_.kind_of?(::Arel::Attributes::Geometry)
-          case right_
-          when ::RGeo::Feature::Instance
-            return "NOT #{st_func('ST_Equals')}(#{visit(left_)}, #{visit(right_)})"
-          when ::String
-            return "NOT #{st_func('ST_Equals')}(#{visit(left_)}, #{st_func('ST_WKTToSQL')}(#{visit(right_)}))"
-          end
+        if !@connection.instance_variable_get(:@_getting_columns) && (node_has_spatial_type?(right_) || node_has_spatial_type?(left_))
+          "NOT #{st_func('ST_Equals')}(#{visit_spatial(left_)}, #{visit_spatial(right_)})"
+        else
+          super
         end
-        super
       end
       
     end

data/lib/rgeo/active_record/task_hacker.rb

@@ -0,0 +1,86 @@
+# -----------------------------------------------------------------------------
+# 
+# Common tools for spatial adapters 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.
+# -----------------------------------------------------------------------------
+;
+
+
+module RGeo
+  
+  module ActiveRecord
+    
+    
+    # A set of tools for hacking Rake tasks.
+    
+    module TaskHacker
+      
+      
+      class Action  # :nodoc:
+        
+        def initialize(env_, pattern_, proc_)
+          @env = env_
+          @pattern = pattern_
+          @proc = proc_
+        end
+        
+        def call(task_)
+          config_ = ::ActiveRecord::Base.configurations[@env || ::Rails.env || 'development']
+          if @pattern === config_['adapter']
+            task_.actions.delete_if{ |a_| a_ != self }
+            @proc.call(config_)
+          end
+        end
+        
+        def arity
+          1
+        end
+        
+      end
+      
+      
+      class << self
+        
+        
+        def modify(name_, env_, pattern_, &block_)
+          ::Rake::Task[name_].actions.unshift(Action.new(env_, pattern_, block_))
+        end
+        
+        
+      end
+      
+      
+    end
+    
+    
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - lib/rgeo/active_record/ar_modifications.rb
 - lib/rgeo/active_record/arel_modifications.rb
 - lib/rgeo/active_record/common.rb
+- lib/rgeo/active_record/task_hacker.rb
 - lib/rgeo/active_record.rb
 - History.rdoc
 - README.rdoc