From 4b07bc84759d2accfaa90f135d169261bc2ff32d Mon Sep 17 00:00:00 2001
From: James Miller <bensie@gmail.com>
Date: Wed, 25 Aug 2010 15:23:21 -0700
Subject: to_json => as_json

---
 activemodel/lib/active_model/serialization.rb    |  4 ++--
 activemodel/lib/active_model/serializers/json.rb | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'activemodel')

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> .
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb
index cf1c4a0fed..c9271ed9b4 100644
--- a/activemodel/lib/active_model/serializers/json.rb
+++ b/activemodel/lib/active_model/serializers/json.rb
@@ -19,16 +19,16 @@ module ActiveModel
       # passed through +options+.
       #
       # The option <tt>include_root_in_json</tt> controls the top-level behavior
-      # of +to_json+. If true (the default) +to_json+ will emit a single root
+      # of +as_json+. If true (the default) +as_json+ will emit a single root
       # node named after the object's type. For example:
       #
       #   konata = User.find(1)
-      #   konata.to_json
+      #   konata.as_json
       #   # => { "user": {"id": 1, "name": "Konata Izumi", "age": 16,
       #                   "created_at": "2006/08/01", "awesome": true} }
       #
       #   ActiveRecord::Base.include_root_in_json = false
-      #   konata.to_json
+      #   konata.as_json
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true}
       #
@@ -39,29 +39,29 @@ module ActiveModel
       # attributes. For example:
       #
       #   konata = User.find(1)
-      #   konata.to_json
+      #   konata.as_json
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true}
       #
       # The <tt>:only</tt> and <tt>:except</tt> options can be used to limit the attributes
       # included, and work similar to the +attributes+ method. For example:
       #
-      #   konata.to_json(:only => [ :id, :name ])
+      #   konata.as_json(:only => [ :id, :name ])
       #   # => {"id": 1, "name": "Konata Izumi"}
       #
-      #   konata.to_json(:except => [ :id, :created_at, :age ])
+      #   konata.as_json(:except => [ :id, :created_at, :age ])
       #   # => {"name": "Konata Izumi", "awesome": true}
       #
       # To include the result of some method calls on the model use <tt>:methods</tt>:
       #
-      #   konata.to_json(:methods => :permalink)
+      #   konata.as_json(:methods => :permalink)
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true,
       #         "permalink": "1-konata-izumi"}
       #
       # To include associations use <tt>:include</tt>:
       #
-      #   konata.to_json(:include => :posts)
+      #   konata.as_json(:include => :posts)
       #   # => {"id": 1, "name": "Konata Izumi", "age": 16,
       #         "created_at": "2006/08/01", "awesome": true,
       #         "posts": [{"id": 1, "author_id": 1, "title": "Welcome to the weblog"},
@@ -69,7 +69,7 @@ module ActiveModel
       #
       # Second level and higher order associations work as well:
       #
-      #   konata.to_json(:include => { :posts => {
+      #   konata.as_json(:include => { :posts => {
       #                                  :include => { :comments => {
       #                                                :only => :body } },
       #                                  :only => :title } })
-- 
cgit v1.2.3