From f0dd77c6be6a86fe384bb0015151e0a497973d39 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Thu, 24 Sep 2009 14:01:31 -0700 Subject: Move railties/lib/* into railties/lib/* --- railties/lib/rails/console_app.rb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 railties/lib/rails/console_app.rb (limited to 'railties/lib/rails/console_app.rb') diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb new file mode 100644 index 0000000000..75e6f11ea3 --- /dev/null +++ b/railties/lib/rails/console_app.rb @@ -0,0 +1,31 @@ +require 'active_support/all' +require 'active_support/test_case' +require 'action_controller' + +# work around the at_exit hook in test/unit, which kills IRB +Test::Unit.run = true if Test::Unit.respond_to?(:run=) + +# reference the global "app" instance, created on demand. To recreate the +# instance, pass a non-false value as the parameter. +def app(create=false) + @app_integration_instance = nil if create + @app_integration_instance ||= new_session do |sess| + sess.host! "www.example.com" + end +end + +# create a new session. If a block is given, the new session will be yielded +# to the block before being returned. +def new_session + session = ActionController::Integration::Session.new + yield session if block_given? + session +end + +#reloads the environment +def reload! + puts "Reloading..." + ActionController::Dispatcher.new + ActionController::Dispatcher.router.reload + true +end -- cgit v1.2.3 From 1f7270057596592946a877cd029d95760ba3e5ee Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 26 Sep 2009 13:41:32 -0500 Subject: Move default middleware stack into initializer --- railties/lib/rails/console_app.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/console_app.rb') diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb index 75e6f11ea3..5ce3d0d13b 100644 --- a/railties/lib/rails/console_app.rb +++ b/railties/lib/rails/console_app.rb @@ -25,7 +25,7 @@ end #reloads the environment def reload! puts "Reloading..." - ActionController::Dispatcher.new + ActionDispatch::Callbacks.new(lambda {}, true) ActionController::Dispatcher.router.reload true end -- cgit v1.2.3 From acfeec515111d427b3a27aef3af034922e0d9248 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 26 Sep 2009 20:51:05 -0500 Subject: Allow integration test rack app to be set with "@app" ivar instead of using open_session --- railties/lib/rails/console_app.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails/console_app.rb') diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb index 5ce3d0d13b..fc84a50e91 100644 --- a/railties/lib/rails/console_app.rb +++ b/railties/lib/rails/console_app.rb @@ -17,7 +17,8 @@ end # create a new session. If a block is given, the new session will be yielded # to the block before being returned. def new_session - session = ActionController::Integration::Session.new + app = ActionController::Dispatcher.new + session = ActionController::Integration::Session.new(app) yield session if block_given? session end -- cgit v1.2.3 From a6757a02e12aa584bd74dbcde18a7886be8e9029 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 26 Sep 2009 21:59:28 -0500 Subject: Move middleware and route configuration from AC::Dispatcher to Rails application object --- railties/lib/rails/console_app.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/console_app.rb') diff --git a/railties/lib/rails/console_app.rb b/railties/lib/rails/console_app.rb index fc84a50e91..1ad62e5058 100644 --- a/railties/lib/rails/console_app.rb +++ b/railties/lib/rails/console_app.rb @@ -27,6 +27,6 @@ end def reload! puts "Reloading..." ActionDispatch::Callbacks.new(lambda {}, true) - ActionController::Dispatcher.router.reload + ActionController::Routing::Routes.reload true end -- cgit v1.2.3