Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Test for recognizing routes with http method set | Łukasz Strzałkowski | 2010-09-05 | 1 | -1/+40 |
| | |||||
* | Fixed about half of broken tests in routing_test | Łukasz Strzałkowski | 2010-09-05 | 1 | -125/+82 |
| | |||||
* | Fixed almost all resources tests | Piotr Sarnacki | 2010-09-05 | 1 | -159/+213 |
| | |||||
* | Fixed url_for test | Łukasz Strzałkowski | 2010-09-05 | 1 | -1/+1 |
| | | | | Added route which matches all: controller, action, id and format | ||||
* | Revert "Extended default route for match in tests - now it matches ↵ | Łukasz Strzałkowski | 2010-09-05 | 1 | -2/+2 |
| | | | | | | controller, action, id and format if given." This reverts commit 05e9d0df0dea68ca4655aa8723c3ee69049fac78. | ||||
* | Extended default route for match in tests - now it matches controller, ↵ | Łukasz Strzałkowski | 2010-09-05 | 1 | -2/+2 |
| | | | | | | action, id and format if given. This fixes url_for tests | ||||
* | Removed deprecated RouteSet API, still many tests fail | Piotr Sarnacki | 2010-09-05 | 34 | -606/+567 |
| | |||||
* | Do not use ActionController::Base.page_cache_extension in initialize to not ↵ | Piotr Sarnacki | 2010-09-04 | 1 | -4/+8 |
| | | | | load more ActiveSupport than we need | ||||
* | Optimize ActionDispatch::Static | Piotr Sarnacki | 2010-09-04 | 1 | -51/+35 |
| | |||||
* | Forgot to move that line to railtie on rebase | Piotr Sarnacki | 2010-09-03 | 1 | -1/+1 |
| | |||||
* | Implemented RouteSet#default_scope, which allows to set the scope for the ↵ | Piotr Sarnacki | 2010-09-03 | 3 | -2/+41 |
| | | | | entire routes object | ||||
* | Remove namespace for isolated namespaced models in forms | Piotr Sarnacki | 2010-09-03 | 3 | -5/+37 |
| | |||||
* | Use new ActiveModel::Naming.route_key in polymorphic_routes | Piotr Sarnacki | 2010-09-03 | 2 | -12/+3 |
| | |||||
* | Add short note on using url_for instead of directly calling named route in ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -0/+3 |
| | | | | polymorphic_url | ||||
* | Add possibility to explicitly call engine's routes through ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -1/+28 |
| | | | | polymorphic_routes, for example: polymorphic_url([blog, @post]) | ||||
* | Move RoutesProxy to separate file | Piotr Sarnacki | 2010-09-03 | 3 | -32/+36 |
| | |||||
* | Include all helpers from non-namespaced engines | Piotr Sarnacki | 2010-09-03 | 1 | -9/+3 |
| | |||||
* | Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵ | Piotr Sarnacki | 2010-09-03 | 3 | -9/+11 |
| | | | | use helper(:all) just after that | ||||
* | Added more tests for polymorphic_url with namespaced models and implemented ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -5/+66 |
| | | | | missing use cases | ||||
* | This was used only to clear warning in ActionMailer tests, it shouldn't be ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -5/+0 |
| | | | | done like that | ||||
* | Moved ActionMailer and ActionController railties options to inherited hook | Piotr Sarnacki | 2010-09-03 | 3 | -16/+32 |
| | | | | | | | | | | | This change is needed, because we must take namespace into account and if controller's/mailer's class is namespaced, engine's paths should be set instead of application's ones. The nice side effect of this is removing unneeded logic in ActionController::Base.inherited - now the helpers_path should be set correctly even for engine's controllers, so helper(:all) will always include correct helpers. | ||||
* | Modified polymorphic_url to check for model's namespace | Piotr Sarnacki | 2010-09-03 | 1 | -0/+4 |
| | | | | | | | | | | | This change allows using namespaced models with polymorphic_url, in the way that you would use them without namespace. Let's say that you have Blog::Post model in namespaced Engine. When you use polymorphic_path with Blog::Post instances, like in form_for(@post), it will look for blog_posts_path named url helper. As we are inside Blog::Engine, it's annoying to always use the prefix. With this commit, blog_ prefix will be removed and posts_path will be called. | ||||
* | Refactor RoutesProxy to avoid using _with_routes in helpers | Piotr Sarnacki | 2010-09-03 | 3 | -4/+10 |
| | |||||
* | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 4 | -15/+36 |
| | |||||
* | Move ActionController::Railties::RoutesHelpers and ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -5/+6 |
| | | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers | ||||
* | Fix generating urls with mounted helpers in view context | Piotr Sarnacki | 2010-09-03 | 3 | -3/+5 |
| | | | | | | | | | | There were actually 2 problems with this one: * script_name was added to options as a string and then it was used in RouteSet#url_for with usage of <<, which was changing the original script_name * the second issue was with _with_routes method. It was called in RoutesProxy to modify _routes in view_context, but url_helpers in views is just delegating it to controller, so another _with_routes call is needed there | ||||
* | Include application's helpers and router helpers by default, but include ↵ | Piotr Sarnacki | 2010-09-03 | 4 | -4/+30 |
| | | | | engine's ones for controllers inside isolated namespace | ||||
* | For view_context we need to initialize RoutesProxy in context of controller, ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -2/+4 |
| | | | | not view, quick fix, I need to dig into it later | ||||
* | This is not needed | Piotr Sarnacki | 2010-09-03 | 1 | -26/+0 |
| | |||||
* | Modified ActionDispatch::Static to allow passing multiple roots | Piotr Sarnacki | 2010-09-03 | 6 | -21/+104 |
| | |||||
* | Add Rails::Railtie.railtie_name method to allow setting custom name for railtie | Piotr Sarnacki | 2010-09-03 | 1 | -2/+7 |
| | |||||
* | to_param shoul return a string | Piotr Sarnacki | 2010-09-03 | 1 | -1/+1 |
| | |||||
* | We don't need delegating polymorphic_url and polymorphic_path anymore | Piotr Sarnacki | 2010-09-03 | 1 | -10/+6 |
| | |||||
* | Added ability to set asset_path for engines | Piotr Sarnacki | 2010-09-03 | 3 | -1/+27 |
| | |||||
* | Ensure that url_helpers included after application's ones have higher priority | Piotr Sarnacki | 2010-09-03 | 1 | -0/+15 |
| | |||||
* | Add mounted_helpers to routes | Piotr Sarnacki | 2010-09-03 | 8 | -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 Sarnacki | 2010-09-03 | 4 | -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_helpers | Piotr Sarnacki | 2010-09-03 | 1 | -3/+2 |
| | |||||
* | Ensure that env is always available in controllers | Piotr Sarnacki | 2010-09-03 | 2 | -2/+6 |
| | |||||
* | Extended url_for to handle specifying which router should be used. | Piotr Sarnacki | 2010-09-03 | 7 | -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 Application | Piotr Sarnacki | 2010-09-03 | 2 | -14/+32 |
| | |||||
* | Get rid of :skip_prefix options in routes | Piotr Sarnacki | 2010-09-03 | 3 | -15/+8 |
| | |||||
* | Refactored tests for prefix generation and added test for url generation in ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -11/+32 |
| | | | | regular class with default_url_options[:script_name] set | ||||
* | New way of generating urls for Application from Engine. | Piotr Sarnacki | 2010-09-03 | 5 | -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 Engine | Piotr Sarnacki | 2010-09-03 | 3 | -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 Sarnacki | 2010-09-03 | 5 | -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/stack | Piotr Sarnacki | 2010-09-03 | 1 | -0/+1 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-09-03 | 1 | -1/+1 |
|\ | |||||
| * | fix typo(?) | Akira Matsuda | 2010-09-01 | 1 | -1/+1 |
| | | |||||
* | | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 17 | -18/+15 |
| | | | | | | | | | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. |