aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/serialization.rb
diff options
context:
space:
mode:
authorJames Miller <bensie@gmail.com>2010-08-25 15:23:21 -0700
committerJames Miller <bensie@gmail.com>2010-08-25 15:23:21 -0700
commit4b07bc84759d2accfaa90f135d169261bc2ff32d (patch)
tree533d40c3f3a2a11bc90b6be45f2efbe6d494b5ef /activemodel/lib/active_model/serialization.rb
parent7a6d8e4ad47d571541762a6c80cc3e1f6831bd40 (diff)
downloadrails-4b07bc84759d2accfaa90f135d169261bc2ff32d.tar.gz
rails-4b07bc84759d2accfaa90f135d169261bc2ff32d.tar.bz2
rails-4b07bc84759d2accfaa90f135d169261bc2ff32d.zip
to_json => as_json
Diffstat (limited to 'activemodel/lib/active_model/serialization.rb')
-rw-r--r--activemodel/lib/active_model/serialization.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb
index d4c6c15e01..542cff3aaa 100644
--- a/activemodel/lib/active_model/serialization.rb
+++ b/activemodel/lib/active_model/serialization.rb
@@ -54,12 +54,12 @@ module ActiveModel
#
# person = Person.new
# person.serializable_hash # => {"name"=>nil}
- # person.to_json # => "{\"name\":null}"
+ # person.as_json # => "{\"name\":null}"
# person.to_xml # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
#
# person.name = "Bob"
# person.serializable_hash # => {"name"=>"Bob"}
- # person.to_json # => "{\"name\":\"Bob\"}"
+ # person.as_json # => "{\"name\":\"Bob\"}"
# person.to_xml # => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<serial-person...
#
# Valid options are <tt>:only</tt>, <tt>:except</tt> and <tt>:methods</tt> .