aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
* added missing require array/wrap in serializationAnand2011-08-231-0/+2
|
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-161-1/+1
|\
| * fix misleading comment (originally made by Tate Johnson, we lost this commit ↵Vijay Dev2011-08-141-1/+1
| | | | | | | | while porting to the rails repo)
* | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
| * Fixed typoTate Johnson2011-08-131-1/+1
| |
| * MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-08-131-0/+5
| | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception.
| * Rename new method to_path to to_partial_path to avoid conflicts with ↵José Valim2011-08-133-10/+10
| | | | | | | | File#to_path and similar.
| * Rename class method to_path to _to_path and make it explicit that it is an ↵José Valim2011-08-131-3/+5
| | | | | | | | internal method.
| * Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-08-133-5/+39
| | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances.
| * Handle the empty array correctly.thedarkone2011-08-131-1/+1
| |
* | Allow ActiveRecord observers to be disabled.Myron Marston2011-08-121-2/+2
| | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
* | Merge pull request #2385 from bogdan/test_default_sanitizer2José Valim2011-08-011-0/+5
|\ \ | | | | | | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer
| * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-07-281-0/+5
| | | | | | | | | | | | | | | | | | In order to use StrictSanitizer in test mode Consider :id as not sensetive attribute that can be filtered from mass assignement without exception.
* | | Rename new method to_path to to_partial_path to avoid conflicts with ↵José Valim2011-08-013-10/+10
| | | | | | | | | | | | File#to_path and similar.
* | | Rename class method to_path to _to_path and make it explicit that it is an ↵José Valim2011-07-281-3/+5
| | | | | | | | | | | | internal method.
* | | Merge pull request #2034 from Casecommons/to_pathJosé Valim2011-07-283-5/+39
|\ \ \ | | | | | | | | Allow ActiveModel-compatible instances to define their own partial paths
| * | | Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-253-5/+39
| |/ / | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances.
* | | Merge pull request #2305 from thedarkone/errors-includeSantiago Pastorino2011-07-271-1/+1
|\ \ \ | |_|/ |/| | Improve AM::Errors#include?
| * | Handle the empty array correctly.thedarkone2011-07-271-1/+1
| |/
* / Fix example code for #validates_with instance methodBen Marini2011-07-241-2/+2
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\
| * Documentation fix: adding missing equal sign in code sample for ↵Sebastian Gassner2011-07-201-1/+1
| | | | | | | | ActiveModel::Dirty.
* | 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