aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Don't assume resource param is :id when using shallow routesAndrew White2012-07-202-1/+15
| | | | | Since #5581 added support for resources with custom params we should not assume that it is :id when using shallow resource routing.
* Support constraints on resource custom params when nestingAndrew White2012-07-202-9/+24
| | | | | | | The Mapper looks for a :id constraint in the scope to see whether it should apply a constraint for nested resources. Since #5581 added support for resource params other than :id, we need to check for a constraint on the parent resource's param name and not assume it's :id.
* Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-07-185-55/+41
| | | | | | | | | This applies to the following helpers: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag`
* add lazy look up in abstract controller's translate methodSergey Pchelincev2012-07-182-1/+20
|
* Common behavior with adding formats to lookup_context for TemplateRenderer ↵Dmitry Vorotilin2012-07-1812-4/+33
| | | | and PartialRenderer
* Add support for optional root segments containing slashesAndrew White2012-07-172-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional segments with a root scope need to have the leading slash outside of the parentheses, otherwise the generated url will be empty. However if the route has non-optional elements then the leading slash needs to remain inside the parentheses otherwise the generated url will have two leading slashes, e.g: Blog::Application.routes.draw do get '/(:category)', :to => 'posts#index', :as => :root get '/(:category)/author/:name', :to => 'posts#author', :as => :author end $ rake routes root GET /(:category)(.:format) posts#index author GET (/:category)/author/:name(.:format) posts#author This change adds support for optional segments that contain a slash, allowing support for urls like /page/2 for the root path, e.g: Blog::Application.routes.draw do get '/(page/:page)', :to => 'posts#index', :as => :root end $ rake routes root GET /(page/:page)(.:format) posts#index Fixes #7073
* Fix class_eval without __FILE__ and __LINE__.kennyj2012-07-181-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-151-7/+4
|\
| * Updated with_routing example to 3.x syntax [ci skip]Wojciech Wnętrzak2012-07-131-7/+4
| |
* | add second t to overwrittenEvan Travers2012-07-121-2/+2
| | | | | | | | fixing a misspelling in the documentation
* | Fix code comment to reflect its intent.Selem Delul2012-07-111-1/+1
| |
* | Fix indentation.Piotr Sarnacki2012-07-111-4/+4
| |
* | Don't raise an error if http auth token isn't well formattedPiotr Sarnacki2012-07-112-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone sends malformed authorization header, like: Authorization: Token foobar given token should be just ignored and resource should not be authorized, instead of raising error. Before this patch controller would return 401 header only for well formed tokens, like: Authorization: Token token=foobar and would return 500 in former case.
* | Raise a helpful error message on #mount misuseCarl Lerche2012-07-102-0/+13
| |
* | Fixed bug creating invalid HTML in select optionsRusty Geldmacher2012-07-103-3/+17
| | | | | | | | | | | | When a select tag is created for a field with errors, then the inserted options will errantly have a <div class="field_with_errors"> wrapping them.
* | deprecate `describe` without a block.Aaron Patterson2012-07-094-13/+1
| | | | | | | | | | minitest/spec provides `describe`, so deprecate the rails version and have people use the superclass version
* | Remove AS declarative extension from erb tag testCarlos Antonio da Silva2012-07-081-3/+0
| | | | | | | | | | The extension was removed in 22bc12ec374b8bdeb3818ca0a3eb787dd3ce39d8, making "test" an alias for minitest's "it".
* | Improve and fix AP changelog, sync release notes [ci skip]Carlos Antonio da Silva2012-07-081-2/+2
| |
* | Rename RouteInspector to RoutesInspectorCarlos Antonio da Silva2012-07-083-5/+4
| | | | | | | | Follow the consistency defined in dbc43bc.
* | show routes while debugging added to changelogschneems2012-07-071-0/+2
| |
* | move route_inspector to actionpack@schneems and @mattt2012-07-073-5/+298
| | | | | | | | this is so we can show route output in the development when we get a routing error. Railties can use features of ActionDispatch, but ActionDispatch should not depend on Railties.
* | show routes while debugging RoutingErrorschneems2012-07-072-3/+20
|/ | | | If someone receives a routing error, they likely need to view the routes. Rather than making them visit '/rails/info/routes' or run `rake routes` we can give them that information on the page.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-072-4/+1
|\
| * ActionDispatch::ClosedError no longer is raised. See d142572567 for more info.Nick Howard2012-06-301-3/+0
| |
| * use config.action_controller instead of ActionController::Base in example ↵Nick Howard2012-06-301-1/+1
| | | | | | | | code for asset_tag_helper
* | Use "instance_accessor" for flash types class attributeCarlos Antonio da Silva2012-07-072-4/+3
| |
* | Added support add_flash_typeskennyj2012-07-074-14/+65
| |
* | Remove unused code.kennyj2012-07-071-4/+0
| |
* | Prevent conflict between mime types and Object methodsMircea Pricop2012-07-064-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assuming the type ":touch", Collector.new was calling send(:touch), which instead of triggering method_missing and generating a new collector method, actually invoked the private method `touch` inherited from Object. By generating the method for each mime type as it is registered, the private methods on Object can never be reached by `send`, because the `Collector` will have them before `send` is called on it. To do this, a callback mechanism was added to Mime::Type This allows someone to add a callback for whenever a new mime type is registered. The callback then gets called with the new mime as a parameter. This is then used in AbstractController::Collector to generate new collector methods after each mime is registered.
* | Revert "push parameter instantiation to one method"Aaron Patterson2012-07-051-1/+1
| | | | | | | | | | | | | | This reverts commit 9669f6f7883787aa209207cab68b1069636aed9e. This breaks Sam Ruby's tests for some reason. Revert until we figure it out.
* | Merge branch 'master' into testcleanAaron Patterson2012-07-052-2/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add documentation for inheritance_column method Use ArgumentError vs. RuntimeError, which is more precise. CSV fixtures aren't supported by default anymore, update generated test_helper.rb to reflect that fix quoting for ActiveSupport::Duration instances Add few information on the field types Add the options method to action_controller testcase.
| * | Add the options method to action_controller testcase.François de Metz2012-07-042-2/+12
| | | | | | | | | | | | Signed-off-by: François de Metz <francois@stormz.me>
* | | push parameter instantiation to one methodAaron Patterson2012-07-031-1/+1
| | |
* | | add Mime.fetch so we can have default mime typesAaron Patterson2012-07-032-2/+6
| | |
* | | make the default environment have actual defaultsAaron Patterson2012-07-032-3/+16
| | | | | | | | | | | | | | | | | | instead of deleting keys on every instantiation, create defaults we actually use. eventually we can pass an environment in to the request, and create a new req / res object on each call.
* | | assing the request on the response only onceAaron Patterson2012-07-031-4/+5
| | |
* | | group things that are alikeAaron Patterson2012-07-032-10/+10
| | |
* | | push functional test specific methods to it's own moduleAaron Patterson2012-07-032-9/+15
| | |
* | | test should be testing to_param not to_s, remove Array subclassAaron Patterson2012-07-032-7/+3
| | |
* | | push the cookie writing stuff out of the controllerAaron Patterson2012-07-032-23/+8
| | | | | | | | | | | | merging cookies is responsibility of the test runner
* | | extend the controller with special logic on recycleAaron Patterson2012-07-032-16/+28
| | | | | | | | | | | | | | | | | | For some reason, this special logic is only supposed to be executed on the second request. For now, we'll extend on recycle, but we should figure out why this functionality can't be run on every request
* | | push req / res setting to the test runnerAaron Patterson2012-07-032-5/+10
| | | | | | | | | | | | | | | Try to avoid making the controller mutate itself so that we can eventually make the response async
* | | extract response setting to a methodAaron Patterson2012-07-031-2/+8
|/ /
* | Update 4.0 Release Notes with changelogs [ci skip]Carlos Antonio da Silva2012-07-021-3/+3
| | | | | | | | | | | | | | Also fix some wrong formatting. Related discussion: https://github.com/rails/rails/commit/ab72040b74f742b6676b2d2a5dd029bfdca25a7a#commitcomment-1525256
* | push response creation down since third param is never used.Aaron Patterson2012-07-021-3/+3
| |
* | Update AR and AP changelogs [ci skip]Carlos Antonio da Silva2012-06-301-0/+2
| |
* | Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-apCarlos Antonio da Silva2012-06-305-24/+33
|\ \ | |/ |/| Remove Active Model dependency from Action Pack
| * Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-305-24/+33
| | | | | | | | | | | | | | | | ActiveModel is used in ActionPack for ActiveModel::Naming for a few, mostly optional aspects of ActionPack related to automatically converting an ActiveModel compliant object into a key for params and routing. It uses only three methods of ActiveModel (ActiveModel::Naming.route_key, ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key).
* | Merge pull request #6908 from apotonick/av-prepare2José Valim2012-06-302-20/+13
|\ \ | | | | | | Av prepare2
| * | removing the AV::Base.helpers class attribute as it is not needed.Nick Sutterer2012-06-291-1/+0
| | |