Jeremy Kemper
57a2780f14
etag! and last_modified! conditional GET helpers
2008-07-17 23:18:10 -07:00
Jeremy Kemper
1e0f94a77c
Introduce simple internationalization support
2008-07-17 14:56:12 -07:00
Jeremy Kemper
8f9702db5c
Merge branch 'master' of git@github.com:rails/rails
2008-07-17 14:43:08 -07:00
Joshua Peek
7359597004
Wrap AssetTagHelper's computed public path cache in a threadsafe store
2008-07-17 16:03:48 -05:00
Jeremy Kemper
636e6b7138
Merge branch 'master' into i18n-merge
...
Conflicts:
actionpack/lib/action_view/helpers/form_options_helper.rb
activerecord/lib/active_record/validations.rb
2008-07-17 11:52:56 -07:00
Pratik Naik
99930d499e
Fix symbol cookie test
2008-07-17 18:19:09 +01:00
Joshua Peek
cd63015570
All 2xx requests are considered successful [ #217 state:resolved]
2008-07-16 19:49:46 -05:00
Ripta Pasay
f7fdbae770
Use fully-qualified controller name when logging. [ #600 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-07-17 01:33:44 +01:00
David Heinemeier Hansson
73ade4fe10
Resolved conflict
2008-07-16 17:45:28 -05:00
David Heinemeier Hansson
8fe01de2e8
Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [DHH]
2008-07-16 17:39:14 -05:00
Sven Fuchs
842917dea0
moving country helpers from form_options_helper to form_country_helper again
2008-07-16 11:30:57 -07:00
Sven Fuchs
428b77debd
fixing another timezone dependent test
2008-07-16 11:07:08 -07:00
Pratik Naik
90c930f45c
Allow Dispatcher exceptions to be handled in application.rb using rescue_from
2008-07-16 18:54:08 +01:00
Stefan Kaes
c64d749abd
Fixed template recompile logic [ #630 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-07-16 08:26:23 -05:00
Pratik Naik
0432d15164
Merge with docrails.
2008-07-16 13:01:23 +01:00
Pratik Naik
2a7aca8ec3
Improve rack/cgi tests
2008-07-16 05:07:34 +01:00
Pratik Naik
1d002f6bcb
Make RackRequest#request_method respect _method
2008-07-16 05:02:29 +01:00
Joshua Peek
83e29b9773
Removed config.action_view.cache_template_loading, use config.cache_classes instead
2008-07-15 22:58:42 -05:00
Pratik Naik
5cc3ea6969
RackResponse should not contain Status header
2008-07-16 04:17:28 +01:00
Pratik Naik
3343eb428c
Tests for rack response content type
2008-07-16 04:09:41 +01:00
Pratik Naik
89eec91e67
Add tests for CgiRequest#content_type
2008-07-16 03:31:45 +01:00
Pratik Naik
0f8206104e
RackRequest#content_type should return Mime::Type
2008-07-16 03:18:35 +01:00
Joshua Peek
8b306bf24c
Improved test coverage for fragment cache helper
2008-07-15 20:54:17 -05:00
Jeremy Kemper
ecc0543525
JavaScriptGenerator should only sets output_buffer for the duration of the update block
2008-07-15 18:42:22 -07:00
Sven Fuchs
931f366ffc
merge forward to current rails/master
2008-07-16 03:41:11 +02:00
Sven Fuchs
8691e25540
reverting changes to form_options_helper for merge
2008-07-16 03:28:44 +02:00
Joshua Peek
aca246ab25
Get buffer for fragment cache from template's @output_buffer
2008-07-15 14:43:52 -05:00
Michael Koziarski
24a8ae4e08
Try to get more useful errors out of the test_line_offset failures
2008-07-15 20:39:36 +02:00
Jeremy Kemper
3c282f3a0a
Ruby 1.9 compat: only eval with block.binding in 1.9, uses more memory than eval with block
2008-07-15 10:42:50 -07:00
Jeremy Kemper
4d76bad387
Ruby 1.9 compat: account for different String#hash
2008-07-15 10:40:33 -07:00
松田 明
bb33432b0f
Ruby 1.9 compat: call Proc#binding explicitly. [ #623 state:resolved]
2008-07-15 10:39:02 -07:00
Joshua Peek
001c8beb4d
memorize typo
2008-07-14 20:02:59 -05:00
Joshua Peek
dd41f66af5
Include Memoizable in ActionView::Template
2008-07-14 19:51:43 -05:00
Tarmo Tänav
d27dd860c7
Use sub instead of gsub
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-07-14 18:02:59 -05:00
Joshua Peek
9dc258d614
Eager load Partial variable_name and counter_name. Tidy up render_partial_collection.
2008-07-14 17:40:58 -05:00
Jeremy Kemper
2d6562d51b
Move dead recompile_template? also
2008-07-14 13:51:59 -07:00
Jeremy Kemper
3fbefecc9c
Remove dead code from merge
2008-07-14 13:47:51 -07:00
Jeremy Kemper
4e323f6ef0
Fix bad merge
2008-07-14 11:50:07 -07:00
Jeremy Kemper
425de8db6a
Use instance_method(...) to check whether the method exists
2008-07-14 10:46:15 -07:00
Jeremy Kemper
2167f95d85
Restore the more readable before_ and after_filters methods since they aren't called frequently
2008-07-14 10:11:53 -07:00
rsl
95812d5eaf
Ensure :index works with fields_for select methods. [ #518 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-07-14 00:55:57 +01:00
Joshua Peek
68fe898189
Check first render format and extension. Fixes failing ActionMailer test.
2008-07-13 14:05:21 -05:00
Joshua Peek
26bc867151
Small tweak to e0fef66
2008-07-13 14:00:40 -05:00
Joshua Peek
e0fef66149
Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [ #609 state:resolved]
2008-07-13 13:26:48 -05:00
Joshua Peek
99cc85bc09
Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached
2008-07-12 15:31:50 -05:00
Joshua Peek
73b34e9f75
Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class.
2008-07-12 14:33:46 -05:00
Joshua Peek
30204c4e66
Set global ActionController::Base.view_paths for test cases
2008-07-12 14:11:51 -05:00
Joshua Peek
65fb2e76f2
Removed a few implementation specific view path tests
2008-07-12 12:17:10 -05:00
Joshua Peek
b603de0882
Improve test coverage and create fixtures for RenderPartialWithRecordIdentificationTests
2008-07-12 12:17:10 -05:00
Michael Koziarski
e53f5fe696
Restore support for partial matches in assert_redirected_to
...
If both the actual redirection and the asserted redirection are hashes, succeed if the asserted redirection is a strict subset of the actual redirection.
2008-07-12 11:42:41 +02:00
