rgeo-activerecord 0.4.1 → 0.4.2

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.2 / 2012-01-09
+
+* Added an "rgeo-activerecord.rb" wrapper so bundler's auto-require will work without modification. (Reported by Mauricio Pasquier Juan.)
+* Fixed unit tests so they actually pass...
+
 === 0.4.1 / 2011-10-26
 
 * Fixed wrong variable name crash in rgeo_factory_for_column (patch by Andy Allan).

data/README.rdoc

@@ -22,10 +22,10 @@ spatial \ActiveRecord adapters based on \RGeo.
 RGeo::ActiveRecord has the following requirements:
 
 * Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
-* \RGeo 0.3.2 or later.
-* \ActiveRecord 3.0.3 or later. Earlier versions will not work.
+* rgeo 0.3.3 or later.
+* activerecord 3.0.3 or later. Earlier versions will not work.
   Should be compatible with Rails 3.1.
-* \Arel 2.0.6 or later. Earlier versions will not work.
+* arel 2.0.6 or later. Earlier versions will not work.
 
 Generally, \ActiveRecord adapters which depend on this module should be
 installed as gems, and they will install this module automatically as
@@ -70,7 +70,7 @@ Development of \RGeo is sponsored by GeoPage, Inc. (http://www.geopage.com).
 
 === License
 
-Copyright 2010-2011 Daniel Azuma
+Copyright 2010-2012 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/rgeo-activerecord.rb

@@ -0,0 +1,36 @@
+# -----------------------------------------------------------------------------
+#
+# 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.
+# -----------------------------------------------------------------------------
+;
+
+require 'rgeo/active_record'

data/lib/rgeo/active_record.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # ActiveRecord extensions for RGeo
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -40,23 +40,23 @@ 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
 # ActiveRecord, and a set of tools and helpers for writing RGeo-based
 # 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
   # connection adapter.
-  
+
   module ActiveRecord
   end
-  
-  
+
+
 end
 
 

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -1,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Helper methods for ActiveRecord adapter tests
-# 
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -41,26 +41,26 @@ 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 the class's DATABASE_CONFIG_FILE constant.
       # It then defines the DATABASE_CONFIG and DEFAULT_AR_CLASS constants
       # in the testcase class.
-      # 
+      #
       # When you define your test methods, you should wrap them in a call
       # to the class method define_test_methods. This will cause them to
       # be defined conditionally based on whether the database config is
       # present.
-      
+
       def self.included(klass_)
         database_config_ = ::YAML.load_file(klass_.const_get(:DATABASE_CONFIG_PATH)) rescue nil
         if database_config_
@@ -85,8 +85,8 @@ module RGeo
           end
         end
       end
-      
-      
+
+
       def self.new_class(param_)  # :nodoc:
         base_ = param_.kind_of?(::Class) ? param_ : ::ActiveRecord::Base
         config_ = param_.kind_of?(::Hash) ? param_ : nil
@@ -99,31 +99,31 @@ module RGeo
         end
         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)
-      
+
       def setup
         @factory = ::RGeo::Cartesian.preferred_factory(:srid => 3785)
         @geographic_factory = ::RGeo::Geographic.spherical_factory(:srid => 4326)
         cleanup_tables
       end
-      
-      
+
+
       # Default teardown method that calls cleanup_tables.
-      
+
       def teardown
         cleanup_tables
       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
       # this from your method.
-      
+
       def cleanup_tables
         klass_ = self.class.const_get(:DEFAULT_AR_CLASS)
         if klass_.connection.tables.include?('spatial_test')
@@ -139,18 +139,18 @@ module RGeo
           klass_.connection.clear_cache!
         end
       end
-      
-      
+
+
       # Utility method that creates and returns a new ActiveRecord class
       # subclassing the DEFAULT_AR_CLASS.
-      
+
       def create_ar_class(opts_={})
         @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,15 +1,15 @@
 # -----------------------------------------------------------------------------
-# 
-# Mysqlgeo adapter for ActiveRecord
-# 
+#
+# Additions to ActiveRecord::Base for factory settings
+#
 # -----------------------------------------------------------------------------
-# Copyright 2010 Daniel Azuma
-# 
+# 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,
@@ -18,7 +18,7 @@
 # * 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
@@ -38,12 +38,12 @@ require 'active_record'
 
 
 module RGeo
-  
+
   module ActiveRecord
-    
-    
+
+
     # The default factory generator for ActiveRecord::Base.
-    
+
     DEFAULT_FACTORY_GENERATOR = ::Proc.new do |config_|
       if config_.delete(:geographic)
         ::RGeo::Geographic.spherical_factory(config_)
@@ -51,35 +51,35 @@ module RGeo
         ::RGeo::Cartesian.preferred_factory(config_)
       end
     end
-    
-    
+
+
     # An object that manages the RGeo factories for a ConnectionPool.
-    
+
     class RGeoFactorySettings
-      
+
       def initialize  # :nodoc:
         @factory_generators = {}
         @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
@@ -90,18 +90,18 @@ module RGeo
         end
         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
@@ -112,25 +112,29 @@ module RGeo
           @column_factories.clear
         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
-        connection_pool.rgeo_factory_settings
+        pool_ = connection_pool
+        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
@@ -141,36 +145,36 @@ module RGeo
       # object. The result of this generator can be overridden by setting
       # an explicit factory for a given class and column using the
       # column_rgeo_factory method.
-      
+
       def rgeo_factory_generator
         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.
@@ -178,28 +182,28 @@ 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
@@ -209,13 +213,13 @@ module RGeo
         end
         result_
       end
-      
+
     end
-    
-    
+
+
     # :startdoc:
-    
-    
+
+
   end
-  
+
 end