github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,711 Commits 34 Branches 105 Tags
00a9d4b91cccdd88146cbe716eca844dcdfa08e7
Commit Graph

3795 Commits

Author SHA1 Message Date
Yehuda Katz + Carl Lerche
00a9d4b91c Merge branch 'master' into wip_abstract_controller 
Conflicts:
	actionpack/lib/action_controller/abstract/callbacks.rb
	actionpack/lib/action_controller/abstract/renderer.rb
	actionpack/lib/action_controller/base/base.rb
	actionpack/lib/action_controller/dispatch/dispatcher.rb
	actionpack/lib/action_controller/routing/route_set.rb
	actionpack/lib/action_controller/testing/process.rb
	actionpack/test/abstract_controller/layouts_test.rb
	actionpack/test/controller/filters_test.rb
	actionpack/test/controller/helper_test.rb
	actionpack/test/controller/render_test.rb
	actionpack/test/new_base/test_helper.rb
 2009-05-11 17:07:05 -07:00
Yehuda Katz + Carl Lerche
0cac68d3be Revert "Whitespace!" 
This reverts commit a747ab5b20.
 2009-05-11 15:03:24 -07:00
Yehuda Katz + Carl Lerche
0f6e764e40 Fixed a bug with handling render options 2009-05-11 14:48:58 -07:00
Yehuda Katz + Carl Lerche
6694bd46f5 Aliased AbstractController::ActionNotFound to ActionController::UnknownAction 2009-05-11 12:45:26 -07:00
Yehuda Katz + Carl Lerche
94ee9d2452 Ported ConditionalGet to new Base 2009-05-11 12:04:43 -07:00
Yehuda Katz + Carl Lerche
c1d120a71e Don't run the action if callbacks are halted. 
In AbstractController, this means that response_body is not empty
 2009-05-11 11:48:38 -07:00
Yehuda Katz + Carl Lerche
a2f3684cec Ported fresh_when into a ConditionalGet module 2009-05-11 10:57:59 -07:00
Yehuda Katz
030dfe3f83 More community code review :) 2009-05-11 10:22:07 -07:00
Joshua Peek
a747ab5b20 Whitespace! 2009-05-07 10:45:29 -05:00
Joshua Peek
af40fa6d03 Prefer "included" language over "setup" 2009-05-07 10:38:57 -05:00
Joshua Peek
2854535b02 Make module dependency DSL opt in 2009-05-07 10:29:22 -05:00
Joshua Peek
d4402c5554 assert_redirect_to's partial hash matching was deprecated in 2-3 stable 7f1f16c01 2009-05-04 20:26:43 -05:00
Joshua Peek
bcc4537f2a Wrap dispatcher callbacks around the whole middleware chain. Kill unnecessary Reloader middleware. 2009-05-03 09:41:40 -05:00
Joshua Peek
e066019280 Show lazy middleware args in pretty print 2009-05-03 09:24:32 -05:00
Joshua Peek
11af089cee Extract ActionController rescue templates into Rescue and ShowExceptions middleware. 
This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
 2009-05-02 23:02:22 -05:00
Jeremy Kemper
9047c9809d Fix implicit ordering expectation 2009-05-02 16:41:50 -07:00
Jeremy Kemper
1c6fcbfd2d Fix implicit ordering expectation 2009-05-02 15:30:00 -07:00
Joshua Peek
24affdc88c Deprecate Controller.process interface 2009-05-02 15:37:29 -05:00
Joshua Peek
f32cf44870 Switch functional tests to run through the rack interface instead of process 2009-05-02 15:29:18 -05:00
Joshua Peek
a8b75c480f Functional test runner finalizes response just like the integration test runner. In both runners, the @response object will now behave the same. 
Some functional tests will need to be updated if they are relying on preprocessed data on the response.
 2009-05-02 14:57:40 -05:00
Joshua Peek
3900f4007e Deprecate assert_redirect_to's partial hash matching 2009-05-02 14:23:44 -05:00
Yehuda Katz
72160d9f89 Implement FooController.action(:name) 
* Rails actions are now Rack endpoints, and can be retrieved
    via FooController.action(name) and called with an env
  * Updated some tests that relied on the old internal
    #process/#call implementation
 2009-05-02 02:15:09 -07:00
Yehuda Katz + Carl Lerche
ad2a1b5cb1 Get render :inline working 2009-05-01 18:17:08 -07:00
Yehuda Katz + Carl Lerche
7dd072d333 A few more tweaks to get new Base running old render tests again 2009-05-01 17:53:20 -07:00
Yehuda Katz + Carl Lerche
e046f36824 Renamed Base2 to Base and don't require old action_controller for new Base 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
b1d34b3aa4 Starting to get new_base to run on old tests 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
918b119bd3 Add support for stripping "layouts/" from the layout name 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
b4903a8e34 Modify new_base to use String action_names for back-compat 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
69fd669165 Committing the last changes before we start trying to get the old tests to pass on the new base 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
4ee3e5b094 Ported over the concept of public instance methods on controller child classes as callable action methods 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
d58b57a3ca Move ContentType inline for now. 
Trying to avoid premature proliferation of modules.
 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
b98e496c03 Support implicit and explicit content types 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
49834e088b Support implicit render and blank render 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
0c3d9bc4c2 Ported over render :template tests 2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
4f68311685 Finished implementing render :text in Base2 2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
1b45991603 Renamed the new_base tests 2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
b692fceb6a Renamed ActionController::AbstractBase to ActionController::Http 2009-05-01 17:31:01 -07:00
Yehuda Katz + Carl Lerche
8a4e77b420 OMG, a lot of work 2009-05-01 17:31:01 -07:00
Ruy Asan
3be3470fab Added routing test for irregular ID requirements and custom member action. 
[#2595 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-05-01 15:02:32 -07:00
Pratik Naik
853c229bbd Rename vendor/rack to vendor/rack-1.1.pre 2009-05-01 20:24:14 +01:00
Pratik Naik
432e631d5c Vendor Rack edge ( commit : 815342a8e15db564b766f209ffb1e340233f064f ) 2009-05-01 20:12:49 +01:00
Joshua Peek
664ae187a9 Update some old tests to use AC TestProcess 2009-04-30 23:46:35 -05:00
Joshua Peek
05bd863c02 alias method chain process with test 2009-04-30 23:46:35 -05:00
Joshua Peek
1fcc7dbcc8 Move TestRequest#query_parameters into AD TestRequest 2009-04-30 23:46:34 -05:00
Joshua Peek
0fa1e75d41 Set rack.input instead of RAW_POST_DATA in TestRequest 2009-04-30 20:04:55 -05:00
Joshua Peek
261ec996de Missed stray @request_uri 2009-04-30 19:36:18 -05:00
Joshua Peek
a6fff94baf Move TestRequest cookies accessor into AD TestRequest 2009-04-30 19:23:50 -05:00
Joshua Peek
d54604c352 Depend on unreleased rack 1.1 2009-04-30 19:10:05 -05:00
Jeremy Kemper
6ae839bf48 Merge branch 'master' of git@github.com:rails/rails 2009-04-30 16:45:39 -07:00
John F. Douthat
e59835bd09 Fix action-cached exception responses. 
Methods raising ActiveRecord::RecordNotFound were returning 404 on first request and 200 OK with blank body on subsequent requests.

[#2533 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2009-04-30 16:43:01 -07:00