diff options
Diffstat (limited to 'railties/environments/shared_for_gem.rb')
| -rw-r--r-- | railties/environments/shared_for_gem.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb index dde6a01db7..0316522258 100644 --- a/railties/environments/shared_for_gem.rb +++ b/railties/environments/shared_for_gem.rb @@ -6,10 +6,11 @@ RAILS_ENV = ENV['RAILS_ENV'] || 'development' ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"] # Then model subdirectories. -ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[a-z]*"]) +ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"]) # Followed by the standard includes. ADDITIONAL_LOAD_PATHS.concat %w( + app app/models app/controllers app/helpers @@ -19,9 +20,7 @@ ADDITIONAL_LOAD_PATHS.concat %w( ).map { |dir| "#{RAILS_ROOT}/#{dir}" } # Prepend to $LOAD_PATH -ADDITIONAL_LOAD_PATHS.reverse.each do |dir| - $:.unshift(dir) if File.directory?(dir) -end +ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } # Require Rails gems. @@ -33,11 +32,10 @@ require_gem 'rails' # Environment-specific configuration. +ActionController::Base.require_or_load "environments/#{RAILS_ENV}" ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) ActiveRecord::Base.establish_connection -ActionController::Base.require_or_load 'abstract_application' -ActionController::Base.require_or_load "environments/#{RAILS_ENV}" # Configure defaults if the included environment did not. RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log") |