Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -4/+4 | |
|\ \ \ | ||||||
| * | | | Cosmetic fixes in AM validatations docs | Alexey Vakhov | 2011-11-27 | 2 | -4/+4 | |
| | | | | ||||||
* | | | | Revert "Implement ArraySerializer and move old serialization API to a new ↵ | José Valim | 2011-11-30 | 12 | -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 activemodel | lest | 2011-11-30 | 2 | -1/+5 | |
| | | | | ||||||
* | | | | Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time ↵ | José Valim | 2011-11-30 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | a before callback halts. | |||||
* | | | | Deprecated `define_attr_method` in `ActiveModel::AttributeMethods` | Jon Leighton | 2011-11-29 | 3 | -42/+43 | |
| | | | | | | | | | | | | | | | | | | | | This only existed to support methods like `set_table_name` in Active Record, which are themselves being deprecated. | |||||
* | | | | Warning removed unused variable | Arun Agrawal | 2011-11-26 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Small docs fix in Active Model callbacks module | Alexey Vakhov | 2011-11-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Revert the serializers API as other alternatives are now also under discussion | José Valim | 2011-11-25 | 4 | -448/+0 | |
| | | | | ||||||
* | | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 13 | -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é Valim | 2011-11-25 | 2 | -8/+84 | |
| | | | | | ||||||
| * | | | | Rename UserSerializer to DefaultUserSerializer in tests. | José Valim | 2011-11-23 | 1 | -15/+13 | |
| | | | | | ||||||
| * | | | | Rely solely on active_model_serializer and remove the fancy constant lookup. | José Valim | 2011-11-23 | 3 | -77/+17 | |
| | | | | | ||||||
| * | | | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 12 | -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 serializers | José Valim | 2011-11-23 | 18 | -207/+322 | |
| |\ \ \ \ | ||||||
| * | | | | | Remove 1.9 Hash syntax - tests passing on 1.8.7 | Jose and Yehuda | 2011-10-15 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Add initial support for embed API | Jose and Yehuda | 2011-10-15 | 2 | -7/+101 | |
| | | | | | | ||||||
| * | | | | | Add support for the root attribute | Jose and Yehuda | 2011-10-15 | 2 | -15/+74 | |
| | | | | | | ||||||
| * | | | | | Fix nil has_one association | Jose and Yehuda | 2011-10-15 | 2 | -2/+20 | |
| | | | | | | ||||||
| * | | | | | Add association_ids | Jose and Yehuda | 2011-10-15 | 2 | -2/+89 | |
| | | | | | | ||||||
| * | | | | | Add support for overriding associations, mostly used for authorization | Jose and Yehuda | 2011-10-15 | 2 | -1/+31 | |
| | | | | | | ||||||
| * | | | | | Add support for implicit serializers | Jose and Yehuda | 2011-10-15 | 2 | -26/+72 | |
| | | | | | | ||||||
| * | | | | | Added has_one and has_many | Jose and Yehuda | 2011-10-15 | 2 | -14/+123 | |
| | | | | | | ||||||
| * | | | | | Don't require serializable_hash to take options. | Jose and Yehuda | 2011-10-15 | 2 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Initial implementation of ActiveModel::Serializer | Jose and Yehuda | 2011-10-15 | 3 | -0/+122 | |
| | | | | | | ||||||
* | | | | | | make ActiveModel::Name fail gracefully with anonymous classes | Jakub Kuźma | 2011-11-24 | 2 | -0/+16 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 3 | -21/+49 | |
| |/ / / |/| | | | | | | | | | | | methods directly. | |||||
* | | | | Update variable's name in the test case to reflect the class we're testing | Prem Sichanugrist | 2011-11-18 | 3 | -24/+24 | |
| | | | | ||||||
* | | | | Speed up attribute invocation by checking if both name and calls are compilable. | José Valim | 2011-11-14 | 1 | -27/+32 | |
| | | | | ||||||
* | | | | use any? instead of !empty? | Oscar Del Ben | 2011-11-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix a tiny typo in custom validators documentation | Jean Boussier | 2011-11-10 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | replaced remove and define method calls to :redefine | Anand | 2011-11-07 | 1 | -2/+1 | |
| | | | | ||||||
* | | | | Revert "Merge pull request #2378 from cesario/remove_warnings_activemodel" | Jon Leighton | 2011-11-05 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda. Reason: build failure. | |||||
* | | | | Merge pull request #2378 from cesario/remove_warnings_activemodel | Vijay Dev | 2011-11-05 | 1 | -0/+1 | |
|\ \ \ \ | | | | | | | | | | | Remove warnings by calling remove_method | |||||
| * | | | | Remove warnings by calling remove_method | Franck Verrot | 2011-07-31 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Synchronize the gemspecs since CHANGELOG has been renamed to CHANGELOG.md | Franck Verrot | 2011-11-04 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Convert CHANGELOGs to Markdown format. | Jon Leighton | 2011-11-04 | 2 | -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 parameter | bradrobertson | 2011-10-26 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-20 | 1 | -3/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Removed mention of deprecated ActiveModel::Errors#on | Martin Svalin | 2011-10-19 | 1 | -3/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | New #added? method on ActiveModel::Errors | Martin Svalin | 2011-10-19 | 3 | -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 setup | Vijay Dev | 2011-10-17 | 1 | -6/+4 | |
| | | | | | ||||||
* | | | | | fix a typo and slightly reword has_secure_password comment | Vijay Dev | 2011-10-17 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | ActiveModel::Errors#generate_message without i18n_scope, and more test cases ↵ | Martin Svalin | 2011-10-17 | 2 | -4/+29 | |
|/ / / / | | | | | | | | | | | | | for #add | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-14 | 3 | -6/+6 | |
|\ \ \ \ | ||||||
| * | | | | Use .add instead of << to add errors | Evgeniy Dolzhenko | 2011-10-11 | 3 | -6/+6 | |
| | | | | | ||||||
* | | | | | Fixed serialization issues with multiple includes with options | zhengjia | 2011-10-11 | 2 | -1/+9 | |
|/ / / / | ||||||
* | | | | One of the activemodel naming tests wasn't asserting anything. | Uģis Ozols | 2011-10-07 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-10-05 | 2 | -5/+5 | |
|\ \ \ \ |