rgeo-activerecord 0.6.0 → 1.0.0

data/lib/rgeo/active_record/spatial_expressions.rb

@@ -1,44 +1,5 @@
-# -----------------------------------------------------------------------------
-#
-# Spatial expressions for Arel
-#
-# -----------------------------------------------------------------------------
-# 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,
-#   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
-
-
     # Returns true if spatial expressions (i.e. the methods in the
     # SpatialExpressions module) are supported. Generally, this is true
     # if Arel is at version 2.1 or later.
@@ -47,16 +8,12 @@ module RGeo
       defined?(::Arel::Nodes::NamedFunction)
     end
 
-
     # A set of spatial expression builders.
     # These methods can be chained off other spatial expressions to form
     # complex expressions.
     #
     # These functions require Arel 2.1 or later.
-
     module SpatialExpressions
-
-
       #--
       # Generic functions
       #++
@@ -66,7 +23,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new(function_, [self] + args_, spatial_info_)
       end
 
-
       #--
       # Geometry functions
       #++
@@ -257,7 +213,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new('ST_PointOnSurface', [self], [true, true])
       end
 
-
       #--
       # Polygon functions
       #++
@@ -276,7 +231,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new('ST_InteriorRingN', [self, n_.to_i], [true, true, false])
       end
 
-
       #--
       # GeometryCollection functions
       #++
@@ -289,14 +243,16 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new('ST_GeometryN', [self, n_.to_i], [true, true, false])
       end
 
-
     end
 
-
   end
-
 end
 
+# Add tools to build spatial structures in the AST.
+
+# Allow chaining of spatial expressions from attributes
+::Arel::Attribute.send :include, ::RGeo::ActiveRecord::SpatialExpressions
+
 
 module Arel
 

data/lib/rgeo/active_record/version.rb

@@ -1,56 +1,5 @@
-# -----------------------------------------------------------------------------
-#
-# Version of rgeo-activerecord
-#
-# -----------------------------------------------------------------------------
-# 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,
-#   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 RGeo
-
   module ActiveRecord
-
-    # Current version of RGeo::ActiveRecord as a frozen string
-    VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../Version').strip.freeze
-
-    # Current version of RGeo::ActiveRecord as a Versionomy object, if the
-    # Versionomy gem is available; otherwise equal to VERSION_STRING.
-    VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
-
+    VERSION = '1.0.0'.freeze
   end
-
 end

data/test/tc_basic.rb

@@ -1,57 +1,16 @@
-# -----------------------------------------------------------------------------
-#
-# Tests for basic ActiveRecord extensions
-#
-# -----------------------------------------------------------------------------
-# 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,
-#   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 'test_helper'
 
 module RGeo
   module ActiveRecord
     module Tests  # :nodoc:
-
-      class TestBasic < ::Test::Unit::TestCase  # :nodoc:
-
-
+      class TestBasic < MINITEST_CLASS  # :nodoc:
         class MyTable < ::ActiveRecord::Base
         end
 
-
         def test_has_version
-          assert_not_nil(::RGeo::ActiveRecord::VERSION)
+          assert ::RGeo::ActiveRecord::VERSION
         end
 
-
         def test_default_factory_generator
           MyTable.rgeo_factory_generator = nil
           factory_ = MyTable.rgeo_factory_for_column(:hello).call(:has_z_coordinate => true, :srid => 4326)
@@ -61,7 +20,6 @@ module RGeo
           assert_equal(4326, factory_.srid)
         end
 
-
         def test_set_factory_generator
           MyTable.rgeo_factory_generator = ::RGeo::Geographic.method(:spherical_factory)
           factory_ = MyTable.rgeo_factory_for_column(:hello, :has_z_coordinate => true, :srid => 4326)
@@ -72,7 +30,6 @@ module RGeo
           assert_equal(4326, factory_.srid)
         end
 
-
         def test_specific_factory_for_column
           MyTable.rgeo_factory_generator = nil
           MyTable.set_rgeo_factory_for_column(:foo, ::RGeo::Geographic.simple_mercator_factory(:has_z_coordinate => true))
@@ -84,7 +41,6 @@ module RGeo
           assert_equal(4326, factory_.srid)
         end
 
-
         def test_default_as_json_wkt
           GeometryMixin.set_json_generator(nil)
           factory_ = ::RGeo::Cartesian.preferred_factory
@@ -92,7 +48,6 @@ module RGeo
           assert_equal("POINT (1.0 2.0)", p_.as_json)
         end
 
-
         def test_default_as_json_geojson
           GeometryMixin.set_json_generator(:geojson)
           factory_ = ::RGeo::Cartesian.preferred_factory
@@ -105,15 +60,6 @@ module RGeo
           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

data/test/test_helper.rb

@@ -1,21 +1,16 @@
-require 'test/unit'
+require 'minitest/autorun'
 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 }
+MINITEST_CLASS = if defined?(::Minitest::Test)
+                   ::Minitest::Test
+                 else
+                   ::Minitest::Unit::TestCase
+                 end
+
 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
+  Arel::Visitors::PostgreSQL.new(Arel::Table.engine.connection)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -14,58 +14,58 @@ dependencies:
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: arel
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +91,8 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - History.rdoc
+- LICENSE.txt
 - README.rdoc
-- Version
 - lib/rgeo-activerecord.rb
 - lib/rgeo/active_record.rb
 - lib/rgeo/active_record/adapter_test_helper.rb
@@ -101,12 +101,11 @@ files:
 - lib/rgeo/active_record/common_adapter_elements.rb
 - lib/rgeo/active_record/geometry_mixin.rb
 - lib/rgeo/active_record/spatial_expressions.rb
-- lib/rgeo/active_record/task_hacker.rb
 - lib/rgeo/active_record/version.rb
 - test/support/fake_record.rb
 - test/tc_basic.rb
 - test/test_helper.rb
-homepage: http://dazuma.github.com/rgeo-activerecord
+homepage: http://rgeo.github.com/rgeo-activerecord
 licenses: []
 metadata: {}
 post_install_message: 
@@ -117,18 +116,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: virtuoso
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An RGeo module providing spatial extensions to ActiveRecord.
 test_files:
+- test/support/fake_record.rb
 - test/tc_basic.rb
+- test/test_helper.rb
 has_rdoc: 

data/Version

@@ -1 +0,0 @@
-0.6.0

data/lib/rgeo/active_record/task_hacker.rb

@@ -1,105 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# A tool for hacking ActiveRecord's rake tasks
-#
-# -----------------------------------------------------------------------------
-# 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,
-#   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 ActiveRecord's Rake tasks.
-
-    module TaskHacker
-
-
-      class Action  # :nodoc:
-
-        def initialize(env_, pattern_, proc_)
-          @env = env_
-          @pattern = pattern_
-          @proc = proc_
-        end
-
-        def call(task_)
-          env_ = @env || ::Rails.env || 'development'
-          config_ = ::ActiveRecord::Base.configurations[env_]
-          if config_
-            if @pattern === config_['adapter']
-              task_.actions.delete_if{ |a_| a_ != self }
-              @proc.call(config_)
-            end
-          else
-            puts "WARNING: Could not find environment #{env_.inspect} in your database.yml"
-          end
-        end
-
-        def arity
-          1
-        end
-
-      end
-
-
-      class << self
-
-
-        # Modify a named ActiveRecord rake task.
-        # The task must be of the form that hinges on the database adapter
-        # name. You must provide the fully-qualified name of the rake task
-        # to modify, the Rails environment for which to get the database
-        # configuration (which may be nil to use the current Rails.env),
-        # a Regexp or String identifying the adapter name for which to
-        # modify the rake task, and a block. If the database adapter
-        # associated with the given environment matches the given pattern,
-        # then the rake task's action(s) will be replaced by the given
-        # block. The block will be passed the environment's database
-        # configuration hash.
-
-        def modify(name_, env_, pattern_, &block_)
-          if ::Rake::Task.task_defined?(name_)
-            ::Rake::Task[name_].actions.unshift(Action.new(env_, pattern_, block_))
-          end
-        end
-
-
-      end
-
-
-    end
-
-
-  end
-
-end