aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix number_to_human(0) exception [#5532 state:resolved]Ben Sharpe2010-09-052-1/+3
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Make scoped reorder override previous applied ordersSantiago Pastorino2010-09-052-3/+15
| | | | [5528 state:committed]
* failing test for reorder overriding default_scopeNick Ragaz2010-09-052-1/+7
| | | | | | [5528] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* order should always be concatenated.Neeraj Singh2010-09-056-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é Valim2010-09-042-46/+3
|
* Small tidy up on Rails::Engine.José Valim2010-09-041-48/+49
|
* This commit merges most of the work done by Piotr Sarnacki in his Ruby ↵José Valim2010-09-0475-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 Sarnacki2010-09-041-4/+8
| | | | | | | | load more ActiveSupport than we need
| * Optimize ActionDispatch::StaticPiotr Sarnacki2010-09-041-51/+35
| |
| * Forgot to move that line to railtie on rebasePiotr Sarnacki2010-09-031-1/+1
| |
| * Fixed tests after rebasePiotr Sarnacki2010-09-031-4/+3
| |
| * I've changed that test along the way, it should actually stay without changesPiotr Sarnacki2010-09-032-8/+15
| |
| * Use default_scope in isolated Engines to not force user to scope his routesPiotr Sarnacki2010-09-033-16/+12
| |
| * Implemented RouteSet#default_scope, which allows to set the scope for the ↵Piotr Sarnacki2010-09-033-2/+41
| | | | | | | | entire routes object
| * engines_blank_point should always be the last initializer in EnginePiotr Sarnacki2010-09-031-5/+5
| |
| * We should avoid creating additional initializers when we can, adding them ↵Piotr Sarnacki2010-09-031-3/+1
| | | | | | | | makes boot process slower
| * Add some documantation on new route_key and param_key in ActiveModel::NamingPiotr Sarnacki2010-09-031-0/+16
| |
| * Remove namespace for isolated namespaced models in formsPiotr Sarnacki2010-09-034-6/+101
| |
| * Use new ActiveModel::Naming.route_key in polymorphic_routesPiotr Sarnacki2010-09-032-12/+3
| |
| * Prepared ActiveModel::Naming to handle cases for namespaced isolated enginesPiotr Sarnacki2010-09-033-4/+134
| |
| * Add some more docs on polymorphic_url with routes proxyPiotr Sarnacki2010-09-031-0/+10
| |
| * Add short note on using url_for instead of directly calling named route in ↵Piotr Sarnacki2010-09-031-0/+3
| | | | | | | | polymorphic_url
| * Add possibility to explicitly call engine's routes through ↵Piotr Sarnacki2010-09-033-1/+58
| | | | | | | | polymorphic_routes, for example: polymorphic_url([blog, @post])
| * Updated tests to use scope(:module => :engine_name) instead of namespace and ↵Piotr Sarnacki2010-09-032-23/+28
| | | | | | | | updated mounted engine tests to actually use the namespacing
| * Move RoutesProxy to separate filePiotr Sarnacki2010-09-033-32/+36
| |
| * Include all helpers from non-namespaced enginesPiotr Sarnacki2010-09-034-12/+38
| |
| * Set only helpers_path on inherited hook in action_controller/railtie.rb and ↵Piotr Sarnacki2010-09-035-38/+17
| | | | | | | | use helper(:all) just after that
| * Added more tests for polymorphic_url with namespaced models and implemented ↵Piotr Sarnacki2010-09-032-5/+66
| | | | | | | | missing use cases
| * This was used only to clear warning in ActionMailer tests, it shouldn't be ↵Piotr Sarnacki2010-09-031-5/+0
| | | | | | | | done like that
| * Moved ActionMailer and ActionController railties options to inherited hookPiotr Sarnacki2010-09-035-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 namespacePiotr Sarnacki2010-09-032-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 Sarnacki2010-09-036-17/+29
| | | | | | | | ActionDispatch::Static in initializers
| * We don't need to clear action_methods on inherited hook as they are cleaned ↵Piotr Sarnacki2010-09-031-5/+0
| | | | | | | | on method_added hook
| * ActionMailer should not depend on ActionDispatchPiotr Sarnacki2010-09-033-3/+2
| |
| * Refactor RoutesProxy to avoid using _with_routes in helpersPiotr Sarnacki2010-09-033-4/+10
| |
| * Documented mounted helpersPiotr Sarnacki2010-09-031-0/+29
| |
| * Document engine_namePiotr Sarnacki2010-09-031-0/+16
| |
| * Added documentation for namespaced EnginePiotr Sarnacki2010-09-031-2/+34
| |
| * Add table_name_prefix to Engine's namespace automaticallyPiotr Sarnacki2010-09-033-1/+16
| |
| * Rename isolated_engine_for to namespacePiotr Sarnacki2010-09-032-5/+5
| |
| * Refactor ActionMailer to not use hide_actionsPiotr Sarnacki2010-09-037-69/+40
| |
| * Move ActionController::Railties::RoutesHelpers and ↵Piotr Sarnacki2010-09-034-22/+5
| | | | | | | | ActionMailer::Railties::RoutesHelper to AbstractController::Railties::RoutesHelpers
| * Include routes helpers only for inherited classes in ActionMailerPiotr Sarnacki2010-09-035-27/+67
| |
| * Fix generating urls with mounted helpers in view contextPiotr Sarnacki2010-09-033-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 directoryPiotr Sarnacki2010-09-033-1/+15
| |
| * Include application's helpers and router helpers by default, but include ↵Piotr Sarnacki2010-09-038-4/+182
| | | | | | | | engine's ones for controllers inside isolated namespace
| * For view_context we need to initialize RoutesProxy in context of controller, ↵Piotr Sarnacki2010-09-031-2/+4
| | | | | | | | not view, quick fix, I need to dig into it later
| * mounted helpers should be included in ActionMailerPiotr Sarnacki2010-09-032-1/+3
| |
| * This is not neededPiotr Sarnacki2010-09-031-26/+0
| |
| * Engine's assets are now served with ActionDispatch::StaticPiotr Sarnacki2010-09-033-6/+46
| |