diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-26 13:45:27 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-26 13:45:27 -0200 |
commit | 13cb45452a12d03f07255931b9b4ea050c1b0644 (patch) | |
tree | c4be96dd93ad23bc1cb3232c7d2bfe2df268e270 | |
parent | 25b14b4d3238d5474c60826ee1b359537af987ef (diff) | |
parent | f78006d6563ce4128a04be2fea5122f367957833 (diff) | |
download | rails-13cb45452a12d03f07255931b9b4ea050c1b0644.tar.gz rails-13cb45452a12d03f07255931b9b4ea050c1b0644.tar.bz2 rails-13cb45452a12d03f07255931b9b4ea050c1b0644.zip |
Merge pull request #17691 from nickveys/from-json-docs
Documentation regression in JSON#from_json
-rw-r--r-- | activemodel/lib/active_model/serializers/json.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/lib/active_model/serializers/json.rb b/activemodel/lib/active_model/serializers/json.rb index 77f2a64b11..b66dbf1afe 100644 --- a/activemodel/lib/active_model/serializers/json.rb +++ b/activemodel/lib/active_model/serializers/json.rb @@ -130,10 +130,10 @@ module ActiveModel # # json = { person: { name: 'bob', age: 22, awesome:true } }.to_json # person = Person.new - # person.from_json(json) # => #<Person:0x007fec5e7a0088 @age=22, @awesome=true, @name="bob"> - # person.name # => "bob" - # person.age # => 22 - # person.awesome # => true + # person.from_json(json, true) # => #<Person:0x007fec5e7a0088 @age=22, @awesome=true, @name="bob"> + # person.name # => "bob" + # person.age # => 22 + # person.awesome # => true def from_json(json, include_root=include_root_in_json) hash = ActiveSupport::JSON.decode(json) hash = hash.values.first if include_root |