Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix number_to_human(0) exception [#5532 state:resolved] | Ben Sharpe | 2010-09-05 | 2 | -1/+3 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Make scoped reorder override previous applied orders | Santiago Pastorino | 2010-09-05 | 2 | -3/+15 |
| | | | | [5528 state:committed] | ||||
* | failing test for reorder overriding default_scope | Nick Ragaz | 2010-09-05 | 2 | -1/+7 |
| | | | | | | [5528] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | order should always be concatenated. | Neeraj Singh | 2010-09-05 | 6 | -8/+35 |
| | | | | | | | | | | | | | | | | | | | | | | order that is declared first has highest priority in all cases. Here are some examples. Car.order('name desc').find(:first, :order => 'id').name Car.named_scope_with_order.named_scope_with_another_order Car.order('id DESC').scoping do Car.find(:first, :order => 'id asc') end No special treatment to with_scope or scoping. Also note that if default_scope declares an order then the order declared in default_scope has the highest priority unless with_exclusive_scope is used. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Remove more deprecated behavior from plugins. | José Valim | 2010-09-04 | 2 | -46/+3 |
| | |||||
* | Small tidy up on Rails::Engine. | José Valim | 2010-09-04 | 1 | -48/+49 |
| | |||||
* | This commit merges most of the work done by Piotr Sarnacki in his Ruby ↵ | José Valim | 2010-09-04 | 75 | -468/+2479 |
|\ | | | | | | | | | | | | | | | Summer of Code project. His work brings several capabilities from app to engines, as routes, middleware stack, asset handling and much more. Please check Rails::Engine documentation for more refenrences. Merge remote branch 'drogus/engines' | ||||
| * | 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 |
| | | |||||
| * | Fixed tests after rebase | Piotr Sarnacki | 2010-09-03 | 1 | -4/+3 |
| | | |||||
| * | I've changed that test along the way, it should actually stay without changes | Piotr Sarnacki | 2010-09-03 | 2 | -8/+15 |
| | | |||||
| * | Use default_scope in isolated Engines to not force user to scope his routes | Piotr Sarnacki | 2010-09-03 | 3 | -16/+12 |
| | | |||||
| * | Implemented RouteSet#default_scope, which allows to set the scope for the ↵ | Piotr Sarnacki | 2010-09-03 | 3 | -2/+41 |
| | | | | | | | | entire routes object | ||||
| * | engines_blank_point should always be the last initializer in Engine | Piotr Sarnacki | 2010-09-03 | 1 | -5/+5 |
| | | |||||
| * | We should avoid creating additional initializers when we can, adding them ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -3/+1 |
| | | | | | | | | makes boot process slower | ||||
| * | Add some documantation on new route_key and param_key in ActiveModel::Naming | Piotr Sarnacki | 2010-09-03 | 1 | -0/+16 |
| | | |||||
| * | Remove namespace for isolated namespaced models in forms | Piotr Sarnacki | 2010-09-03 | 4 | -6/+101 |
| | | |||||
| * | Use new ActiveModel::Naming.route_key in polymorphic_routes | Piotr Sarnacki | 2010-09-03 | 2 | -12/+3 |
| | | |||||
| * | Prepared ActiveModel::Naming to handle cases for namespaced isolated engines | Piotr Sarnacki | 2010-09-03 | 3 | -4/+134 |
| | | |||||
| * | Add some more docs on polymorphic_url with routes proxy | Piotr Sarnacki | 2010-09-03 | 1 | -0/+10 |
| | | |||||
| * | 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 | 3 | -1/+58 |
| | | | | | | | | polymorphic_routes, for example: polymorphic_url([blog, @post]) | ||||
| * | Updated tests to use scope(:module => :engine_name) instead of namespace and ↵ | Piotr Sarnacki | 2010-09-03 | 2 | -23/+28 |
| | | | | | | | | updated mounted engine tests to actually use the namespacing | ||||
| * | 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 | 4 | -12/+38 |
| | | |||||
| * | Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵ | Piotr Sarnacki | 2010-09-03 | 5 | -38/+17 |
| | | | | | | | | 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 | 5 | -22/+61 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Get rid of static_paths method and instead configure paths for ↵ | Piotr Sarnacki | 2010-09-03 | 6 | -17/+29 |
| | | | | | | | | ActionDispatch::Static in initializers | ||||
| * | We don't need to clear action_methods on inherited hook as they are cleaned ↵ | Piotr Sarnacki | 2010-09-03 | 1 | -5/+0 |
| | | | | | | | | on method_added hook | ||||
| * | ActionMailer should not depend on ActionDispatch | Piotr Sarnacki | 2010-09-03 | 3 | -3/+2 |
| | | |||||
| * | Refactor RoutesProxy to avoid using _with_routes in helpers | Piotr Sarnacki | 2010-09-03 | 3 | -4/+10 |
| | | |||||
| * | Documented mounted helpers | Piotr Sarnacki | 2010-09-03 | 1 | -0/+29 |
| | | |||||
| * | Document engine_name | Piotr Sarnacki | 2010-09-03 | 1 | -0/+16 |
| | | |||||
| * | Added documentation for namespaced Engine | Piotr Sarnacki | 2010-09-03 | 1 | -2/+34 |
| | | |||||
| * | Add table_name_prefix to Engine's namespace automatically | Piotr Sarnacki | 2010-09-03 | 3 | -1/+16 |
| | | |||||
| * | Rename isolated_engine_for to namespace | Piotr Sarnacki | 2010-09-03 | 2 | -5/+5 |
| | | |||||
| * | Refactor ActionMailer to not use hide_actions | Piotr Sarnacki | 2010-09-03 | 7 | -69/+40 |
| | | |||||
| * | Move ActionController::Railties::RoutesHelpers and ↵ | Piotr Sarnacki | 2010-09-03 | 4 | -22/+5 |
| | | | | | | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers | ||||
| * | Include routes helpers only for inherited classes in ActionMailer | Piotr Sarnacki | 2010-09-03 | 5 | -27/+67 |
| | | |||||
| * | 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 | ||||
| * | Fix copying migrations to empty directory | Piotr Sarnacki | 2010-09-03 | 3 | -1/+15 |
| | | |||||
| * | Include application's helpers and router helpers by default, but include ↵ | Piotr Sarnacki | 2010-09-03 | 8 | -4/+182 |
| | | | | | | | | 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 | ||||
| * | mounted helpers should be included in ActionMailer | Piotr Sarnacki | 2010-09-03 | 2 | -1/+3 |
| | | |||||
| * | This is not needed | Piotr Sarnacki | 2010-09-03 | 1 | -26/+0 |
| | | |||||
| * | Engine's assets are now served with ActionDispatch::Static | Piotr Sarnacki | 2010-09-03 | 3 | -6/+46 |
| | |