Skip to content

Commit

Permalink
Rails.initialized? can be called at any time without raising an excep…
Browse files Browse the repository at this point in the history
…tion [Closes #2507]

Changes:

* `Rails.initialized=` has been removed
* `Rails.initialized?` and `Rails.application.initialized?` are now
* delegating to `MyApp::Application.initialized?`
  • Loading branch information
franckverrot committed Mar 27, 2012
1 parent 33164c8 commit 4882271
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
6 changes: 1 addition & 5 deletions railties/lib/rails.rb
Expand Up @@ -42,11 +42,7 @@ def initialize!
end

def initialized?
@@initialized || false
end

def initialized=(initialized)
@@initialized ||= initialized
application.initialized?
end

def logger
Expand Down
4 changes: 4 additions & 0 deletions railties/lib/rails/application.rb
Expand Up @@ -134,6 +134,10 @@ def initialize!(group=:default) #:nodoc:
self
end

def initialized?
@initialized
end

# Load the application and its railties tasks and invoke the registered hooks.
# Check <tt>Rails::Railtie.rake_tasks</tt> for more info.
def load_tasks(app=self)
Expand Down
10 changes: 10 additions & 0 deletions railties/test/application/loading_test.rb
Expand Up @@ -285,6 +285,16 @@ def show
assert_equal 'OK', last_response.body
end

def test_initialize_can_be_called_at_any_time
require "#{app_path}/config/application"

assert !Rails.initialized?
assert !AppTemplate::Application.initialized?
Rails.initialize!
assert Rails.initialized?
assert AppTemplate::Application.initialized?
end

protected

def setup_ar!
Expand Down

0 comments on commit 4882271

Please sign in to comment.