diff options
Diffstat (limited to 'railties/environments')
-rw-r--r-- | railties/environments/environment.rb (renamed from railties/environments/shared.rb) | 39 | ||||
-rw-r--r-- | railties/environments/shared_for_gem.rb | 66 |
2 files changed, 16 insertions, 89 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/environment.rb index fa729bbe60..0f047c3323 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/environment.rb @@ -11,35 +11,28 @@ ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"]) # Followed by the standard includes. ADDITIONAL_LOAD_PATHS.concat %w( - app - app/models - app/controllers - app/helpers - app/apis - config - components - lib - vendor - vendor/railties - vendor/railties/lib - vendor/activesupport/lib - vendor/activerecord/lib - vendor/actionpack/lib - vendor/actionmailer/lib - vendor/actionwebservice/lib -).map { |dir| "#{RAILS_ROOT}/#{dir}" } + app app/models app/controllers app/helpers app/apis config components lib vendor +).map { |dir| "#{RAILS_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) } # Prepend to $LOAD_PATH ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } - # Require Rails libraries. -require 'active_support' -require 'active_record' -require 'action_controller' -require 'action_mailer' -require 'action_web_service' +rails_files = %w( + actionpack/lib/action_controller + actionpack/lib/action_view + activesupport/lib/active_support + activerecord/lib/active_record + actionmailer/lib/action_mailer + actionwebservice/lib/action_web_service +).collect { |p| File.join(RAILS_ROOT, 'vendor', 'rails', "#{p}.rb") } +if rails_files.all? { |f| File.file?(f) } + rails_files.each { |f| require f } +else + require 'rubygems' + %w( activesupport activerecord actionpack actionmailer actionwebservice rails ).each { |gem| require_gem(gem) } +end # Environment-specific configuration. require_dependency "environments/#{RAILS_ENV}" diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb deleted file mode 100644 index beac2e31e0..0000000000 --- a/railties/environments/shared_for_gem.rb +++ /dev/null @@ -1,66 +0,0 @@ -RAILS_ROOT = File.dirname(__FILE__) + "/../" -RAILS_ENV = ENV['RAILS_ENV'] || 'development' - - -# Mocks first. -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}/components/[_a-z]*"]) - -# Followed by the standard includes. -ADDITIONAL_LOAD_PATHS.concat %w( - app - app/models - app/controllers - app/helpers - app/apis - config - components - lib - vendor -).map { |dir| "#{RAILS_ROOT}/#{dir}" } - -# Prepend to $LOAD_PATH -ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } - - -# Require Rails gems. -require 'rubygems' -require_gem 'activesupport' -require_gem 'activerecord' -require_gem 'actionpack' -require_gem 'actionmailer' -require_gem 'actionwebservice' -require_gem 'rails' - - -# Environment-specific configuration. -require_dependency "environments/#{RAILS_ENV}" -ActiveRecord::Base.configurations = File.open("#{RAILS_ROOT}/config/database.yml") { |f| YAML::load(f) } -ActiveRecord::Base.establish_connection - - -# Configure defaults if the included environment did not. -begin - RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log") -rescue StandardError - RAILS_DEFAULT_LOGGER = Logger.new(STDERR) - RAILS_DEFAULT_LOGGER.level = Logger::WARN - RAILS_DEFAULT_LOGGER.warn( - "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " + - "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed." - ) -end - -[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER } -[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" } -ActionController::Routing::Routes.reload - -Controllers = Dependencies::LoadingModule.root( - File.join(RAILS_ROOT, 'app', 'controllers'), - File.join(RAILS_ROOT, 'components') -) - -# Include your app's configuration here: |