aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/master'Emilio Tagua2009-08-2746-274/+593
|\
| * When running multiple test tasks, don't abort early if one produces failuresJeffrey Hardy2009-08-271-6/+26
| | | | | | | | | | | | [#3107 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Reset session in integration tests after changing routes to reload the ↵Joshua Peek2009-08-2710-28/+42
| | | | | | | | middleware stack
| * Create an install task that successfully installs all Rails gemsYehuda Katz2009-08-271-2/+8
| |
| * Remove some old cruftYehuda Katz2009-08-271-3/+0
| |
| * Require necessary active_support files in cookie storeCarl Lerche2009-08-261-0/+2
| |
| * Fixed stupid mistake... nothing to see here.Carl Lerche2009-08-261-1/+1
| |
| * Add a default parameter for Resolver#initializeCarl Lerche2009-08-261-1/+1
| |
| * Set the request and response in ActionController::MiddlewareCarl Lerche2009-08-261-0/+4
| |
| * Have AbstractController::Logger#process_action return super's valueCarl Lerche2009-08-261-1/+3
| |
| * Don't use AR::Base.connection for fixture column quoting. Use the connection ↵Jeffrey Hardy2009-08-261-7/+9
| | | | | | | | | | | | | | | | given to Fixtures.new [#3104 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Eliminate warnings from Regexp multiline extension testsJeffrey Hardy2009-08-261-3/+3
| | | | | | | | | | | | [#3103 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Correct Regexp#un/optionalize assertions and fix uncovered failuresJeffrey Hardy2009-08-262-6/+8
| | | | | | | | | | | | [#3102 state:incomplete] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * UrlRewriter#rewrite_url should call #to_param on the value given in :anchor ↵Jeffrey Hardy2009-08-262-1/+27
| | | | | | | | | | | | | | | | option, just as #url_for does [#2746 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * I18n: use I18n for select helpers' prompt textAkira Matsuda2009-08-263-1/+33
| | | | | | | | | | | | [#2252 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Revert "I18n: use I18n for select helpers' prompt text"Jeremy Kemper2009-08-263-28/+1
| | | | | | | | | | | | | | | | Broke CI. [#2252 state:open] This reverts commit adedf72821a5623227ce91e6b298838e692477e4.
| * allow ActiveRecord#RecordInvalid exception message to be localizedSven Fuchs2009-08-263-1/+191
| | | | | | | | | | | | [#2754 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * I18n: use I18n for select helpers' prompt textAkira Matsuda2009-08-263-1/+28
| | | | | | | | | | | | [#2252 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Create new ActionController::Middleware class that will work as a normal ↵Yehuda Katz2009-08-269-110/+166
| | | | | | | | | | | | Rack middleware. * This initial implementation is a bit hackish, but it uses a normal middleware API so it's future-proof when we improve the internals.
| * Track all AC base subclasses as possible controllers for internal testingJoshua Peek2009-08-256-92/+50
| |
| * And the same thing for BasicYehuda Katz + Carl Lerche2009-08-251-1/+2
| |
| * HTTP Auth should not depend on RenderingControllerYehuda Katz + Carl Lerche2009-08-251-1/+2
| |
| * Redirector had an undeclared dependency on Logger.Yehuda Katz + Carl Lerche2009-08-251-0/+3
| |
| * Rework Middleware stack to match the Rack middleware protocol more closelyYehuda Katz + Carl Lerche2009-08-251-3/+3
| |
| * Modify Digest and Basic to take a request so they can be used outside of the ↵Yehuda Katz + Carl Lerche2009-08-251-7/+7
| | | | | | | | controller
| * Add a TODO so we remember to fix partial layoutsYehuda Katz + Carl Lerche2009-08-251-0/+3
| |
* | Remove useless var local definition.Emilio Tagua2009-08-261-1/+1
| |
* | No need to create a new relation if the argument is blank.Emilio Tagua2009-08-252-11/+11
| |
* | Merge commit 'rails/master'Emilio Tagua2009-08-259-90/+164
|\|
| * Fix typoJeremy Kemper2009-08-251-1/+1
| |
| * ActionController::Metal can be a middlewareYehuda Katz + Carl Lerche2009-08-254-13/+85
| |
| * timestamps gives a created_at field not created_on.Emilio Tagua2009-08-241-2/+2
| | | | | | | | | | | | [#3093 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Ruby 1.9: fix Time#beginning_of_day inaccuracy due to subtracting a FloatJeremy Kemper2009-08-221-1/+2
| |
| * Move legacy param_parsers config onto AD::ParamsParserJoshua Peek2009-08-213-73/+74
| |
* | Revert "Add bench script for ActiveRecord. Ignore log file and temporary cache"Emilio Tagua2009-08-212-231/+0
| | | | | | | | This reverts commit 0c6aed0a09e3a4f8cdf2b277f3144f715c0e30fb.
* | Merge commit 'rails/master'Emilio Tagua2009-08-214-0/+223
|\|
| * Added first/last/all aliases for equivalent find scopestaryn2009-08-212-0/+60
| | | | | | | | | | | | | | Just a copy from Active Record (with tests). Each is a warpper function for the equivalent scoped call to find eg first is a wrapper for find(:first) Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Benchmark script via miloops' arel fork via DataMapper's AR comparison scriptJeremy Kemper2009-08-202-0/+163
| |
* | Add bench script for ActiveRecord. Ignore log file and temporary cacheEmilio Tagua2009-08-202-0/+231
| | | | | | | | sql files.
* | Remove useless conditionals/local var.Emilio Tagua2009-08-191-5/+1
| |
* | Make sure join association methods are called once.Emilio Tagua2009-08-192-13/+14
| |
* | Don't sanitize_sql where it doesn't make sense.Emilio Tagua2009-08-191-2/+2
| |
* | Remove old method and comment.Emilio Tagua2009-08-191-14/+0
| |
* | Remove useless InnerJoinDependency, inner joins are performed throughEmilio Tagua2009-08-192-22/+5
| | | | | | | | Arel::InnerJoin.
* | Merge commit 'rails/master'Emilio Tagua2009-08-1914-109/+376
|\|
| * Added save! which raises ResourceInvalid unless valid?taryn2009-08-193-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to Active Record - it will raise ActiveResouce::ResourceInvalid if the resource is not valid (ie if <tt>valid?</tt> returns false) However - does not raise ActiveResource::ResourceNotFound if the callbacks fail (callbacks have not yet been implemented) - it will just try to save and raise if the callbacks all fail. This is not ideal behaviour - but will do until we decide to change the behaviour of save_with_validations to actually raise (rather than catch) the ResourceInvalid exception. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Swallow ResourceNotFound error on find_everytaryn2009-08-192-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record does not explode with RecordNotFound if you go looking for a collection of objects - it just returns nil. Thus Active Resource should also not explode. After all - finding no objects that match a set of conditions is not exceptional behaviour - unlike looking for a specific object with a given id (which you'd expect to exist). I've also added documentation to +find+ to reflect this. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Pulled find-based tests into their own test case. This matches Active ↵taryn2009-08-192-76/+182
| | | | | | | | | | | | Record, and allows us to have one places where all find-tests are located, which will help when adding dynamic finders later. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Moved all test cases into a new test/cases directory to match Active Record ↵taryn2009-08-199-0/+0
| | | | | | | | | | | | test directory structure. Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Added validations to ActiveResource. Added a smoke test to see if we can add ↵taryn2009-08-193-15/+123
| | | | | | | | | | | | a validation and use it, and add a validates callback and use it. Signed-off-by: Joshua Peek <josh@joshpeek.com>