aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'serializers'José Valim2011-11-2535-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é Valim2011-11-254-13/+114
| |
| * Add a hook for serializers in the scaffold generator (off for now).José Valim2011-11-253-1/+13
| |
| * Add generators for serializers.José Valim2011-11-256-0/+142
| |
| * 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-237-79/+41
| |
| * Remove listings from the serialization guide that won't make 3.2.José Valim2011-11-231-37/+0
| |
| * Implement ArraySerializer and move old serialization API to a new namespace.José Valim2011-11-2315-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é Valim2011-11-232-28/+43
| |
| * Merge branch 'master' into serializersJosé Valim2011-11-23282-19051/+21651
| |\
| * | 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 unnecessarily use String eval.Jose and Yehuda2011-10-151-2/+2
| | |
| * | Don't require serializable_hash to take options.Jose and Yehuda2011-10-152-3/+3
| | |
| * | minor edits in serializers guideVijay Dev2011-10-151-9/+9
| | |
| * | Initial implementation of ActiveModel::SerializerJose and Yehuda2011-10-153-0/+122
| | |
| * | Refactor to make renderers a SetJose and Yehuda2011-10-151-11/+9
| | |
| * | Initial commit of serializer supportJose and Yehuda2011-10-155-0/+662
| | |
* | | Merge pull request #3752 from ganeshkumar/gem_lendingJosé Valim2011-11-252-2/+2
|\ \ \ | | | | | | | | Added tests for #3751
| * | | Added tests for #3751ganesh2011-11-252-2/+2
|/ / /
* | | Allow to display engine's routes when running `rake routes ENGINES=true`Piotr Sarnacki2011-11-244-6/+70
| | |
* | | Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classesPiotr Sarnacki2011-11-242-0/+16
|\ \ \ | | | | | | | | make ActiveModel::Name fail gracefully with anonymous classes
| * | | make ActiveModel::Name fail gracefully with anonymous classesJakub Kuźma2011-11-242-0/+16
|/ / /
* | | Forgot to add CHANGELOG entry for config.railties_orderPiotr Sarnacki2011-11-241-0/+4
| | |
* | | Merge pull request #3739 from lest/config-always-write-cookieJosé Valim2011-11-234-4/+56
|\ \ \ | | | | | | | | configuration option to always write cookie
| * | | configuration option to always write cookielest2011-11-234-4/+56
| | | |
* | | | Allow to change engine's loading priority with config.railties_order=Piotr Sarnacki2011-11-234-4/+173
|/ / /
* | | Merge pull request #3731 from HeeL/masterYehuda Katz2011-11-231-3/+14
|\ \ \ | | | | | | | | code stats calculation
| * | | improved code stats calculation, check on multiline comments and rewrite ↵Sergey Parizhskiy2011-11-231-3/+14
| | | | | | | | | | | | | | | | regexps according to a class naming convention
* | | | Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_testYehuda Katz2011-11-231-3/+3
|\ \ \ \ | |_|_|/ |/| | | Warnings removed. (ambiguous first argument)
| * | | Warnings removed. (ambiguous first argument)kennyj2011-11-241-3/+3
| |/ /
* | | Rely on a public contract between railties instead of accessing railtie ↵José Valim2011-11-2312-54/+94
| | | | | | | | | | | | methods directly.
* | | Optimize cache expansion by skipping rails cache id in nested keys.José Valim2011-11-232-58/+64
| | |
* | | Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_keyJosé Valim2011-11-232-13/+26
|\ \ \ | | | | | | | | Issues/3737 AS::Cache.expand_cache_key
| * | | Fix #3737 AS::expand_cache_key generates wrong key in certain situations ↵Olek Janiszewski2011-11-232-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 situationsOlek Janiszewski2011-11-232-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_3728José Valim2011-11-233-6/+25
|\ \ \ | |/ / |/| | Fix #3728 Remove unreachable code, and add additional testcases.
| * | Remove unreachable code, and add additional testcases.kennyj2011-11-243-6/+25
|/ /
* | Merge pull request #3725 from marcandre/twz_eqlYehuda Katz2011-11-224-4/+30
|\ \ | | | | | | Fix inconsistencies with Time{WithZone}#{hash,eql?}
| * | Fix inconsistencies with Time{WithZone}#{hash,eql?}Marc-Andre Lafortune2011-11-224-4/+30
| | |
* | | Merge pull request #3724 from marcandre/media_defaultYehuda Katz2011-11-224-3/+6
|\ \ \ | | | | | | | | stylesheet_tag default's media is "screen"
| * | | Make explicit the default media when calling stylesheet_tag and change the ↵Marc-Andre Lafortune2011-11-224-3/+6
| |/ / | | | | | | | | | default generators.
* | | Merge pull request #3718 from lest/fix-javascript-include-tagJosé Valim2011-11-222-1/+4
|\ \ \ | | | | | | | | javascript_include_tag should add '.js' to sources that contain '.'
| * | | javascript_include_tag should add '.js' to sources that contain '.'lest2011-11-222-1/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 06:42:26 +0000