rgeo-activerecord 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050dae83a358df1f39ade771d9a422d8fe9e15d7
-  data.tar.gz: 86c8fabb76788f275114d08cfd9568cf423a0fd5
+  metadata.gz: 3891bad7ab5e1f7408095e87bcf8a731a7130ba7
+  data.tar.gz: 4d466201e93d07234853ea049823968898761407
 SHA512:
-  metadata.gz: aa37b062ba3f81ec42cbd761807d3345ba5c022c665495b96600025dfd146b8400b9d585344705e7b46e95298fc2f492acb784e23482288db777f288db8eb988
-  data.tar.gz: 13b9d228dad1a0aaa3c707dc6d04cd0cb9ba99f78b71f3265a2d9fa2fd30aa6f18c1a69594997b2065571c90622af0242dce3b2cb3e514c402459640f3b51347
+  metadata.gz: f493f620c706f0adc498ec9f729c9d0a019fdd316f4e41e2e4fa4faef7df2a93a32143329ad01d34ad850dda6ec55a5830a6792c6f908fbe79025691540c6d32
+  data.tar.gz: 38b04b4a6938fea2e95128409bc9e3346a213ce9289e267e023a7da19c9e6afe3ced84ef59020a4f501081dd9969ba28dff60e8913435b0927fdbe41155f4eef

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-activerecord.rb

@@ -31,6 +31,5 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
 
 require 'rgeo/active_record'

data/lib/rgeo/active_record.rb

@@ -1,44 +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
@@ -46,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
@@ -55,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/lib/rgeo/active_record/adapter_test_helper.rb

@@ -1,55 +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
@@ -89,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
@@ -103,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)
@@ -115,7 +71,6 @@ module RGeo
         cleanup_caches
       end
 
-
       # Default teardown method that calls cleanup_tables.
 
       def teardown
@@ -123,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
@@ -150,12 +104,10 @@ module RGeo
 
         # Clear out any ActiveRecord caches that are present.
         # Different Rails versions use different types of caches.
-        has_schema_cache_ = false
         klass_.connection_pool.with_connection do |c_|
           if c_.respond_to?(:schema_cache)
             # 3.2.x and 4.0.x
             c_.schema_cache.clear!
-            has_schema_cache_ = true
           end
           if c_.respond_to?(:clear_cache!)
             # 3.1 and above
@@ -164,13 +116,8 @@ module RGeo
           # All 3.x and 4.0
           c_.clear_query_cache
         end
-        if !has_schema_cache_ && klass_.connection_pool.respond_to?(:clear_cache!)
-          # 3.1.x only
-          klass_.connection_pool.clear_cache!
-        end
       end
 
-
       # Utility method that creates and returns a new ActiveRecord class
       # subclassing the DEFAULT_AR_CLASS.
 
@@ -178,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,47 +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_|
@@ -52,9 +10,7 @@ module RGeo
       end
     end
 
-
     # An object that manages the RGeo factories for a ConnectionPool.
-
     class RGeoFactorySettings
 
       def initialize  # :nodoc:
@@ -62,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
@@ -91,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
@@ -113,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
@@ -138,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
@@ -154,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.
@@ -186,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
@@ -217,13 +141,9 @@ module RGeo
         end
         result_
       end
-
     end
 
-
     # :startdoc:
 
-
   end
-
 end