diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-08-05 01:15:57 +0200 |
| commit | 3cbe111439b22f11670587e2ec6779533dd77090 (patch) | |
| tree | 541ec151c0899e21c3bef1c4b7ad9136b42f9b2f /activemodel/lib | |
| parent | ec736dff7b0a05d58d4c8780863afc47e2bb74a3 (diff) | |
| parent | d191db76e04f065e1b0cff3766c818f9b8e2f43a (diff) | |
| download | rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.gz rails-3cbe111439b22f11670587e2ec6779533dd77090.tar.bz2 rails-3cbe111439b22f11670587e2ec6779533dd77090.zip | |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/errors.rb | 4 | ||||
| -rw-r--r-- | activemodel/lib/active_model/serialization.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 05e353ce18..272ddb1554 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -37,11 +37,11 @@ module ActiveModel # send(attr) # end # - # def ErrorsPerson.human_attribute_name(attr, options = {}) + # def Person.human_attribute_name(attr, options = {}) # attr # end # - # def ErrorsPerson.lookup_ancestors + # def Person.lookup_ancestors # [self] # end # diff --git a/activemodel/lib/active_model/serialization.rb b/activemodel/lib/active_model/serialization.rb index 5670ec74cb..e675937f4d 100644 --- a/activemodel/lib/active_model/serialization.rb +++ b/activemodel/lib/active_model/serialization.rb @@ -61,6 +61,8 @@ module ActiveModel # person.serializable_hash # => {"name"=>"Bob"} # person.to_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> . module Serialization def serializable_hash(options = nil) options ||= {} |