From e3d6d10e1ff669430c3d8678c196c52397c850ea Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 28 Jun 2009 20:16:06 -0500 Subject: Ensure JSON serializer includes model naming --- activemodel/lib/active_model/serializers/json.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activemodel/lib/active_model/serializers/json.rb') diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 60b5cbe948..440fe47e34 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -10,6 +10,8 @@ module ActiveModel include ActiveModel::Attributes included do + extend ActiveModel::Naming + cattr_accessor :include_root_in_json, :instance_writer => false end -- cgit v1.2.3 From d2b78b3594b9cc9870e6a6ebfeb2e56d00e6ddb8 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 28 Jun 2009 22:12:10 -0500 Subject: Initial extraction of AMo xml serializer --- activemodel/lib/active_model/serializers/json.rb | 34 +++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'activemodel/lib/active_model/serializers/json.rb') diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 440fe47e34..0636e8c330 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -1,7 +1,5 @@ require 'active_support/json' require 'active_support/core_ext/class/attribute_accessors' -require 'active_support/core_ext/hash/except' -require 'active_support/core_ext/hash/slice' module ActiveModel module Serializers @@ -15,26 +13,32 @@ module ActiveModel cattr_accessor :include_root_in_json, :instance_writer => false end - def encode_json(encoder) - options = encoder.options || {} - - hash = if options[:only] - only = Array.wrap(options[:only]).map { |attr| attr.to_s } - attributes.slice(*only) - elsif options[:except] - except = Array.wrap(options[:except]).map { |attr| attr.to_s } - attributes.except(*except) - else - attributes + class Serializer < ActiveModel::Serializer + def serializable_hash + model = super + if @serializable.include_root_in_json + model = { @serializable.class.model_name.element => model } + end + model + end + + def serialize + ActiveSupport::JSON.encode(serializable_hash) end + end - hash = { self.class.model_name.element => hash } if include_root_in_json - ActiveSupport::JSON.encode(hash) + def encode_json(encoder) + Serializer.new(self, encoder.options).to_s end def as_json(options = nil) self end + + def from_json(json) + self.attributes = ActiveSupport::JSON.decode(json) + self + end end end end -- cgit v1.2.3 From 783db25e0c640c1588732967a87d65c10fddc08e Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Fri, 3 Jul 2009 23:12:42 -0500 Subject: Integrate AMo JSON serializer into AR --- activemodel/lib/active_model/serializers/json.rb | 73 ++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 4 deletions(-) (limited to 'activemodel/lib/active_model/serializers/json.rb') diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 0636e8c330..adf200597d 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -16,10 +16,9 @@ module ActiveModel class Serializer < ActiveModel::Serializer def serializable_hash model = super - if @serializable.include_root_in_json - model = { @serializable.class.model_name.element => model } - end - model + @serializable.include_root_in_json ? + { @serializable.class.model_name.element => model } : + model end def serialize @@ -27,6 +26,72 @@ module ActiveModel end end + # Returns a JSON string representing the model. Some configuration is + # available through +options+. + # + # The option ActiveRecord::Base.include_root_in_json controls the + # top-level behavior of to_json. In a new Rails application, it is set to + # true in initializers/new_rails_defaults.rb. When it is true, + # to_json will emit a single root node named after the object's type. For example: + # + # konata = User.find(1) + # ActiveRecord::Base.include_root_in_json = true + # konata.to_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 + # # => {"id": 1, "name": "Konata Izumi", "age": 16, + # "created_at": "2006/08/01", "awesome": true} + # + # The remainder of the examples in this section assume include_root_in_json is set to + # false. + # + # 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 encode_json(encoder) Serializer.new(self, encoder.options).to_s end -- cgit v1.2.3