aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Collapse)AuthorAgeFilesLines
* Change one more place for JSON string to HashRobert Ross2011-10-041-1/+1
|
* Fix as_json doc to say what it actually returns.Robert Ross2011-10-041-1/+1
|
* Class name specified in example is Person, not AttributePerson.Uģis Ozols2011-09-291-3/+3
|
* Make serializable_hash take attr values directly from attributes hash.Jon Leighton2011-09-261-1/+3
| | | | | | | | | | | | Previously, it would use send() to get the attribute. In Active Resource, this would rely on hitting method missing. If a method with the same name was defined further up the ancestor chain, that method would wrongly be called. This change fixes test_to_xml_with_private_method_name_as_attribute in activeresource/test/cases/base_test.rb, which was broken after 51bef9d8fb0b4da7a104425ab8545e9331387743, because that change made to_xml use serializable_hash.
* Refactor AMo as_json.José Valim2011-09-231-9/+5
|
* fixed a bug with the json serialization when the class setting is set to not ↵Matt Aimonetti2011-09-221-12/+10
| | | | include the root, but an instance is serialized with the root option passed as true
* to_xml should also rely on serializable hash.José Valim2011-09-181-31/+15
|
* Generate attribute method unless it's already in the module.Jon Leighton2011-09-141-1/+1
| | | | | | | There's no harm in generating a method name that's already defined on the host class, since we're generating the attribute methods in a module that gets included. In fact, this is desirable as it allows the host class to call super.
* Add an attribute_missing method to ActiveModel::AttributeMethods.Jon Leighton2011-09-131-8/+11
| | | | This can be overloaded by implementors if necessary.
* Avoid double super call in some cases.Jon Leighton2011-09-131-5/+4
| | | | | If super was false earlier, it is still going to be false, so we don't need to call it again at the end of the method.
* Let Ruby deal with method visibility.Jon Leighton2011-09-131-13/+11
| | | | | | Check respond_to_without_attributes? in method_missing. If there is any method that responds (even private), let super handle it and raise NoMethodError if necessary.
* Add deprecation for doing `attribute_method_suffix ''`Jon Leighton2011-09-131-0/+11
|
* refactoringJon Leighton2011-09-131-19/+11
|
* Use an empty AttributeMethodMatcher by default.Jon Leighton2011-09-131-2/+9
| | | | | | This means that attribute methods which don't exist will get generated when define_attribute_methods is called, so we don't have to use hacks like `attribute_method_suffix ''`.
* Add ability to get an individual full error message + test for full_messages.Lawrence Pit2011-09-091-14/+17
|
* add has_key? to ActiveModel::ErrorsDamien Mathieu2011-09-061-0/+1
|
* Add comments about bcrypt-ruby gem to SecurePasswordGuillermo Iguaran2011-09-031-0/+6
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-021-1/+1
|\
| * Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class ↵Josh Nesbitt2011-09-021-1/+1
| | | | | | | | method, not attribute.
* | Remove hard dependency on bcrypt.Guillermo Iguaran2011-09-021-2/+3
|/
* Merge pull request #2563 from bogdan/internal_validationJosé Valim2011-08-2511-6/+42
|\ | | | | Implemented strict validation concept
| * Typo fixBogdan Gusiev2011-08-251-1/+1
| |
| * Implemented strict validation conceptBogdan Gusiev2011-08-1711-6/+42
| | | | | | | | | | | | | | In order to deliver debug information to dev team instead of display error message to end user Implemented strict validation concept that suppose to define validation that always raise exception when fails
* | 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
| |