Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Display mounted engines in `rake routes` by default | Piotr Sarnacki | 2011-11-25 | 3 | -6/+2 | |
| | | | | ||||||
* | | | | Merge branch 'serializers' | José Valim | 2011-11-25 | 35 | -482/+2074 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -13/+114 | |
| | | | | | ||||||
| * | | | | Add a hook for serializers in the scaffold generator (off for now). | José Valim | 2011-11-25 | 3 | -1/+13 | |
| | | | | | ||||||
| * | | | | Add generators for serializers. | José Valim | 2011-11-25 | 6 | -0/+142 | |
| | | | | | ||||||
| * | | | | 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 | 7 | -79/+41 | |
| | | | | | ||||||
| * | | | | Remove listings from the serialization guide that won't make 3.2. | José Valim | 2011-11-23 | 1 | -37/+0 | |
| | | | | | ||||||
| * | | | | Implement ArraySerializer and move old serialization API to a new namespace. | José Valim | 2011-11-23 | 15 | -436/+610 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | Add safe_constantize to ActiveSupport::Dependencies. | José Valim | 2011-11-23 | 2 | -28/+43 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into serializers | José Valim | 2011-11-23 | 282 | -19051/+21651 | |
| |\ \ \ \ | ||||||
| * | | | | | 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 unnecessarily use String eval. | Jose and Yehuda | 2011-10-15 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Don't require serializable_hash to take options. | Jose and Yehuda | 2011-10-15 | 2 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | minor edits in serializers guide | Vijay Dev | 2011-10-15 | 1 | -9/+9 | |
| | | | | | | ||||||
| * | | | | | Initial implementation of ActiveModel::Serializer | Jose and Yehuda | 2011-10-15 | 3 | -0/+122 | |
| | | | | | | ||||||
| * | | | | | Refactor to make renderers a Set | Jose and Yehuda | 2011-10-15 | 1 | -11/+9 | |
| | | | | | | ||||||
| * | | | | | Initial commit of serializer support | Jose and Yehuda | 2011-10-15 | 5 | -0/+662 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #3752 from ganeshkumar/gem_lending | José Valim | 2011-11-25 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Added tests for #3751 | |||||
| * | | | | | Added tests for #3751 | ganesh | 2011-11-25 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Allow to display engine's routes when running `rake routes ENGINES=true` | Piotr Sarnacki | 2011-11-24 | 4 | -6/+70 | |
| | | | | | ||||||
* | | | | | Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes | Piotr Sarnacki | 2011-11-24 | 2 | -0/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | make ActiveModel::Name fail gracefully with anonymous classes | |||||
| * | | | | | make ActiveModel::Name fail gracefully with anonymous classes | Jakub Kuźma | 2011-11-24 | 2 | -0/+16 | |
|/ / / / / | ||||||
* | | | | | Forgot to add CHANGELOG entry for config.railties_order | Piotr Sarnacki | 2011-11-24 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #3739 from lest/config-always-write-cookie | José Valim | 2011-11-23 | 4 | -4/+56 | |
|\ \ \ \ \ | | | | | | | | | | | | | configuration option to always write cookie | |||||
| * | | | | | configuration option to always write cookie | lest | 2011-11-23 | 4 | -4/+56 | |
| | | | | | | ||||||
* | | | | | | Allow to change engine's loading priority with config.railties_order= | Piotr Sarnacki | 2011-11-23 | 4 | -4/+173 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #3731 from HeeL/master | Yehuda Katz | 2011-11-23 | 1 | -3/+14 | |
|\ \ \ \ \ | | | | | | | | | | | | | code stats calculation | |||||
| * | | | | | improved code stats calculation, check on multiline comments and rewrite ↵ | Sergey Parizhskiy | 2011-11-23 | 1 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | regexps according to a class naming convention | |||||
* | | | | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test | Yehuda Katz | 2011-11-23 | 1 | -3/+3 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Warnings removed. (ambiguous first argument) | |||||
| * | | | | | Warnings removed. (ambiguous first argument) | kennyj | 2011-11-24 | 1 | -3/+3 | |
| |/ / / / | ||||||
* | | | | | Rely on a public contract between railties instead of accessing railtie ↵ | José Valim | 2011-11-23 | 12 | -54/+94 | |
| | | | | | | | | | | | | | | | | | | | | methods directly. | |||||
* | | | | | Optimize cache expansion by skipping rails cache id in nested keys. | José Valim | 2011-11-23 | 2 | -58/+64 | |
| | | | | | ||||||
* | | | | | Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key | José Valim | 2011-11-23 | 2 | -13/+26 | |
|\ \ \ \ \ | | | | | | | | | | | | | Issues/3737 AS::Cache.expand_cache_key | |||||
| * | | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations ↵ | Olek Janiszewski | 2011-11-23 | 2 | -3/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (part 2) `nil` and `false` both expand to `""` (empty string), while `true` expands to `"true"`; `false` should expand to `"false"` | |||||
| * | | | | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations | Olek Janiszewski | 2011-11-23 | 2 | -12/+14 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | `cache_key` method is never called when the argument is a 1-element array with something that responds to `cache_key` | |||||
* | | | | | Merge pull request #3735 from kennyj/fix_3728 | José Valim | 2011-11-23 | 3 | -6/+25 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix #3728 Remove unreachable code, and add additional testcases. | |||||
| * | | | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 3 | -6/+25 | |
|/ / / / | ||||||
* | | | | Merge pull request #3725 from marcandre/twz_eql | Yehuda Katz | 2011-11-22 | 4 | -4/+30 | |
|\ \ \ \ | | | | | | | | | | | Fix inconsistencies with Time{WithZone}#{hash,eql?} | |||||
| * | | | | Fix inconsistencies with Time{WithZone}#{hash,eql?} | Marc-Andre Lafortune | 2011-11-22 | 4 | -4/+30 | |
| | | | | | ||||||
* | | | | | Merge pull request #3724 from marcandre/media_default | Yehuda Katz | 2011-11-22 | 4 | -3/+6 | |
|\ \ \ \ \ | | | | | | | | | | | | | stylesheet_tag default's media is "screen" | |||||
| * | | | | | Make explicit the default media when calling stylesheet_tag and change the ↵ | Marc-Andre Lafortune | 2011-11-22 | 4 | -3/+6 | |
| |/ / / / | | | | | | | | | | | | | | | | default generators. | |||||
* | | | | | Merge pull request #3718 from lest/fix-javascript-include-tag | José Valim | 2011-11-22 | 2 | -1/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | javascript_include_tag should add '.js' to sources that contain '.' |