Changeset 7905

Timestamp:

10/15/07 07:04:10 (7 months ago)

Author:

nzkoz

Message:

Fix Json related documentation for render and the AR serializer. Closes #9814. Closes #9833. [chuyeow]

Files:

• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/mime_type.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/serializers/json_serializer.rb (modified) (1 diff)

trunk/actionpack/lib/action_controller/base.rb

@@ -749 +749 @@
-      # === Rendering JSON
-      #
-text/x-
-eval'd
-
-name
+application/
+parsed (or eval'd)
+
+"name"
-      #   render :json => {:name => "David"}.to_json
-      #
+      # It's not necessary to call <tt>to_json</tt> on the object you want to render, since <tt>render</tt> will
+      # automatically do that for you:
+      #
+      #   # Also renders '{"name": "David"}'
+      #   render :json => {:name => "David"}
+      #
-      # Sometimes the result isn't handled directly by a script (such as when the request comes from a SCRIPT tag),
-callback
-
-name
+<tt>:callback</tt>
+
+"name"
-      #   render :json => {:name => "David"}.to_json, :callback => 'show'
-      #

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -53 +53 @@
-      end
-
-
+e
-      # rendering different HTML versions depending on the user agent, like an iPhone.
-      def register_alias(string, symbol, extension_synonyms = [])

trunk/activerecord/lib/active_record/serializers/json_serializer.rb

@@ -1 +1 @@
-module ActiveRecord #:nodoc:
-  module Serialization
+    # Returns a JSON string representing the model. Some configuration is
+    # available through +options+.
+    #
+    # Without any +options+, the returned JSON string will include all
+    # the model's attributes. For example:
+    #
+    #   konata = User.find(1)
+    #   konata.to_json
+    #
+    #   {"id": 1, "name": "Konata Izumi", "age": 16,
+    #    "created_at": "2006/08/01", "awesome": true}
+    #
+    # The :only and :except options can be used to limit the attributes
+    # included, and work similar to the #attributes method. For example:
+    #
+    #   konata.to_json(:only => [ :id, :name ])
+    #
+    #   {"id": 1, "name": "Konata Izumi"}
+    #
+    #   konata.to_json(:except => [ :id, :created_at, :age ])
+    #
+    #   {"name": "Konata Izumi", "awesome": true}
+    #
+    # To include any methods on the model, use :methods.
+    #
+    #   konata.to_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 :include.
+    #
+    #   konata.to_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"},
+    #              {"id": 2, author_id: 1, "title": "So I was thinking"}]}
+    #
+    # 2nd level and higher order associations work as well:
+    #
+    #   konata.to_json(:include => { :posts => {
+    #                                  :include => { :comments => {
+    #                                                :only => :body } },
+    #                                  :only => :title } })
+    #
+    #   {"id": 1, "name": "Konata Izumi", "age": 16,
+    #    "created_at": "2006/08/01", "awesome": true,
+    #    "posts": [{"comments": [{"body": "1st post!"}, {"body": "Second!"}],
+    #               "title": "Welcome to the weblog"},
+    #              {"comments": [{"body": "Don't think too hard"}],
+    #               "title": "So I was thinking"}]}
-    def to_json(options = {})
-      JsonSerializer.new(self, options).to_s