aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* This is not neededPiotr Sarnacki2010-09-031-26/+0
|
* Modified ActionDispatch::Static to allow passing multiple rootsPiotr Sarnacki2010-09-036-21/+104
|
* Add Rails::Railtie.railtie_name method to allow setting custom name for railtiePiotr Sarnacki2010-09-031-2/+7
|
* to_param shoul return a stringPiotr Sarnacki2010-09-031-1/+1
|
* We don't need delegating polymorphic_url and polymorphic_path anymorePiotr Sarnacki2010-09-031-10/+6
|
* Added ability to set asset_path for enginesPiotr Sarnacki2010-09-033-1/+27
|
* Ensure that url_helpers included after application's ones have higher priorityPiotr Sarnacki2010-09-031-0/+15
|
* Add mounted_helpers to routesPiotr Sarnacki2010-09-038-90/+168
| | | | | | | | | | | | | | | | mounted_helpers are a bit similar to url_helpers. They're automatically included in controllers for Rails.application and each of mounted Engines. Mounted helper allows to call url_for and named helpers for given application. Given Blog::Engine mounted as blog_engine, there are 2 helpers defined: app and blog_engine. You can call routes for app and engine using those helpers: app.root_url app.url_for(:controller => "foo") blog_engine.posts_path blog_engine.url_for(@post)
* Routes refactoring:Piotr Sarnacki2010-09-034-55/+77
| | | | | | | * added more tests for prefix generation * fixed bug with generating host for both prefix and url * refactored url_for method * organized tests for prefix generation
* Use new url_for API instead of including routes.url_helpersPiotr Sarnacki2010-09-031-3/+2
|
* Ensure that env is always available in controllersPiotr Sarnacki2010-09-032-2/+6
|
* Extended url_for to handle specifying which router should be used.Piotr Sarnacki2010-09-037-80/+136
| | | | | | | A few examples: url_for Blog::Engine, :posts_path url_for Blog::Engine, @post url_for Blog::Engine, :action => "main", :controller => "index"
* Added some more tests for url generation between Engine and ApplicationPiotr Sarnacki2010-09-032-14/+32
|
* Get rid of :skip_prefix options in routesPiotr Sarnacki2010-09-033-15/+8
|
* Refactored tests for prefix generation and added test for url generation in ↵Piotr Sarnacki2010-09-031-11/+32
| | | | regular class with default_url_options[:script_name] set
* New way of generating urls for Application from Engine.Piotr Sarnacki2010-09-035-10/+25
| | | | | | | | | It's based specifying application's script_name with: Rails.application.default_url_options = {:script_name => "/foo"} default_url_options method is delegated to routes. If router used to generate url differs from the router passed via env it always overwrites :script_name with this value.
* Allow to generate Application routes inside EnginePiotr Sarnacki2010-09-033-7/+26
| | | | | | This requires knowledge about original SCRIPT_NAME and the parent router. It should be pass through the env as ORIGIAL_SCRIPT_NAME and action_dispatch.parent_routes
* Use env['action_dispatch.routes'] to determine if we should generate prefix ↵Piotr Sarnacki2010-09-035-8/+151
| | | | | | | | | | or not. This technique is here to allow using routes from Engine in Application and vice versa. When using Engine routes inside Application it should generate prefix based on mount point. When using Engine routes inside Engine it should use env['SCRIPT_NAME']. In any other case it should generate prefix as env should not be even available.
* require 'active_support/dependencies' in action_dispatch/middleware/stackPiotr Sarnacki2010-09-031-0/+1
|
* Merge remote branch 'docrails/master'Xavier Noria2010-09-031-1/+1
|\
| * fix typo(?)Akira Matsuda2010-09-011-1/+1
| |
* | Revert "Setup explicit requires for files with exceptions. Removed them from ↵José Valim2010-09-0217-18/+15
| | | | | | | | | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
* | Ensure routes are loaded only after the initialization process finishes, ↵José Valim2010-09-021-5/+0
| | | | | | | | ensuring all configuration options were applied.
* | Setup explicit requires for files with exceptions. Removed them from ↵Łukasz Strzałkowski2010-09-0217-15/+18
| | | | | | | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Cleaned up autoload definitions.Łukasz Strzałkowski2010-09-021-15/+20
| | | | | | | | | | | | Now it's more transparent, and readable Signed-off-by: José Valim <jose.valim@gmail.com>
* | Removing RJS hackThiago Pradi2010-09-022-6/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Removing unnecessary code from render_testThiago Pradi2010-09-021-2/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Removing unnecessary codeThiago Pradi2010-09-021-7/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Move implicit nested call before options handling so that nested constraints ↵Andrew White2010-09-012-9/+25
| | | | | | | | | | | | work [#5513 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Added :format option for form_for helper and spec for this [#5226 ↵Alex Chrome2010-09-012-3/+27
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Remove unnecessary code from UrlHelper#link_to.yury2010-09-011-7/+2
| | | | | | | | | | | | convert_options_to_data_attributes always returns not nil stringified html_options [#5445 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Use join instead of looping and calling to_s [#5492 state:resolved]Thiago Pradi2010-09-011-3/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Bump rack-mount to 0.6.13 and add test case for named character classes ↵Andrew White2010-08-312-1/+13
|/ | | | | | [#5509 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Merge remote branch 'docrails/master'Xavier Noria2010-09-011-2/+3
|\
| * Fix API docs for button_to optionsJaime Iniesta2010-08-311-2/+3
| |
* | Speed up form_for by specializing extract_options! (at asakusa.rb)wycats2010-08-311-6/+8
| |
* | Speed up content_tag_for by simplifying needed logicwycats2010-08-311-3/+3
|/
* resolves merge conflictXavier Noria2010-08-317-62/+263
|\
| * Expanded routing documentation with current best practicesJoost Baaij2010-08-295-21/+188
| |
| * Rework the routing documentation.Joost Baaij2010-08-281-22/+75
| | | | | | | | | | Move the default route to the bottom, as this practise should be discouraged. Add documentation for resources, external redirects and Rack applications.
| * The call-seq directive has no useful effect on our documentation and is not ↵Joost Baaij2010-08-281-19/+0
| | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner.
* | Merge josevalim/deprecations branch.José Valim2010-08-301-19/+6
|\ \ | | | | | | | | | I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
| * | Update CHANGELOGs for 3.0 release and upcoming 3.1Jeremy Kemper2010-08-291-19/+6
| | |
* | | Remove NonConcattingString.José Valim2010-08-293-6/+1
| | |
* | | Remove deprecated support to <% form_for %> and several ↵José Valim2010-08-2912-307/+24
|/ / | | | | | | ActionController::Base methods.
* | Clean up CHANGELOGsJeremy Kemper2010-08-281-0/+2
| |
* | Ensure that inherited helper_methods are available after calling ↵Jesse Storimer2010-08-282-1/+42
| | | | | | | | | | | | clear_helpers [#5348 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Micro optimization for build_named_route_call in PolymorphicRoutes:yury2010-08-281-10/+10
| | | | | | | | | | | | | | | | | | 1. use map instead of inject 2. use [].join("_") instead of '<<'. It is a little bit faster for ruby 1.9.2 and x2 faster for ruby 1.8.7. http://gist.github.com/548143 [#5450 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | password_field renders with nil value by defaultSantiago Pastorino2010-08-283-6/+11
| | | | | | | | | | | | | | | | This makes the use of passwords secure by default if you want to render the value of the password_field you have to do for instance f.password_field(:password, :value => @user.password) # => <input type=password id=user_password name=user[password] value=#{@user.password} />
* | type="password" for password_fieldsSantiago Pastorino2010-08-281-4/+4
|/