Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #195 from bigfix/active_model_include_serialization | José Valim | 2011-07-18 | 2 | -9/+77 |
|\ | | | | | ActiveModel support for the :include serialization option | ||||
| * | ActiveModel support for the :include serialization option | John Firebaugh | 2011-07-17 | 2 | -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 select | John Firebaugh | 2011-07-17 | 1 | -1/+1 |
| | | |||||
| * | serializable_hash(:only => [], :methods => [:foo]) should work | John Firebaugh | 2011-07-17 | 1 | -7/+4 |
| | | |||||
* | | Made attribute_method_matchers_cache private + doc | Lawrence Pit | 2011-07-17 | 1 | -3/+13 |
| | | |||||
* | | Issue #2075 Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-16 | 1 | -9/+17 |
| | | |||||
* | | Optimization of ActiveModel's match_attribute_method? | Lawrence Pit | 2011-07-15 | 1 | -2/+5 |
|/ | |||||
* | Enable passing root: false to #to_json | Joe Fiorini | 2011-07-01 | 1 | -5/+17 |
| | |||||
* | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 |
| | |||||
* | changing an attribute multiple times retains the correct original value | Ian Stewart | 2011-06-28 | 1 | -1/+1 |
| | |||||
* | Minor formating fix | Alexander Uvarov | 2011-06-24 | 1 | -2/+2 |
| | |||||
* | Follow rails convention by using Array.wrap | Alexander Uvarov | 2011-06-23 | 1 | -2/+3 |
| | |||||
* | Allow to specify mass-assignment roles as array | Alexander Uvarov | 2011-06-23 | 1 | -2/+8 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 1 | -1/+1 |
|\ | |||||
| * | Remove trailing whitespaces | Guillermo Iguaran | 2011-06-12 | 1 | -1/+1 |
| | | |||||
* | | Get rid of the alternate namespace lookup. | José Valim | 2011-06-11 | 2 | -7/+5 |
|/ | |||||
* | Brought back alternative convention for namespaced models in i18n. | thoefer | 2011-06-08 | 2 | -5/+7 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 4 | -16/+16 |
|\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | ||||
| * | fix incorrect output | Vijay Dev | 2011-06-04 | 1 | -1/+1 |
| | | |||||
| * | use clearer variable name in examples | Vijay Dev | 2011-06-04 | 2 | -12/+12 |
| | | |||||
| * | remove stray ( | Vijay Dev | 2011-06-03 | 1 | -1/+1 |
| | | |||||
| * | Change hashrocket spacing to match conventions. | Ben Orenstein | 2011-06-02 | 1 | -2/+2 |
| | | |||||
* | | Don't add .rb in requires | Guillermo Iguaran | 2011-05-31 | 2 | -2/+2 |
| | | |||||
* | | no need for .rb | Damien Mathieu | 2011-05-31 | 1 | -1/+1 |
| | | |||||
* | | string inflections are needed for running tests in isolation | Damien Mathieu | 2011-05-31 | 1 | -0/+1 |
| | | |||||
* | | Transform the symbol into a constant lookup. | José Valim | 2011-05-31 | 2 | -25/+28 |
| | | |||||
* | | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method | Bogdan Gusiev | 2011-05-30 | 2 | -7/+35 |
| | | | | | | | | | | In order to specify your own sanitize method Implemented .mass_assignment_sanitizer configuration option | ||||
* | | Merge pull request #1334 from bogdan/callback | José Valim | 2011-05-26 | 3 | -14/+32 |
|\ \ | |/ |/| | MassAssignmentSecurity: add ability to specify your own sanitizer | ||||
| * | MassAssignmentSecurity: add ability to specify your own sanitizer | Bogdan Gusiev | 2011-05-26 | 3 | -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/docrails | Xavier Noria | 2011-05-25 | 13 | -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 Martinez | 2011-05-23 | 13 | -24/+24 |
| | | |||||
* | | Remove superfluous whitespace from ActiveModel::SecurePassword | Daniel Schierbeck | 2011-05-22 | 1 | -1/+1 |
| | | | | | | Only one space is needed, yo! | ||||
* | | Bump versions for rc1 | David Heinemeier Hansson | 2011-05-21 | 1 | -1/+1 |
| | | |||||
* | | ActionMailer deliver method Documentation corrected Ticket #761 | Ganesh Kumar | 2011-05-21 | 1 | -1/+1 |
| | | |||||
* | | Specify the name to be used for ActiveModel::Name fixes #1168 | Yves Senn | 2011-05-20 | 1 | -2/+3 |
| | | | | | | | | This patch allows to specify the name of your models independent of the class name. | ||||
* | | Prefer each instead of for in | Guillermo Iguaran | 2011-05-19 | 1 | -3/+1 |
|/ | |||||
* | Attributes with :string type should not be given the type passed in model ↵ | Jim Herzberg | 2011-05-18 | 1 | -1/+1 |
| | | | | serialization options. Closes #1058 | ||||
* | Remove unneeded merge with default false options | Akira Matsuda | 2011-05-16 | 1 | -4/+0 |
| | |||||
* | Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use ↵ | Akira Matsuda | 2011-05-16 | 1 | -2/+2 |
| | | | | it only when needed. | ||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-14 | 1 | -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::Conversion | Sebastian Martinez | 2011-05-04 | 1 | -4/+4 |
| | | |||||
* | | Methods that return nil should not be considered YAML | Joshua Wehner | 2011-05-10 | 1 | -0/+1 |
| | | |||||
* | | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵ | Josh Kalderimis | 2011-05-08 | 1 | -23/+23 |
| | | | | | | | | security guide | ||||
* | | Add documentation for new observer enable/disable feature. | Myron Marston | 2011-05-06 | 2 | -3/+51 |
| | | |||||
* | | Prepare for beta1 | David Heinemeier Hansson | 2011-05-04 | 1 | -1/+1 |
|/ | |||||
* | Improved ActiveModel Observing docs. | Sebastian Martinez | 2011-04-30 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Dan Pickett | 2011-04-29 | 3 | -4/+4 |
|\ | |||||
| * | Rephrased Dirty#changed? docs | Sebastian Martinez | 2011-04-26 | 1 | -1/+1 |
| | | |||||
| * | Removed extra whitespace | Sebastian Martinez | 2011-04-26 | 1 | -1/+1 |
| | | |||||
| * | Better formatting on ActiveModel::Translation | Sebastian Martinez | 2011-04-26 | 1 | -2/+2 |
| | |