rgeo-ar 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f4e76f082da2fd612d850b83cd7d30194755b9
-  data.tar.gz: d847ade0068d38b282b81775545d61431fffddcb
+  metadata.gz: 884d15ce933553a27a4b32bb75f6bb4d05de3528
+  data.tar.gz: 2a39a44670be789d1413d0bd5f7f14dc2e36a077
 SHA512:
-  metadata.gz: 4ec86f237ef08314c084f795d55366fa0be9c345451a82352dce1d1ba4edd414d0da3ef29551e4ef98f21da97e08e5e5c0ead220093018e97fe44f9cbca3046a
-  data.tar.gz: 989f88e983a96cbc1fb615df1f2035580ec09606bc4c79d5bef533a7e279dd89171047996951600aef23f0bdd00537ac3a39fc1cf1db7b0c4d325d683d2d3c67
+  metadata.gz: 78814b6eff0aef502a235350a14d911a8dd5bf134927e3824513f490ded0e74667cf6964a543fdb8723d060e439af7efcdf54a80854891bd055733350b0418f4
+  data.tar.gz: 7c0ad97aa229444d9050281dc93b1565b1f37da1993b3d75a9d26ba448162a11bc15a5de78555f52ab4ca4b899c96dc7e0ec9c5fe1c9402f8f25e7b37ebdfe7a

data/LICENSE.txt

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

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -1,53 +1,13 @@
-# -----------------------------------------------------------------------------
-#
-# Helper methods for ActiveRecord adapter tests
-#
-# -----------------------------------------------------------------------------
-# 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 'rgeo/active_record'
 require 'yaml'
 require 'logger'
 
-
 module RGeo
   module ActiveRecord
-
-
     # A helper module for creating unit tests for adapters.
-
     module AdapterTestHelper
-
       @class_num = 0
 
-
       # When this module is included in a test case class, it
       # automatically attempts to load the database config file from the
       # path specified by constants defined in the class. It first tries
@@ -87,7 +47,6 @@ module RGeo
         end
       end
 
-
       def self.new_class(param_)  # :nodoc:
         base_ = param_.kind_of?(::Class) ? param_ : ::ActiveRecord::Base
         config_ = param_.kind_of?(::Hash) ? param_ : nil
@@ -101,7 +60,6 @@ module RGeo
         klass_
       end
 
-
       # Default setup method that calls cleanup_tables.
       # It also defines a couple of useful factories: @factory (a
       # cartesian factory) and @geographic_factory (a spherical factory)
@@ -113,7 +71,6 @@ module RGeo
         cleanup_caches
       end
 
-
       # Default teardown method that calls cleanup_tables.
 
       def teardown
@@ -121,7 +78,6 @@ module RGeo
         cleanup_caches
       end
 
-
       # Utility method that attempts to clean up any table that was
       # created by a test method. Normally called automatically at setup
       # and teardown. If you override those methods, you'll need to call
@@ -162,7 +118,6 @@ module RGeo
         end
       end
 
-
       # Utility method that creates and returns a new ActiveRecord class
       # subclassing the DEFAULT_AR_CLASS.
 
@@ -170,9 +125,6 @@ module RGeo
         @ar_class = AdapterTestHelper.new_class(self.class.const_get(:DEFAULT_AR_CLASS))
       end
 
-
     end
-
-
   end
 end

data/lib/rgeo/active_record/ar_factory_settings.rb

@@ -1,45 +1,5 @@
-# -----------------------------------------------------------------------------
-#
-# Additions to ActiveRecord::Base for factory settings
-#
-# -----------------------------------------------------------------------------
-# 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 'active_record'
-
-
 module RGeo
-
   module ActiveRecord
-
-
     # The default factory generator for ActiveRecord::Base.
 
     DEFAULT_FACTORY_GENERATOR = ::Proc.new do |config_|
@@ -50,9 +10,7 @@ module RGeo
       end
     end
 
-
     # An object that manages the RGeo factories for a ConnectionPool.
-
     class RGeoFactorySettings
 
       def initialize  # :nodoc:
@@ -60,24 +18,18 @@ module RGeo
         @column_factories = {}
       end
 
-
       # Get the default factory generator for the given table
-
       def get_factory_generator(table_name_)
         @factory_generators[table_name_.to_s] || ::RGeo::ActiveRecord::DEFAULT_FACTORY_GENERATOR
       end
 
-
       # Set the default factory generator for the given table
-
       def set_factory_generator(table_name_, gen_)
         @factory_generators[table_name_.to_s] = gen_
       end
 
-
       # Get the factory or factory generator for the given table name
       # and column name.
-
       def get_column_factory(table_name_, column_name_, params_=nil)
         table_name_ = table_name_.to_s
         column_name_ = column_name_.to_s
@@ -89,17 +41,13 @@ module RGeo
         result_
       end
 
-
       # Set the factory or factory generator for the given table name
       # and column name.
-
       def set_column_factory(table_name_, column_name_, factory_)
         (@column_factories[table_name_.to_s] ||= {})[column_name_.to_s] = factory_
       end
 
-
       # Clear settings for the given table name, or for all tables
-
       def clear!(table_name_=nil)
         if table_name_
           table_name_ = table_name_.to_s
@@ -111,22 +59,14 @@ module RGeo
         end
       end
 
-
       DEFAULT = self.new
-
-
     end
 
-
     # Additional class methods on ::ActiveRecord::Base that provide
     # a way to control the RGeo factory used for ActiveRecord objects.
-
     module ActiveRecordBaseFactorySettings
-
-
       # Return the RGeoFactorySettings object associated with this
       # class's connection.
-
       def rgeo_factory_settings
         pool_ = begin
           connection_pool
@@ -136,7 +76,6 @@ module RGeo
         pool_ ? pool_.rgeo_factory_settings : RGeoFactorySettings::DEFAULT
       end
 
-
       # The value of this attribute is a RGeo::Feature::FactoryGenerator
       # that is used to generate the proper factory when loading geometry
       # objects from the database. For example, if the data being loaded
@@ -152,31 +91,24 @@ module RGeo
         rgeo_factory_settings.get_factory_generator(table_name)
       end
 
-
       # Set the rgeo_factory_generator attribute
-
       def rgeo_factory_generator=(gen_)
         rgeo_factory_settings.set_factory_generator(table_name, gen_)
       end
 
-
       # This is a convenient way to set the rgeo_factory_generator by
       # passing a block.
-
       def to_generate_rgeo_factory(&block_)
         rgeo_factory_settings.set_factory_generator(table_name, block_)
       end
 
-
       # Set a specific factory for this ActiveRecord class and the given
       # column name. This setting, if present, overrides the result of the
       # rgeo_factory_generator.
-
       def set_rgeo_factory_for_column(column_name_, factory_)
         rgeo_factory_settings.set_column_factory(table_name, column_name_, factory_)
       end
 
-
       # Returns the factory generator or specific factory to use for this
       # ActiveRecord class and the given column name.
       # If an explicit factory was set for the given column, returns it.
@@ -184,29 +116,23 @@ module RGeo
       # rgeo_factory_generator for this class, and returns the resulting
       # factory. Otherwise, if no params hash is given, just returns the
       # rgeo_factory_generator for this class.
-
       def rgeo_factory_for_column(column_name_, params_=nil)
         rgeo_factory_settings.get_column_factory(table_name, column_name_, params_)
       end
-
-
     end
 
     ::ActiveRecord::Base.extend(ActiveRecordBaseFactorySettings)
 
-
     # :stopdoc:
 
-
     # Patch for connection pool to track geo factories per table name
-
     ::ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
-
       def rgeo_factory_settings
         @_rgeo_factory_settings ||= RGeoFactorySettings.new
       end
 
       private
+
       alias_method :new_connection_without_rgeo_modification, :new_connection
       def new_connection
         result_ = new_connection_without_rgeo_modification
@@ -215,13 +141,9 @@ module RGeo
         end
         result_
       end
-
     end
 
-
     # :startdoc:
 
-
   end
-
 end

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -1,37 +1,3 @@
-# -----------------------------------------------------------------------------
-#
-# Various Arel hacks to support spatial queries
-#
-# -----------------------------------------------------------------------------
-# 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 common Arel visitor hacks for spatial ToSql visitors.
@@ -122,12 +88,6 @@ module RGeo
       alias :visit_RGeo_Cartesian_BoundingBox :visit_String
     end
 
-    # Add tools to build spatial structures in the AST.
-
-    # Allow chaining of spatial expressions from attributes
-    ::Arel::Attribute.class_eval do
-      include ::RGeo::ActiveRecord::SpatialExpressions
-    end
 
     # A NamedFunction subclass that keeps track of the spatial-ness of
     # the arguments and return values, so that it can provide context to

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -1,54 +1,10 @@
-# -----------------------------------------------------------------------------
-#
-# Common tools for spatial adapters for 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.
-# -----------------------------------------------------------------------------
-
-
-require 'active_support/core_ext/class' # Workaround for a missing require in ActiveRecord 3.2.1
-require 'active_record'
-
-# Force AbstractAdapter to autoload
-if ::ActiveRecord::ConnectionAdapters::AbstractAdapter
-end
-
+# autoload AbstractAdapter
+::ActiveRecord::ConnectionAdapters::AbstractAdapter
 
 module RGeo
-
   module ActiveRecord
-
-
     # Some default column constructors specifications for most spatial
     # databases. Individual adapters may add to or override this list.
-
     DEFAULT_SPATIAL_COLUMN_CONSTRUCTORS = {
       :spatial => {:type => 'geometry'}.freeze,
       :geometry => {}.freeze,
@@ -61,13 +17,11 @@ module RGeo
       :multi_polygon => {}.freeze,
     }.freeze
 
-
     # Index definition struct with a spatial flag field.
 
     class SpatialIndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders, :where, :spatial)
     end
 
-
     # Returns a feature type module given a string type.
 
     def self.geometric_type_from_name(name_)
@@ -84,17 +38,18 @@ module RGeo
       end
     end
 
-
     # :stopdoc:
 
-
     # Provide methods for each geometric subtype during table definitions.
+    module GeoTableDefinitions
+      def self.included(base)
+        base.class_eval do
+          alias_method :method_missing_without_rgeo, :method_missing
+          alias_method :method_missing, :method_missing_with_rgeo
+        end
+      end
 
-    ::ActiveRecord::ConnectionAdapters::TableDefinition.class_eval do
-
-      alias_method :method_missing_without_rgeo_modification, :method_missing
-
-      def method_missing(method_name_, *args_, &block_)
+      def method_missing_with_rgeo(method_name_, *args_, &block_)
         if @base.respond_to?(:spatial_column_constructor) && (info_ = @base.spatial_column_constructor(method_name_))
           info_ = info_.dup
           type_ = (info_.delete(:type) || method_name_).to_s
@@ -103,20 +58,24 @@ module RGeo
             column(name_, type_, opts_)
           end
         else
-          method_missing_without_rgeo_modification(method_name_, *args_, &block_)
+          method_missing_without_rgeo(method_name_, *args_, &block_)
         end
       end
-
     end
 
+    ::ActiveRecord::ConnectionAdapters::TableDefinition.send :include, GeoTableDefinitions
 
-    # Provide methods for each geometric subtype during table changes.
-
-    ::ActiveRecord::ConnectionAdapters::Table.class_eval do
 
-      alias_method :method_missing_without_rgeo_modification, :method_missing
+    # Provide methods for each geometric subtype during table changes.
+    module GeoConnectionAdapters
+      def self.included(base)
+        base.class_eval do
+          alias_method :method_missing_without_rgeo, :method_missing
+          alias_method :method_missing, :method_missing_with_rgeo
+        end
+      end
 
-      def method_missing(method_name_, *args_, &block_)
+      def method_missing_with_rgeo(method_name_, *args_, &block_)
         if @base.respond_to?(:spatial_column_constructor) && (info_ = @base.spatial_column_constructor(method_name_))
           info_ = info_.dup
           type_ = (info_.delete(:type) || method_name_).to_s
@@ -125,22 +84,26 @@ module RGeo
             @base.add_column(@table_name, name_, type_, opts_)
           end
         else
-          method_missing_without_rgeo_modification(method_name_, *args_, &block_)
+          method_missing_without_rgeo(method_name_, *args_, &block_)
         end
       end
-
     end
 
+    ::ActiveRecord::ConnectionAdapters::Table.send :include, GeoConnectionAdapters
 
-    # Hack schema dumper to output spatial index flag
 
-    ::ActiveRecord::SchemaDumper.class_eval do
+    # Hack schema dumper to output spatial index flag
+    module GeoSchemaDumper
+      def self.included(base)
+        base.class_eval do
+          alias_method :indexes_without_rgeo, :indexes
+          alias_method :indexes, :indexes_with_rgeo
+        end
+      end
 
       private
 
-      alias_method :_old_indexes_method, :indexes
-
-      def indexes(table_, stream_)
+      def indexes_with_rgeo(table_, stream_)
         if (indexes_ = @connection.indexes(table_)).any?
           add_index_statements_ = indexes_.map do |index_|
             statement_parts_ = [
@@ -158,19 +121,15 @@ module RGeo
           stream_.puts
         end
       end
-
     end
 
+    ::ActiveRecord::SchemaDumper.send :include, GeoSchemaDumper
 
-    # Tell ActiveRecord to cache spatial attribute values so they don't get
-    # re-parsed on every access.
 
-    ::ActiveRecord::Base.attribute_types_cached_by_default << :spatial
+    # Tell ActiveRecord to cache spatial attribute values so they don't get re-parsed on every access.
 
+    ::ActiveRecord::Base.attribute_types_cached_by_default << :spatial
 
     # :startdoc:
-
-
   end
-
 end

data/lib/rgeo/active_record/geometry_mixin.rb

@@ -1,55 +1,15 @@
-# -----------------------------------------------------------------------------
-#
-# Geometry mixin for JSON serialization
-#
-# -----------------------------------------------------------------------------
-# 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
-
-
     # This module is mixed into all geometry objects. It provides an
     # as_json method so that ActiveRecord knows how to generate JSON
     # for a geometry-valued field.
 
     module GeometryMixin
-
-
       # The default JSON generator Proc. Renders geometry fields as WKT.
       DEFAULT_JSON_GENERATOR = ::Proc.new{ |geom_| geom_.to_s }
 
       @json_generator = DEFAULT_JSON_GENERATOR
 
-
       # Set the style of JSON generation used for geometry fields in an
       # ActiveRecord model by default. You may pass nil to use
       # DEFAULT_JSON_GENERATOR, a proc that takes a geometry as the
@@ -76,7 +36,6 @@ module RGeo
         end
       end
 
-
       # Given a feature, returns an object that can be serialized as JSON
       # (i.e. usually a hash or string), using the current json_generator.
       # This is used to generate JSON for geometry-valued ActiveRecord
@@ -92,15 +51,9 @@ module RGeo
       def as_json(opts_=nil)
         GeometryMixin.generate_json(self)
       end
-
-
     end
-
-
   end
-
 end
 
-
 ::RGeo::Feature::MixinCollection::GLOBAL.for_type(::RGeo::Feature::Geometry).
   add(::RGeo::ActiveRecord::GeometryMixin)

data/lib/rgeo/active_record/spatial_expressions.rb

@@ -1,42 +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.
@@ -45,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
       #++
@@ -64,7 +23,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new(function_, [self] + args_, spatial_info_)
       end
 
-
       #--
       # Geometry functions
       #++
@@ -255,7 +213,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new('ST_PointOnSurface', [self], [true, true])
       end
 
-
       #--
       # Polygon functions
       #++
@@ -274,7 +231,6 @@ module RGeo
         ::RGeo::ActiveRecord::SpatialNamedFunction.new('ST_InteriorRingN', [self, n_.to_i], [true, true, false])
       end
 
-
       #--
       # GeometryCollection functions
       #++
@@ -287,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,39 +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.
-# -----------------------------------------------------------------------------
-
 module RGeo
   module ActiveRecord
-    VERSION = '0.6.1'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

data/lib/rgeo/active_record.rb

@@ -1,42 +1,3 @@
-# -----------------------------------------------------------------------------
-#
-# ActiveRecord extensions for RGeo
-#
-# -----------------------------------------------------------------------------
-# 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.
-# -----------------------------------------------------------------------------
-
-# Dependencies
-require 'rgeo'
-require 'active_record'
-
-
 # RGeo is a spatial data library for Ruby, provided by the "rgeo" gem.
 #
 # The optional RGeo::ActiveRecord module provides spatial extensions for
@@ -44,8 +5,6 @@ require 'active_record'
 # spatial connection adapters.
 
 module RGeo
-
-
   # This module contains a set of ActiveRecord extensions for RGeo.
   # Generally, you will not need to interact with the contents of this
   # module directly, unless you are writing a spatial ActiveRecord
@@ -53,29 +12,13 @@ module RGeo
 
   module ActiveRecord
   end
-
-
 end
 
-
-# The rgeo-activerecord gem installs several patches to Arel to provide
-# support for spatial queries.
-
-module Arel
-end
-
-
-# The rgeo-activerecord gem installs several patches to ActiveRecord
-# to support services needed by spatial adapters.
-
-module ActiveRecord
-end
-
-
-# Implementation files
-require 'rgeo/active_record/version.rb'
-require 'rgeo/active_record/spatial_expressions.rb'
+require 'rgeo'
+require 'active_record'
+require 'rgeo/active_record/version'
+require 'rgeo/active_record/spatial_expressions'
 require 'rgeo/active_record/arel_spatial_queries'
-require 'rgeo/active_record/common_adapter_elements.rb'
+require 'rgeo/active_record/common_adapter_elements'
 require 'rgeo/active_record/ar_factory_settings'
 require 'rgeo/active_record/geometry_mixin'

data/test/tc_basic.rb

@@ -1,55 +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 < ::MiniTest::Test  # :nodoc:
-
-
         class MyTable < ::ActiveRecord::Base
         end
 
-
         def test_has_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)
@@ -59,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)
@@ -70,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))
@@ -82,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
@@ -90,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-ar
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -91,6 +91,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - History.rdoc
+- LICENSE.txt
 - README.rdoc
 - lib/rgeo-activerecord.rb
 - lib/rgeo/active_record.rb
@@ -100,7 +101,6 @@ 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
@@ -129,5 +129,7 @@ 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/lib/rgeo/active_record/task_hacker.rb

@@ -1,104 +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