rgeo-activerecord 0.4.2 → 0.4.3

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.4.3 / 2012-02-22
+
+* Some fixes for Rails 3.2 compatibility.
+
 === 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.)

data/README.rdoc

@@ -22,9 +22,9 @@ 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.3 or later.
+* rgeo 0.3.4 or later.
 * activerecord 3.0.3 or later. Earlier versions will not work.
-  Should be compatible with Rails 3.1.
+  Should be compatible with Rails versions through 3.2.x.
 * arel 2.0.6 or later. Earlier versions will not work.
 
 Generally, \ActiveRecord adapters which depend on this module should be
@@ -66,7 +66,7 @@ Contact the author at dazuma at gmail dot com.
 
 \RGeo is written by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development of \RGeo is sponsored by GeoPage, Inc. (http://www.geopage.com).
+Development is supported by Pirq. (http://www.pirq.com).
 
 === License
 

data/Version

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -95,7 +95,7 @@ module RGeo
         self.const_set("Klass#{@class_num}".to_sym, klass_)
         klass_.class_eval do
           establish_connection(config_) if config_
-          set_table_name(:spatial_test)
+          self.table_name = :spatial_test
         end
         klass_
       end
@@ -131,13 +131,24 @@ module RGeo
         end
         # Clear any RGeo factory settings.
         klass_.connection_pool.rgeo_factory_settings.clear!
-        # Rails 3.1 does more aggressive caching than 3.0 did; need to
-        # clear those because the next test might assume different data.
+        # Clear out any ActiveRecord caches that are present.
+        # Different 3.x versions use different types of caches.
         if klass_.connection_pool.respond_to?(:clear_cache!)
-          klass_.connection_pool.clear_cache!
-          klass_.connection.clear_query_cache
+          if klass_.connection.respond_to?(:schema_cache)
+            # 3.2.x
+            klass_.connection_pool.with_connection do |c_|
+              c_.schema_cache.clear!
+            end
+          else
+            # 3.1.x
+            klass_.connection_pool.clear_cache!
+          end
+        end
+        if klass_.connection.respond_to?(:clear_cache!)
+          # 3.1 and above
           klass_.connection.clear_cache!
         end
+        klass_.connection.clear_query_cache
       end
 
 

data/lib/rgeo/active_record/ar_factory_settings.rb

@@ -130,7 +130,11 @@ module RGeo
       # class's connection.
 
       def rgeo_factory_settings
-        pool_ = connection_pool
+        pool_ = begin
+          connection_pool
+        rescue ::ActiveRecord::ConnectionNotEstablished
+          nil
+        end
         pool_ ? pool_.rgeo_factory_settings : RGeoFactorySettings::DEFAULT
       end
 

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -34,6 +34,7 @@
 ;
 
 
+require 'active_support/core_ext/class' # Workaround for a missing require in ActiveRecord 3.2.1
 require 'active_record'
 
 ::ActiveRecord::ConnectionAdapters::AbstractAdapter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &2164456360 !ruby/object:Gem::Requirement
+  requirement: &2152768380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164456360
+  version_requirements: *2152768380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164455600 !ruby/object:Gem::Requirement
+  requirement: &2152694520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164455600
+  version_requirements: *2152694520
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2164455040 !ruby/object:Gem::Requirement
+  requirement: &2152673420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164455040
+  version_requirements: *2152673420
 description: RGeo is a geospatial data library for Ruby. RGeo::ActiveRecord is an
   optional RGeo module providing some spatial extensions to ActiveRecord, as well
   as common tools used by RGeo-based spatial adapters.
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing spatial extensions to ActiveRecord.