Commit Graph

22 Commits

Author SHA1 Message Date
Alexandre de Oliveira
69aff2a2e8 Merge branch '0-9-1' into 0-9-stable
This will bring back all features in 0.9.1 minus the problematic
Enumerable commit that broke it.
2015-01-21 22:01:14 -02:00
Nate Berkopec
577db35824 Revert "Make sure render json: ..., each_serializer: ... is working with Enumerables"
This reverts commit 90343cea4d.
2015-01-13 17:12:02 -05:00
Sam Woodard
69315a25a5 remove trailing whitespace 2014-12-07 08:45:32 -08:00
Andrey Chernih
90343cea4d Make sure render json: ..., each_serializer: ... is working with Enumerables
If you try to render Enumerable with custom `each_serializer` then it will render with default serializer instead:

```ruby
render json: sequel_scope, each_serializer: CustomSerializer
```

This commit fixes this behaviour. Most likely fixes https://github.com/rails-api/active_model_serializers/issues/664 as well
2014-09-25 16:59:47 +04:00
Vladimir Lyzo
c4e6cd48b6 Add failing test: serialize array with format_keys w/o root 2014-08-15 14:45:51 +04:00
Kyle Fritz
76c8de7b9f root key format 2014-04-14 13:45:12 -04:00
Santiago Pastorino
ed9a5288f9 Revert "Merge branch 'context'"
This reverts commit 1bd8180a94, reversing
changes made to 9bb32331f4.
2014-01-07 15:02:09 -02:00
Adrian Mugnolo and Santiago Pastorino
0d8ef2b165 Nest scope under context option 2014-01-06 15:50:30 -02:00
Santiago Pastorino
7c68ee4b3f Remove unneeded require 2013-12-26 19:47:52 -02:00
Santiago Pastorino
f18594a980 Add missing json require 2013-12-26 17:16:48 -02:00
Santiago Pastorino
5598bb0f79 Make Associations in root work with ArraySerializer
Closes #414
2013-10-31 17:27:36 -02:00
Santiago Pastorino
df5ef33ae6 Allow to turn off ams
Closes #378

You can define now

```
def default_serializer_options
  { serializer: false }
end
```
2013-10-23 20:34:34 -02:00
Santiago Pastorino
23e6ed32be Add default_serializer_options test 2013-10-18 17:49:20 -02:00
Santiago Pastorino
aa23e811cc Use controller name as root when serializing an array and not root is defined 2013-10-18 17:49:20 -02:00
Santiago Pastorino
6f3503c965 Use serializer name as root when root not set 2013-10-18 17:49:19 -02:00
Santiago Pastorino
8462a73f3a Make render json work when not using AMS 2013-10-18 17:49:19 -02:00
Santiago Pastorino
29148cbe1c Add AC::Serialization#serialization_scope as a class level method 2013-10-18 17:49:19 -02:00
Santiago Pastorino
e6993c677b Add missing requires 2013-10-18 17:49:18 -02:00
Santiago Pastorino
4c7599cfff Use more meaningful model names for tests 2013-10-18 17:49:18 -02:00
Santiago Pastorino
0d4dfb69a9 Fix directories the project is on top level dir 2013-10-18 17:49:17 -02:00
Santiago Pastorino
a25c352525 Move models and serializers in test to fixtures.rb file 2013-10-18 17:49:17 -02:00
Santiago Pastorino
0d3b56e9cf Implement AC integration 2013-10-18 17:49:17 -02:00