aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-302-4/+4
|\
| * Cosmetic fixes in AM validatations docsAlexey Vakhov2011-11-272-4/+4
| |
* | Revert "Implement ArraySerializer and move old serialization API to a new ↵José Valim2011-11-3012-727/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | namespace." This reverts commit 8896b4fdc8a543157cdf4dfc378607ebf6c10ab0. Conflicts: activemodel/lib/active_model.rb activemodel/lib/active_model/serializable.rb activemodel/lib/active_model/serializer.rb activemodel/test/cases/serializer_test.rb
* | fix method redefined warning in activemodellest2011-11-302-1/+5
| |
* | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵José Valim2011-11-301-1/+1
| | | | | | | | a before callback halts.
* | Deprecated `define_attr_method` in `ActiveModel::AttributeMethods`Jon Leighton2011-11-293-42/+43
| | | | | | | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated.
* | Warning removed unused variableArun Agrawal2011-11-261-1/+1
|/
* 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
|\ \