Changeset 9202

Timestamp:

04/01/08 20:09:45 (8 months ago)

Author:

rick

Message:

Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {post: {title: ...}} [rick]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/serializers/json_serializer.rb (modified) (3 diffs)
• trunk/activerecord/test/cases/json_serialization_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} [rick]
+
+  Post.find(1).to_json # => {"title": ...}
+  config.active_record.include_root_in_json = true
+  Post.find(1).to_json # => {"post": {"title": ...}}
-
-* Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm).  [stopdropandrew]

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

@@ -1 +1 @@
-module ActiveRecord #:nodoc:
-  module Serialization
+    def self.included(base)
+      base.cattr_accessor :include_root_in_json, :instance_writer => false
+      base.extend ClassMethods
+    end
+
-    # Returns a JSON string representing the model. Some configuration is
-    # available through +options+.
@@ -49 +54 @@
-    #                    "title": "So I was thinking"}]}
-    def to_json(options = {})
-
+
+
+
+
+
-    end
-
@@ -62 +71 @@
-      end
-    end
+
+    module ClassMethods
+      def json_class_name
+        @json_class_name ||= name.demodulize.underscore.inspect
+      end
+    end
-  end
-end

trunk/activerecord/test/cases/json_serialization_test.rb

@@ -8 +8 @@
-
-class JsonSerializationTest < ActiveRecord::TestCase
+  class NamespacedContact < Contact
+    column :name,        :string
+  end
+
-  def setup
-    @contact = Contact.new(
@@ -17 +21 @@
-      :preferences => { :shows => 'anime' }
-    )
+  end
+
+  def test_should_demodulize_root_in_json
+    NamespacedContact.include_root_in_json = true
+    @contact = NamespacedContact.new :name => 'whatever'
+    json = @contact.to_json
+    assert_match %r{^\{"namespaced_contact": \{}, json
+  end
+
+  def test_should_include_root_in_json
+    Contact.include_root_in_json = true
+    json = @contact.to_json
+
+    assert_match %r{^\{"contact": \{}, json
+    assert_match %r{"name": "Konata Izumi"}, json
+    assert_match %r{"age": 16}, json
+    assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
+    assert_match %r{"awesome": true}, json
+    assert_match %r{"preferences": \{"shows": "anime"\}}, json
+  ensure
+    Contact.include_root_in_json = false
-  end
-