Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

This merge removes the deprecated routes mapper from Rails and update its tests.

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Deleted test with extended regexp - it fails with no reason, probably rack-mount is doing something weird with that regexp

They were broken after rebase/merge

If we want to have this - we have to change Rack::Mount source

I've removed assertions with @routes.generate(:use_route => ...). I'm not 100% sure if not supporting :use_route in new router is intentional or it should rather be supported and backported from 2.3.x.

If it's unused there's no reason to keep it commented. It will always remain in git history, so removing it.

Ported missing functionality from Rails 2.3.x, raise error on wrong regexps in :constraints in routes

Added route which matches all: controller, action, id and format

Revert "Extended default route for match in tests - now it matches controller, action, id and format if given."

This reverts commit 05e9d0df0dea68ca4655aa8723c3ee69049fac78.

Extended default route for match in tests - now it matches controller, action, id and format if given.

This fixes url_for tests

[5528 state:committed]

[5528]
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

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: NSantiago Pastorino <santiago@wyeworks.com>