github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-07 20:54:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,923 Commits 34 Branches 105 Tags
2c62baf4bf221aa8aa67f4625fe7011d40c44e82
Commit Graph

1607 Commits

Author SHA1 Message Date
Pratik Naik
6ef35461dc Merge docrails 2008-09-03 17:58:47 +01:00
Clemens Kofler
288e947ae1 Some performance goodness for inheritable attributes. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-09-03 00:55:23 +02:00
Clemens Kofler
948ed34600 Some performance goodness for routing. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-09-03 00:55:23 +02:00
Jonathan del Strother
6cfb70023a Don't set Content-Length on 304 responses 
Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it.

[#958 state:resolved]

Signed-off-by: Jonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-09-02 22:57:40 +02:00
Jeremy Kemper
a1eb4e11c2 Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9. 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	actionpack/test/controller/layout_test.rb
 2008-08-31 13:20:15 -07:00
Pratik Naik
e9a8e0053b Add layout functionality to mailers. 
Mailer layouts behaves just like controller layouts, except layout names need to
have '_mailer' postfix for them to be automatically picked up.
 2008-08-31 19:17:42 +01:00
Luke Melia
7ce03db778 Fixes optimised named routes generating question mark followed by nothing when provided an empty hash as the last argument. 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#481 state:committed]
 2008-08-31 19:42:01 +02:00
Joshua Peek
086c3520c4 Moved layout exemption logic into the view 2008-08-31 11:34:46 -05:00
Joshua Peek
8eec694598 Prefix ActionView::Base private methods with an underscore 2008-08-31 10:50:43 -05:00
Pratik Naik
56c2b02f59 Fix AM tests and add tests for rendering logging 2008-08-31 16:29:21 +01:00
Pratik Naik
cdda7defa0 Add lost log messages about template rendering 2008-08-31 15:41:02 +01:00
Pratik Naik
a13d335461 Move layout rendering logic to ActionView::Base 2008-08-31 15:23:45 +01:00
Pratik Naik
a59a3db1f3 Move copying ivar logic from ActionController::Base to ActionView::Base 2008-08-31 03:48:09 +01:00
Pratik Naik
cb25c4e584 Remove unused use_full_path argument 2008-08-31 00:18:10 +01:00
Pratik Naik
e12abb6e8a Dont pass controller partial layout option to view 2008-08-30 20:18:54 +01:00
Pratik Naik
afea4c9b0e Remove double layout check 2008-08-30 19:35:29 +01:00
Pratik Naik
83c6ba1889 Add support for shallow nesting of routes. [#838 state:resolved] 
Adds :shallow option to resource route definition. If true, paths for nested
resources which reference a specific member (ie. those with an :id parameter)
will not use the parent path prefix or name prefix.

Example :

map.resources :users, :shallow => true do |user|
  user.resources :posts
end

* GET /users/1/posts (maps to PostsController#index action as usual)
  named route "user_posts" is added as usual.

* GET /posts/2 (maps to PostsController#show action as if it were not nested)
  Additionally, named route "post" is added too.
 2008-08-30 15:20:20 +01:00
miloops
11eb29f60a Make assert_select_rjs code more readable, make use of unused constants and use more simple Regexps. 
[#540 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-29 17:52:26 -07:00
Tim Haines
d0b949d873 Improve assert_select_rjs failure messages for show, hide, toggle, and remove 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#931 state:committed]
 2008-08-29 20:51:47 +02:00
Pratik Naik
6577942b61 Deprecate render_component. 
Please install render_component plugin from http://github.com/rails/render_component/tree/master
if your application uses this functionality.
 2008-08-29 13:43:30 +01:00
Brennan Dunn
9cc8c0a0a1 Routes may be restricted to lists of HTTP methods instead of a single method or :any. 
[#407 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 12:29:49 -07:00
Brennan Dunn
7bdd5b768e Accept an array of method symbols for collection/member actions of resources 
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 12:23:39 -07:00
Michael S. Klishin
e42a235dd1 Request#remote_ip handles the uncommon case that REMOTE_ADDR is a comma-separated list. 
[#523 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:03:11 -07:00
Tim Haines
82778351a8 Add TestUploadFile.content_type= to match Request.UploadedFile 
[#920 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 18:50:29 -07:00
Joshua Peek
6ec07e0737 Store application and other context specific helper modules in ActionView::Base#helpers 2008-08-26 16:17:58 -05:00
Joshua Peek
9853134b4f Require missing libraries and check for defined ActionController constant so ActionView can be used standalone 2008-08-26 15:13:28 -05:00
Joshua Peek
0096f55869 Removed template_public? because it will always be true since the default template is never a partial 2008-08-21 21:34:03 -05:00
Ryan Bates
1129a24caf Cleanup around partial rendering 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-08-21 21:03:33 -05:00
Jeremy Kemper
b99442933d deprecate Base#assign_default_content_type_and_charset 2008-08-21 18:14:32 -07:00
Jeremy Kemper
f8f077945f Move default content type and charset from Base to Response. Handle charset = nil. 2008-08-21 18:11:09 -07:00
Tarmo Tänav
98fb161dbb Allow polymorphic_url helper to take url options. [#880 state:resolved] 
All *_polymorphic_url, *_polymorphic_path helpers can now accept
an options hash which will be passed on to the named route
making it possible to generate polymorphic routes with additional
url parameters.

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-08-21 20:26:00 +01:00
Joshua Peek
6be8251ec8 Simplified and renamed CallbackChain union method to replace_or_append! 2008-08-21 00:51:06 -05:00
Joshua Peek
47cd8b81cc Switched integration test runner to use Rack processor instead of CGI 2008-08-20 13:37:18 -05:00
Joshua Peek
3a2ff17af6 Don't shadow query string method 2008-08-19 20:24:34 -05:00
Ryan Bates
a8ece12fe2 Return nil instead of a space when passing an empty collection or nil to 'render :partial' [#791 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-08-19 19:09:04 -05:00
Joshua Peek
71c4ff07ab Delegate xhr helper method to integration session 2008-08-19 18:53:46 -05:00
Jamis Buck
6e4ea66dc0 Make AbstractRequest.if_modified_sense return nil if the header could not be parsed 2008-08-19 16:07:17 -06:00
Joshua Peek
977317da55 hack around CGI session close 2008-08-19 16:29:02 -05:00
Joshua Peek
c1a8690d58 Consistently use the framework's configured logger and avoid reverting to RAILS_DEFAULT_LOGGER unless necessary. 2008-08-18 23:36:13 -05:00
Joshua Peek
f245658495 Use Response status accessor instead of the Status header 2008-08-17 19:13:49 -05:00
Joshua Peek
b8e930aa01 Merge RackProcess#normalize_headers logic into AbstractResponse#prepare! 2008-08-17 19:09:38 -05:00
Jeremy Kemper
8aad8cb390 Set cache control to require revalidation if cache freshness response headers are set. Don't set Content-Length header if 304 status. 2008-08-14 21:45:14 -07:00
Jeremy Kemper
c7e09a8fb2 TestRequest#recycle! uses unmemoize_all to reset cached request method, accepts, etc. 2008-08-13 17:26:27 -07:00
Josh Susser
2561be005b Refactor Filter predicate methods to use inheritance. [#815 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-08-13 21:48:37 +01:00
Jeremy Kemper
45b79d933c Merge branch 'conditional-get' 2008-08-12 17:03:17 -07:00
Jeremy Kemper
ba2d61dd81 Update tests for request memoization 2008-08-08 02:31:12 -07:00
Jeremy Kemper
c24a7cdd23 Don't shadow host method 2008-08-08 02:29:37 -07:00
James Rosen
14cf9a8991 dryed up resources; fixed small formatting issue in resources rdoc 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
 2008-08-08 10:47:26 +02:00
Jeremy Kemper
b7529ed1cc Simplifying usage of ETags and Last-Modified and conditional GET requests 2008-08-07 23:43:12 -07:00
Jeremy Kemper
e43d1c226d Inherit these from AbstractRequest instead 2008-08-07 23:34:36 -07:00