rgeo-activerecord 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 050dae83a358df1f39ade771d9a422d8fe9e15d7
+  data.tar.gz: 86c8fabb76788f275114d08cfd9568cf423a0fd5
+SHA512:
+  metadata.gz: aa37b062ba3f81ec42cbd761807d3345ba5c022c665495b96600025dfd146b8400b9d585344705e7b46e95298fc2f492acb784e23482288db777f288db8eb988
+  data.tar.gz: 13b9d228dad1a0aaa3c707dc6d04cd0cb9ba99f78b71f3265a2d9fa2fd30aa6f18c1a69594997b2065571c90622af0242dce3b2cb3e514c402459640f3b51347

data/Version

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -62,13 +62,13 @@ module RGeo
       # mapping for the database, and it also uses the type information
       # in the node to determine when to cast string arguments to WKT,
 
-      def visit_RGeo_ActiveRecord_SpatialNamedFunction(node_)
+      def visit_RGeo_ActiveRecord_SpatialNamedFunction(node_, *args)
         name_ = st_func(node_.name)
         exprs_ = []
         node_.expressions.each_with_index do |expr_, index_|
-          exprs_ << (node_.spatial_argument?(index_) ? visit_in_spatial_context(expr_) : visit(expr_))
+          exprs_ << (node_.spatial_argument?(index_) ? visit_in_spatial_context(expr_, *args) : visit(expr_, *args))
         end
-        "#{name_}(#{node_.distinct ? 'DISTINCT ' : ''}#{exprs_.join(', ')})#{node_.alias ? " AS #{visit node_.alias}" : ''}"
+        "#{name_}(#{node_.distinct ? 'DISTINCT ' : ''}#{exprs_.join(', ')})#{node_.alias ? " AS #{visit(node_.alias, *args)}" : ''}"
       end
 
 
@@ -76,16 +76,16 @@ module RGeo
       # The node must be a string (in which case it is treated as WKT),
       # an RGeo feature, or a spatial attribute.
 
-      def visit_in_spatial_context(node_)
+      def visit_in_spatial_context(node_, *args)
         case node_
         when ::String
-          "#{st_func('ST_WKTToSQL')}(#{visit_String(node_)})"
+          "#{st_func('ST_WKTToSQL')}(#{visit_String(node_, *args)})"
         when ::RGeo::Feature::Instance
-          visit_RGeo_Feature_Instance(node_)
+          visit_RGeo_Feature_Instance(node_, *args)
         when ::RGeo::Cartesian::BoundingBox
-          visit_RGeo_Cartesian_BoundingBox(node_)
+          visit_RGeo_Cartesian_BoundingBox(node_, *args)
         else
-          visit(node_)
+          visit(node_, *args)
         end
       end
 
@@ -136,11 +136,11 @@ module RGeo
     # by default.
 
     ::Arel::Visitors::Visitor.class_eval do
-      def visit_RGeo_ActiveRecord_SpatialConstantNode(node_)
+      def visit_RGeo_ActiveRecord_SpatialConstantNode(node_, *args)
         if respond_to?(:visit_in_spatial_context)
-          visit_in_spatial_context(node_.delegate)
+          visit_in_spatial_context(node_.delegate, *args)
         else
-          visit(node_.delegate)
+          visit(node_.delegate, *args)
         end
       end
     end

data/test/support/fake_record.rb

@@ -0,0 +1,124 @@
+# From https://github.com/rails/arel/blob/4-0-stable/test/support/fake_record.rb
+module FakeRecord
+  class Column < Struct.new(:name, :type)
+  end
+
+  class Connection
+    attr_reader :tables
+    attr_accessor :visitor
+
+    def initialize(visitor = nil)
+      @tables = %w{ users photos developers products}
+      @columns = {
+        'users' => [
+          Column.new('id', :integer),
+          Column.new('name', :string),
+          Column.new('bool', :boolean),
+          Column.new('created_at', :date)
+        ],
+        'products' => [
+          Column.new('id', :integer),
+          Column.new('price', :decimal)
+        ]
+      }
+      @columns_hash = {
+        'users' => Hash[@columns['users'].map { |x| [x.name, x] }],
+        'products' => Hash[@columns['products'].map { |x| [x.name, x] }]
+      }
+      @primary_keys = {
+        'users' => 'id',
+        'products' => 'id'
+      }
+      @visitor = visitor
+    end
+
+    def columns_hash table_name
+      @columns_hash[table_name]
+    end
+
+    def primary_key name
+      @primary_keys[name.to_s]
+    end
+
+    def table_exists? name
+      @tables.include? name.to_s
+    end
+
+    def columns name, message = nil
+      @columns[name.to_s]
+    end
+
+    def quote_table_name name
+      "\"#{name.to_s}\""
+    end
+
+    def quote_column_name name
+      "\"#{name.to_s}\""
+    end
+
+    def schema_cache
+      self
+    end
+
+    def quote thing, column = nil
+      if column && column.type == :integer
+        return 'NULL' if thing.nil?
+        return thing.to_i
+      end
+
+      case thing
+      when true
+        "'t'"
+      when false
+        "'f'"
+      when nil
+        'NULL'
+      when Numeric
+        thing
+      else
+        "'#{thing}'"
+      end
+    end
+  end
+
+  class ConnectionPool
+    class Spec < Struct.new(:config)
+    end
+
+    attr_reader :spec, :connection
+
+    def initialize
+      @spec = Spec.new(:adapter => 'america')
+      @connection = Connection.new
+      @connection.visitor = Arel::Visitors::ToSql.new(connection)
+    end
+
+    def with_connection
+      yield connection
+    end
+
+    def table_exists? name
+      connection.tables.include? name.to_s
+    end
+
+    def columns_hash
+      connection.columns_hash
+    end
+
+    def schema_cache
+      connection
+    end
+  end
+
+  class Base
+    attr_accessor :connection_pool
+
+    def initialize
+      @connection_pool = ConnectionPool.new
+    end
+
+    def connection
+      connection_pool.connection
+    end
+  end
+end

data/test/tc_basic.rb

@@ -34,9 +34,7 @@
 ;
 
 
-require 'test/unit'
-require 'rgeo/active_record'
-
+require 'test_helper'
 
 module RGeo
   module ActiveRecord
@@ -102,9 +100,21 @@ module RGeo
           assert_equal({'type' => 'Point', 'coordinates' => [1.0, 2.0]}, p_.as_json)
         end
 
+        def test_arel_visit_SpatialConstantNode
+          visitor = arel_visitor
+          sql = visitor.accept(Arel.spatial('POINT (1.0 2.0)'))
+          assert_equal("ST_WKTToSQL('POINT (1.0 2.0)')", sql)
+        end
 
+        # SpatialNamedFunction is not used in pre-2.1 Arel.
+        if(AREL_VERSION_MAJOR > 2 || (AREL_VERSION_MAJOR == 2 && AREL_VERSION_MINOR >= 1))
+          def test_arel_visit_SpatialNamedFunction
+            visitor = arel_visitor
+            sql = visitor.accept(Arel.spatial('POINT (1.0 2.0)').st_astext)
+            assert_equal("ST_AsText(ST_WKTToSQL('POINT (1.0 2.0)'))", sql)
+          end
+        end
       end
-
     end
   end
 end

data/test/test_helper.rb

@@ -0,0 +1,21 @@
+require 'test/unit'
+require 'rgeo/active_record'
+require 'support/fake_record'
+
+AREL_VERSION_MAJOR, AREL_VERSION_MINOR, AREL_VERSION_PATCH = ::Arel::VERSION.split('.').map { |part| part.to_i }
+Arel::Visitors::PostgreSQL.send(:include, ::RGeo::ActiveRecord::SpatialToSql)
+Arel::Table.engine = Arel::Sql::Engine.new(FakeRecord::Base.new)
+
+def arel_visitor
+  # The argument for constructing visitor objects depends on the version of
+  # Arel.
+  if(AREL_VERSION_MAJOR <= 2)
+    if(AREL_VERSION_MAJOR == 2 && AREL_VERSION_MINOR == 0)
+      Arel::Visitors::PostgreSQL.new(Arel::Table.engine)
+    else
+      Arel::Visitors::PostgreSQL.new(Arel::Table.engine.connection_pool)
+    end
+  else
+    Arel::Visitors::PostgreSQL.new(Arel::Table.engine.connection)
+  end
+end

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RGeo is a geospatial data library for Ruby. RGeo::ActiveRecord is an
@@ -101,6 +90,11 @@ extra_rdoc_files:
 - History.rdoc
 - README.rdoc
 files:
+- History.rdoc
+- README.rdoc
+- Version
+- lib/rgeo-activerecord.rb
+- lib/rgeo/active_record.rb
 - lib/rgeo/active_record/adapter_test_helper.rb
 - lib/rgeo/active_record/ar_factory_settings.rb
 - lib/rgeo/active_record/arel_spatial_queries.rb
@@ -109,35 +103,32 @@ files:
 - lib/rgeo/active_record/spatial_expressions.rb
 - lib/rgeo/active_record/task_hacker.rb
 - lib/rgeo/active_record/version.rb
-- lib/rgeo/active_record.rb
-- lib/rgeo-activerecord.rb
+- test/support/fake_record.rb
 - test/tc_basic.rb
-- History.rdoc
-- README.rdoc
-- Version
+- test/test_helper.rb
 homepage: http://dazuma.github.com/rgeo-activerecord
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An RGeo module providing spatial extensions to ActiveRecord.
 test_files:
 - test/tc_basic.rb
+has_rdoc: