aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-261-1/+1
|\ \
| * | Small docs fix in Active Model callbacks moduleAlexey Vakhov2011-11-191-1/+1
| | |
* | | Revert the serializers API as other alternatives are now also under discussionJosé Valim2011-11-254-448/+0
| | |
* | | Merge branch 'serializers'José Valim2011-11-2513-425/+1178
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides. From José and Yehuda with love. Conflicts: railties/CHANGELOG.md
| * | | Add docs to serializers. Update CHANGELOGs.José Valim2011-11-252-8/+84
| | | |
| * | | Rename UserSerializer to DefaultUserSerializer in tests.José Valim2011-11-231-15/+13
| | | |
| * | | Rely solely on active_model_serializer and remove the fancy constant lookup.José Valim2011-11-233-77/+17
| | | |
| * | | Implement ArraySerializer and move old serialization API to a new namespace.José Valim2011-11-2312-428/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following constants were renamed: ActiveModel::Serialization => ActiveModel::Serializable ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON ActiveModel::Serializers::Xml => ActiveModel::Serializable::XML The main motivation for such a change is that `ActiveModel::Serializers::JSON` was not actually a serializer, but a module that when included allows the target to be serializable to JSON. With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
| * | | Merge branch 'master' into serializersJosé Valim2011-11-2318-207/+322
| |\ \ \
| * | | | Remove 1.9 Hash syntax - tests passing on 1.8.7Jose and Yehuda2011-10-151-3/+3
| | | | |
| * | | | Add initial support for embed APIJose and Yehuda2011-10-152-7/+101
| | | | |
| * | | | Add support for the root attributeJose and Yehuda2011-10-152-15/+74
| | | | |
| * | | | Fix nil has_one associationJose and Yehuda2011-10-152-2/+20
| | | | |
| * | | | Add association_idsJose and Yehuda2011-10-152-2/+89
| | | | |
| * | | | Add support for overriding associations, mostly used for authorizationJose and Yehuda2011-10-152-1/+31
| | | | |
| * | | | Add support for implicit serializersJose and Yehuda2011-10-152-26/+72
| | | | |
| * | | | Added has_one and has_manyJose and Yehuda2011-10-152-14/+123
| | | | |
| * | | | Don't require serializable_hash to take options.Jose and Yehuda2011-10-152-3/+3
| | | | |
| * | | | Initial implementation of ActiveModel::SerializerJose and Yehuda2011-10-153-0/+122
| | | | |
* | | | | make ActiveModel::Name fail gracefully with anonymous classesJakub Kuźma2011-11-242-0/+16
| |/ / / |/| | |
* | | | Rely on a public contract between railties instead of accessing railtie ↵José Valim2011-11-233-21/+49
| |/ / |/| | | | | | | | methods directly.
* | | Update variable's name in the test case to reflect the class we're testingPrem Sichanugrist2011-11-183-24/+24
| | |
* | | Speed up attribute invocation by checking if both name and calls are compilable.José Valim2011-11-141-27/+32
| | |
* | | use any? instead of !empty?Oscar Del Ben2011-11-141-1/+1
| | |
* | | Fix a tiny typo in custom validators documentationJean Boussier2011-11-101-1/+1
| | |
* | | replaced remove and define method calls to :redefineAnand2011-11-071-2/+1
| | |
* | | Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel"Jon Leighton2011-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda. Reason: build failure.
* | | Merge pull request #2378 from cesario/remove_warnings_activemodelVijay Dev2011-11-051-0/+1
|\ \ \ | | | | | | | | Remove warnings by calling remove_method
| * | | Remove warnings by calling remove_methodFranck Verrot2011-07-311-0/+1
| | | |
* | | | Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.mdFranck Verrot2011-11-041-1/+1
| | | |
* | | | Convert CHANGELOGs to Markdown format.Jon Leighton2011-11-042-109/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasons: * Markdown reads well as plain text, but can also be formatted. * It will make it easier for people to read on the web as Github formats the Markdown nicely. * It will encourage a level of consistency when people are writing CHANGELOG entries. The script used to perform the conversion is at https://gist.github.com/1339263
* | | | correct documentation on initialize method to accept a single parameterbradrobertson2011-10-261-1/+1
| | | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-201-3/+2
|\ \ \ \
| * | | | Removed mention of deprecated ActiveModel::Errors#onMartin Svalin2011-10-191-3/+2
| | |/ / | |/| |
* | | | New #added? method on ActiveModel::ErrorsMartin Svalin2011-10-193-7/+68
| | | | | | | | | | | | The #added? method makes it possible to check if a specific error has been added, using the same parameters as for #add.
* | | | use variables from test setupVijay Dev2011-10-171-6/+4
| | | |
* | | | fix a typo and slightly reword has_secure_password commentVijay Dev2011-10-171-2/+2
| | | |
* | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases ↵Martin Svalin2011-10-172-4/+29
|/ / / | | | | | | | | | for #add
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-143-6/+6
|\ \ \
| * | | Use .add instead of << to add errorsEvgeniy Dolzhenko2011-10-113-6/+6
| | | |
* | | | Fixed serialization issues with multiple includes with optionszhengjia2011-10-112-1/+9
|/ / /
* | | One of the activemodel naming tests wasn't asserting anything.Uģis Ozols2011-10-071-1/+1
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-10-052-5/+5
|\ \ \
| * | | 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
| | | |
* | | | Provide read_attribute_for_serialization as the API to serialize attributes.José Valim2011-09-302-5/+26
| | | |
* | | | Fixing `as_json` method for ActiveRecord models.Nicolás Hock Isaza2011-09-291-0/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you've got an AR Model and you override the `as_json` method, you should be able to add default options to the renderer, like this: class User < ActiveRecord::Base def as_json(options = {}) super(options.merge(:except => [:password_digest])) end end This was not possible before this commit. See the added test case.
* | | Make serializable_hash take attr values directly from attributes hash.Jon Leighton2011-09-262-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |