Remove ActiveSupport::JSON engine and bundle OkJson #10

Merged
merged 2 commits into from Apr 14, 2011

Projects

None yet

3 participants

@sstephenson

This patch:

  1. Removes the ActiveSupport::JSON engine so that Rails 3.1 can avoid a circular dependency when the Sprockets and ExecJS libraries require MultiJSON. (As the original author of ActiveSupport::JSON, I'll also be pushing for Rails to remove it and defer to MultiJSON instead.)
  2. Bundles the OkJson library and adds an Okjson engine that will be used if no other engines are available.
@sstephenson

This should also close #7 and #8, since at least one engine will always be available.

@josh

I'm down for making AS::JSON delegate to MultiJSON

@joshk joshk merged commit e89093c into intridea:master Apr 14, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment