Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'alloy/master-nested_attributes_and_autosave' | Michael Koziarski | 2009-09-13 | 1 | -0/+36 |
|\ | |||||
| * | Allow fields_for on a nested_attributes association to accept an explicit ↵ | Andrew France | 2009-09-12 | 1 | -0/+36 |
| | | | | | | | | | | | | collection to be used. [#2648 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
* | | Get ActionPack's test running on bundled gems. This should make running ↵ | Yehuda Katz | 2009-09-12 | 2 | -11/+3 |
| | | | | | | | | tests on new machines, as well as CI, work well. | ||||
* | | Add per-controller middleware | Yehuda Katz | 2009-09-12 | 1 | -0/+77 |
|/ | |||||
* | Fix filtering parameters when there are Fixnum or other un-dupable values. | Nathaniel Talbott | 2009-09-10 | 1 | -0/+1 |
| | | | | | | [#3184 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Use draw/connect mapper api instead of directly using add_named_route | Joshua Peek | 2009-09-06 | 1 | -12/+34 |
| | |||||
* | Need to reset session for AR session tests after altering the route set | Joshua Peek | 2009-09-06 | 1 | -0/+1 |
| | |||||
* | Add fake controllers for url rewriter tests | Joshua Peek | 2009-09-06 | 2 | -0/+6 |
| | |||||
* | Cleanup hacky routing with controller_path in url helper tests. This doesn't ↵ | Joshua Peek | 2009-09-06 | 2 | -63/+57 |
| | | | | work in real life anyway. | ||||
* | Need to reset session in internal integration tests after altering the route set | Joshua Peek | 2009-09-06 | 1 | -0/+1 |
| | |||||
* | Fix isolated running of AddressesTest | Joshua Peek | 2009-09-06 | 2 | -6/+3 |
| | |||||
* | Fix isolated running of ActionPackAssertionTest | Joshua Peek | 2009-09-06 | 2 | -1/+2 |
| | |||||
* | Fix failing isolated routing test | Joshua Peek | 2009-09-05 | 1 | -16/+16 |
| | |||||
* | Test for previous commit (we wrote it first, I swear) | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+18 |
| | |||||
* | Refactor ActionController to use find_template and template_exists? | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -2/+2 |
| | |||||
* | Don't raise exceptions for missing javascript_include_tag or ↵ | Sam Pohlenz | 2009-09-03 | 1 | -4/+58 |
| | | | | | | stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove a useless method in the fixture template class | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -4/+0 |
| | |||||
* | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 3 | -55/+16 |
| | |||||
* | If session_options[:id] is requested when using CookieStore, unmarshal the ↵ | Jay Pignata | 2009-09-03 | 1 | -2/+2 |
| | | | | | | session to access it [#2268 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Fix the */* with Net::HTTP bug [#3100 state:resolved] | Yehuda Katz + Carl Lerche | 2009-09-01 | 2 | -4/+7 |
| | |||||
* | ActionPack test helpers need to activate rack gem | Joshua Peek | 2009-09-01 | 3 | -3/+11 |
| | |||||
* | Activate rack-test gem before it's required. This shouldn't be necessary, ↵ | Bryan Helmkamp | 2009-08-31 | 1 | -0/+2 |
| | | | | but should fix the build for now | ||||
* | rack-test 0.4.2 has rack 1.1.pre goodies, we'll use it instead | Joshua Peek | 2009-08-31 | 1 | -2/+2 |
| | |||||
* | Ensure that blocks are also handled inside the responder. | José Valim | 2009-08-29 | 1 | -0/+7 |
| | |||||
* | Reset session in integration tests after changing routes to reload the ↵ | Joshua Peek | 2009-08-27 | 9 | -27/+39 |
| | | | | middleware stack | ||||
* | UrlRewriter#rewrite_url should call #to_param on the value given in :anchor ↵ | Jeffrey Hardy | 2009-08-26 | 1 | -0/+26 |
| | | | | | | | | option, just as #url_for does [#2746 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | I18n: use I18n for select helpers' prompt text | Akira Matsuda | 2009-08-26 | 1 | -0/+27 |
| | | | | | | [#2252 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Revert "I18n: use I18n for select helpers' prompt text" | Jeremy Kemper | 2009-08-26 | 1 | -22/+0 |
| | | | | | | | | Broke CI. [#2252 state:open] This reverts commit adedf72821a5623227ce91e6b298838e692477e4. | ||||
* | I18n: use I18n for select helpers' prompt text | Akira Matsuda | 2009-08-26 | 1 | -0/+22 |
| | | | | | | [#2252 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Create new ActionController::Middleware class that will work as a normal ↵ | Yehuda Katz | 2009-08-26 | 5 | -87/+131 |
| | | | | | | 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 testing | Joshua Peek | 2009-08-25 | 6 | -92/+50 |
| | |||||
* | ActionController::Metal can be a middleware | Yehuda Katz + Carl Lerche | 2009-08-25 | 1 | -0/+45 |
| | |||||
* | Move legacy param_parsers config onto AD::ParamsParser | Joshua Peek | 2009-08-21 | 1 | -62/+67 |
| | |||||
* | k, thats really slow, lets not | Joshua Peek | 2009-08-16 | 1 | -8/+0 |
| | |||||
* | Cleanup route reloading in tests. Prefer with_routing over using ↵ | Joshua Peek | 2009-08-16 | 13 | -135/+139 |
| | | | | ActionController::Routing::Routes directly | ||||
* | Missing fixture template -- fixes AP tests | Yehuda Katz | 2009-08-15 | 1 | -0/+1 |
| | |||||
* | Adding a call to logger from params_parser to give detailed debug ↵ | Jay Pignata | 2009-08-15 | 2 | -5/+40 |
| | | | | | | | | information when invalid xml or json is posted [#2481 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Axe "best fit" generation support | Joshua Peek | 2009-08-15 | 1 | -12/+0 |
| | |||||
* | Got tests to pass with some more changes. | Yehuda Katz | 2009-08-15 | 14 | -91/+79 |
| | | | | | | | | | | | | | | | | * request.formats is much simpler now * For XHRs or Accept headers with a single item, we use the Accept header * For other requests, we use params[:format] or fallback to HTML * This is primarily to work around the fact that browsers provide completely broken Accept headers, so we have to whitelist the few cases we can specifically isolate and treat other requests as coming from the browser * For APIs, we can support single-item Accept headers, which disambiguates from the browsers * Requests to an action that only has an XML template from the browser will no longer find the template. This worked previously because most browsers provide a catch-all */*, but this was mostly accidental behavior. If you want to serve XML, either use the :xml format in links, or explicitly specify the XML template: render "template.xml". | ||||
* | More cleanup of ActionView and reduction in need for blocks in some cases: | Yehuda Katz | 2009-08-15 | 5 | -13/+3 |
| | | | | | | | | * only one of partial_name or :as will be available as a local * `object` is removed * Simplify _layout_for in most cases. * Remove <% render :partial do |args| %> * <% render :partial do %> still works fine | ||||
* | Clean up ActionView some: | Yehuda Katz | 2009-08-15 | 1 | -11/+23 |
| | | | | | | | | | | * Call _evaluate_assigns_and_ivars at the two entry points so we don't have to do a check at every render. * Make template.render viable without having to go through a wrapper method * Remove old TemplateHandler#render(template, local_assigns) path so we don't have to set self.template every time we render a template. * Move Template rescuing code to Template#render so it gets caught every time. * Pull in some tests from Pratik that test render @object in ActionView | ||||
* | Attempt to rewrite most of the highly coupled router segments tests | Joshua Peek | 2009-08-14 | 1 | -741/+221 |
| | |||||
* | Kill routing timed tests | Joshua Peek | 2009-08-14 | 1 | -50/+3 |
| | |||||
* | Use safe tmp dir | Joshua Peek | 2009-08-13 | 2 | -0/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-08-13 | 3 | -4/+3 |
|\ | |||||
| * | More perf work: | Yehuda Katz | 2009-08-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move #set_cookie and #delete_cookie inline to optimize. These optimizations should almost certainly be sent back upstream to Rack. The optimization involves using an ivar for cookies instead of indexing into the headers each time. * Was able to use a bare Hash for headers now that cookies have their own joining semantics (some code assumed that the raw cookies were an Array). * Cache blankness of body on body= * Improve expand_cache_key for Arrays of a single element (common in our case) * Use a simple layout condition check unless conditions are used * Cache visible actions * Lazily load the UrlRewriter * Make etag an ivar that is set on prepare! | ||||
| * | Tentatively accept the ":as or :object, but not both" solution | Yehuda Katz | 2009-08-11 | 1 | -1/+1 |
| | | |||||
| * | Add some more caching to the lookup | Yehuda Katz | 2009-08-11 | 1 | -2/+2 |
| | | |||||
* | | Ensure collections are not treated as nested resources. | José Valim | 2009-08-13 | 2 | -11/+28 |
|/ | |||||
* | Introduce grouped_collection_select helper. | codeape | 2009-08-09 | 1 | -0/+34 |
| | | | | | | [#1249 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |