Permalink
Browse files

Include bundled env in toplevel require, if present

  • Loading branch information...
jeremy committed Oct 15, 2009
1 parent df55781 commit 9c52f96acb1dad178ebde2205a8dda2dac3b3450
Showing with 10 additions and 11 deletions.
  1. +10 −8 activerecord/lib/active_record.rb
  2. +0 −3 activerecord/test/cases/helper.rb
@@ -21,17 +21,19 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift(activesupport_path) if File.directory?(activesupport_path)
-require 'active_support'
+bundled = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
+if File.exist?("#{bundled}.rb")
+ require bundled
+else
+ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+ $:.unshift(activesupport_path) if File.directory?(activesupport_path)
-begin
- require 'active_model'
-rescue LoadError
- $:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib"
- require 'active_model'
+ activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib"
+ $:.unshift(activemodel_path) if File.directory?(activemodel_path)
end
+require 'active_support'
+require 'active_model'
require 'arel'
module ActiveRecord
@@ -1,9 +1,6 @@
$:.unshift(File.dirname(__FILE__) + '/../../lib')
$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
-bundler = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
-require bundler if File.exist?("#{bundler}.rb")
-
require 'config'
require 'rubygems'

0 comments on commit 9c52f96

Please sign in to comment.