aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-182-9/+77
|\ | | | | ActiveModel support for the :include serialization option
| * ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-172-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves support for the :include serialization option for serializing associated objects out of ActiveRecord in into ActiveModel. The following methods support the :include option: * serializable_hash * to_json * to_xml Instances must respond to methods named by the values of the :includes array (or keys of the :includes hash). If an association method returns an object that is_a?(Enumerable) (which AR has_many associations do), it is assumed to be a collection association, and its elements must respond to :serializable_hash. Otherwise it must respond to :serializable_hash itself. While here, fix #858, XmlSerializer should not singularize already singular association names.
| * Replace map+compact with selectJohn Firebaugh2011-07-171-1/+1
| |
| * serializable_hash(:only => [], :methods => [:foo]) should workJohn Firebaugh2011-07-171-7/+4
| |
* | Made attribute_method_matchers_cache private + docLawrence Pit2011-07-171-3/+13
| |
* | Issue #2075 Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-161-9/+17
| |
* | Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-151-2/+5
|/
* Enable passing root: false to #to_jsonJoe Fiorini2011-07-011-5/+17
|
* Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
|
* changing an attribute multiple times retains the correct original valueIan Stewart2011-06-281-1/+1
|
* Minor formating fixAlexander Uvarov2011-06-241-2/+2
|
* Follow rails convention by using Array.wrapAlexander Uvarov2011-06-231-2/+3
|
* Allow to specify mass-assignment roles as arrayAlexander Uvarov2011-06-231-2/+8
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-181-1/+1
|\
| * Remove trailing whitespacesGuillermo Iguaran2011-06-121-1/+1
| |
* | Get rid of the alternate namespace lookup.José Valim2011-06-112-7/+5
|/
* Brought back alternative convention for namespaced models in i18n.thoefer2011-06-082-5/+7
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-064-16/+16
|\ | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * fix incorrect outputVijay Dev2011-06-041-1/+1
| |
| * use clearer variable name in examplesVijay Dev2011-06-042-12/+12
| |
| * remove stray (Vijay Dev2011-06-031-1/+1
| |
| * Change hashrocket spacing to match conventions.Ben Orenstein2011-06-021-2/+2
| |
* | Don't add .rb in requiresGuillermo Iguaran2011-05-312-2/+2
| |
* | no need for .rbDamien Mathieu2011-05-311-1/+1
| |
* | string inflections are needed for running tests in isolationDamien Mathieu2011-05-311-0/+1
| |
* | Transform the symbol into a constant lookup.José Valim2011-05-312-25/+28
| |
* | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-302-7/+35
| | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option
* | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-263-14/+32
|\ \ | |/ |/| MassAssignmentSecurity: add ability to specify your own sanitizer
| * MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-263-14/+32
| | | | | | | | | | | | Added an ability to specify your own behavior on mass assingment protection, controlled by option: ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2513-24/+24
|\ \ | |/ |/| | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb
| * Remove extra white spaces on ActiveModel docs.Sebastian Martinez2011-05-2313-24/+24
| |
* | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
| | | | | | Only one space is needed, yo!
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
| |
* | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
| |
* | Specify the name to be used for ActiveModel::Name fixes #1168Yves Senn2011-05-201-2/+3
| | | | | | | | This patch allows to specify the name of your models independent of the class name.
* | Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
|/
* Attributes with :string type should not be given the type passed in model ↵Jim Herzberg2011-05-181-1/+1
| | | | serialization options. Closes #1058
* Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
|
* Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵Akira Matsuda2011-05-161-2/+2
| | | | it only when needed.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-4/+4
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * Improve doc styles for ActiveModel::ConversionSebastian Martinez2011-05-041-4/+4
| |
* | Methods that return nil should not be considered YAMLJoshua Wehner2011-05-101-0/+1
| |
* | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵Josh Kalderimis2011-05-081-23/+23
| | | | | | | | security guide
* | Add documentation for new observer enable/disable feature.Myron Marston2011-05-062-3/+51
| |
* | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
|/
* Improved ActiveModel Observing docs.Sebastian Martinez2011-04-301-2/+4
|
* Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-293-4/+4
|\
| * Rephrased Dirty#changed? docsSebastian Martinez2011-04-261-1/+1
| |
| * Removed extra whitespaceSebastian Martinez2011-04-261-1/+1
| |
| * Better formatting on ActiveModel::TranslationSebastian Martinez2011-04-261-2/+2
| |