- as_json in ActiveModel should return a hash
  and handle :only/:except/:methods options
- Array and Hash should call as_json on their elements
- json methods should not modify options argument

[#5374 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.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>

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