diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-06-17 21:27:36 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-06-17 21:27:54 -0500 |
| commit | fbdf706fffbfb17731a1f459203d242414ef5086 (patch) | |
| tree | a769e35c939d59241a607a41503cf73c3b5acb62 /activesupport | |
| parent | af5301089f38b9aad9a92424d5fa8f9a9b27c4e1 (diff) | |
| download | rails-fbdf706fffbfb17731a1f459203d242414ef5086.tar.gz rails-fbdf706fffbfb17731a1f459203d242414ef5086.tar.bz2 rails-fbdf706fffbfb17731a1f459203d242414ef5086.zip | |
Add basic JSON serializer to AMo
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index b4e4177724..356b6cebeb 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/module/attribute_accessors' +require 'active_support/core_ext/module/delegation' module ActiveSupport # Look for and parse json strings that look like ISO 8601 times. diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index 907094a747..068b58b997 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -4,6 +4,11 @@ require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/object/instance_variables' require 'active_support/deprecation' +require 'active_support/core_ext/date_time/conversions' +require 'active_support/core_ext/time/conversions' +require 'active_support/time_with_zone' +require 'active_support/values/time_zone' + # Hack to load json gem first so we can overwrite its to_json. begin require 'json' |