diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-04 03:28:42 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-04 03:28:42 +0000 |
| commit | b1968708e12972515fdc8eefdcaff95edbebc76b (patch) | |
| tree | 93c179fda5d5428bb12bbdb4332f4450d523f77c /activesupport/lib/active_support/json/encoders/object.rb | |
| parent | a30a1a9d5f06f404421d65393bcf9d73885789cb (diff) | |
| download | rails-b1968708e12972515fdc8eefdcaff95edbebc76b.tar.gz rails-b1968708e12972515fdc8eefdcaff95edbebc76b.tar.bz2 rails-b1968708e12972515fdc8eefdcaff95edbebc76b.zip | |
Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element. Closes #9751.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/json/encoders/object.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/object.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/json/encoders/object.rb b/activesupport/lib/active_support/json/encoders/object.rb index 51852e17cb..6da0d1d1c1 100644 --- a/activesupport/lib/active_support/json/encoders/object.rb +++ b/activesupport/lib/active_support/json/encoders/object.rb @@ -1,10 +1,6 @@ class Object # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info. - # - # Account.find(1).to_json - # => "{attributes: {username: \"foo\", id: \"1\", password: \"bar\"}}" - # - def to_json - ActiveSupport::JSON.encode(instance_values) + def to_json(options = {}) + ActiveSupport::JSON.encode(instance_values, options) end end |