rgeo-activerecord 0.4.5 → 0.4.6

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.4.6 / 2012-12-11
+
+* You can now provide both a default and an override database config file in the test helper.
+* The gemspec no longer includes the timestamp in the version, so that bundler can pull from github. (Reported by corneverbruggen)
+
 === 0.4.5 / 2012-04-13
 
 * Task hacker failed ungracefully when attempting to hack a nonexistent task. Fixed.

data/README.rdoc

@@ -22,7 +22,7 @@ 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.10 or later.
+* rgeo 0.3.20 or later.
 * activerecord 3.0.3 or later. Earlier versions will not work.
   Should be compatible with Rails versions through 3.2.x.
 * arel 2.0.6 or later. Earlier versions will not work.
@@ -50,7 +50,7 @@ stage.
 
 === Development and support
 
-Documentation is available at http://virtuoso.rubyforge.org/rgeo-activerecord/README_rdoc.html
+Documentation is available at http://dazuma.github.com/rgeo-activerecord/rdoc
 
 Source code is hosted on Github at http://github.com/dazuma/rgeo-activerecord
 
@@ -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 is supported by Pirq. (http://www.pirq.com).
+Development is supported by Pirq. (http://pirq.com).
 
 === License
 

data/Version

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -52,7 +52,9 @@ module RGeo
 
       # 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.
+      # path specified by constants defined in the class. It first tries
+      # OVERRIDE_DATABASE_CONFIG_PATH, and then falls back on
+      # DATABASE_CONFIG_PATH.
       # It then defines the DATABASE_CONFIG and DEFAULT_AR_CLASS constants
       # in the testcase class.
       #
@@ -62,7 +64,8 @@ module RGeo
       # present.
 
       def self.included(klass_)
-        database_config_ = ::YAML.load_file(klass_.const_get(:DATABASE_CONFIG_PATH)) rescue nil
+        database_config_ = ::YAML.load_file(klass_.const_get(:OVERRIDE_DATABASE_CONFIG_PATH)) rescue nil
+        database_config_ ||= ::YAML.load_file(klass_.const_get(:DATABASE_CONFIG_PATH)) rescue nil
         if database_config_
           database_config_.symbolize_keys!
           if klass_.respond_to?(:before_open_database)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ files:
 - History.rdoc
 - README.rdoc
 - Version
-homepage: http://virtuoso.rubyforge.org/rgeo-activerecord
+homepage: http://dazuma.github.com/rgeo-activerecord
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: virtuoso
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An RGeo module providing spatial extensions to ActiveRecord.