Commit Graph

313 Commits

Author SHA1 Message Date
Steve Klabnik
045ba2a48c Merge pull request #534 from kylefritz/master
Support lowerCamel key format
2014-07-28 12:43:36 -04:00
Steve Klabnik
723049e28f Merge pull request #493 from shakirshakiel/master
fixing sideloading of nested associations
2014-07-28 12:34:17 -04:00
Kyle Fritz
76c8de7b9f root key format 2014-04-14 13:45:12 -04:00
Kyle Fritz
00c54baae3 Support lowerCamel key format 2014-03-30 12:31:21 -04:00
Wojtek Mach
2e31a14125 Add :only/:except options 2014-03-12 16:55:08 -03:00
Ken Ip
8ca4d4fcd6 HasOne nil object should return [] under embedded key.
Ensure that @wrap_in_array is always respected when set to true even
when associated object is nil.
2014-03-10 16:42:04 -03:00
Santiago Pastorino
d985e6424c Merge pull request #462 from fab/master
Generator now properly detects ApplicationSerializer
2014-02-04 10:05:03 -08:00
Fab Mackojc
a49e04a6f2 Generator now properly detects ApplicationSerializer 2014-02-01 21:37:13 +11:00
Shakir Shakiel
9ae5142775 fixing sideloading of nested associations 2014-01-22 00:07:28 +05:30
Adrian Mugnolo and Santiago Pastorino
cec7980208 Don't embed empty associations in root 2014-01-09 15:45:20 -02:00
Santiago Pastorino
3e510c829b Don't concat to nil objects 2014-01-09 15:35:29 -02:00
Jorge Bejar
df481b2b35 Don't memoize association serializer 2014-01-09 15:30:51 -02:00
Santiago Pastorino
de78df509a Version = 0.9.0.alpha1 2014-01-07 15:28:23 -02: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
8bd2542ed2 Allow to pass context around serializers 2014-01-06 12:22:16 -02:00
Santiago Pastorino
5fa4002039 Allow only to pass scope to associations
Closes #483
2014-01-03 19:48:01 -02:00
Santiago Pastorino
60fc55021c Revert "Allow to pass options to associations"
This reverts commit c8cfe94f29.
2014-01-03 19:44:40 -02:00
Santiago Pastorino
c8cfe94f29 Allow to pass options to associations
Closes #331
2014-01-02 19:56:08 -02:00
Santiago Pastorino
67c550f2ee Serialize embedding in root deeply nested associations
Closes #444
2014-01-02 18:34:11 -02:00
Santiago Pastorino and Adrian Mugnolo
8fa252b4fd Make sure generator hooks get run
Use Rails::Engine#load_generators instead of require +
Rails::Generators::configure!.
2013-12-30 12:03:51 -02:00
Adrian Mugnolo and Santiago Pastorino
0f4547eb77 Rename method to serializable_object 2013-12-17 16:13:50 -02:00
Adrian Mugnolo and Santiago Pastorino
f14f931957 Clean up HasOne array wrapping logic
Introduce private _wrap_in_array option for now.
2013-12-17 15:42:35 -02:00
Adrian Mugnolo and Santiago Pastorino
28fbb62ec4 Avoid unneeded logic 2013-12-17 13:14:39 -02:00
Santiago Pastorino
80d9fb56d2 Merge pull request #452 from plexus/has_one_each_serializer_fix
Using a HasOne association twice raises an exception (Undefined method `map')
2013-12-16 17:49:26 -08:00
Adrian Mugnolo and Santiago Pastorino
700e6b83c1 Serializers now inherit root 2013-12-16 17:55:50 -02:00
Adrian Mugnolo and Santiago Pastorino
115de49004 Remove explicit reference to self 2013-12-16 17:27:49 -02:00
Santiago Pastorino
adee76181f Merge pull request #468 from stas/attrs_and_assoc_inheritance
Serializers now inherit attributes and associations.
2013-12-16 11:14:16 -08:00
Santiago Pastorino
5c00ce0443 Merge pull request #451 from plexus/embed_in_root_merge
embed_in_root only returns the associated objects of a single instance
2013-12-16 10:39:53 -08:00
Stas SUȘCOV
0febd8f628 Serializers now inherit attributes and associations. 2013-12-11 17:59:32 +02:00
Jason Truluck
a110df6caf Add @options back into serializers to maintain the functionality of render :json as noted in the docs
This functionality used to exist in v0.8.1. This adds the ability to
pass other options that will be usable in the serializer via the
options accessor.

This works by adding an attr_accessor for options so it is available
and is set by the remaining options in the provided options hash during
initialization.
2013-11-12 12:57:31 -05:00
Arne Brasseur
8c3866532a Fixes a bug in the HasOne association where serializing twice in a row causes
an exception.
2013-11-11 15:30:46 +01:00
Arne Brasseur
1db96ec7a9 When using embed: :ids ; embed_in_root: true, and serializing multiple objects,
only the associated objects of the last object in the collection will actually
show up in the serialized data.

For example, if you serialize a collection of two posts, each containing one or
more comments, only the comments of the last post show up. The reason is a
Hash#merge wich overwrites the array rather than appending to it.

This commit fixes this by merging the collection arrays, rather than the top-level
hashes.
2013-11-11 14:30:34 +01:00
Todd Bealmear
e0a564aa68 Fixed Rails 3 compatibility. 2013-11-04 17:45:36 -08:00
Todd Bealmear
f10f72c763 Fixed Rails 4 Controller Scaffold Generator. 2013-11-04 17:31:19 -08:00
Santiago Pastorino
99677c0c58 Pass scope through to associations via @lastobelus
Closes #433
2013-11-04 10:48:19 -02:00
Santiago Pastorino
60b5901af8 Don't treat has_one associations embed objects as an array
Closes #442

Thanks @arrtchiu for reporing and giving a test case
2013-11-04 10:09:29 -02:00
Santiago Pastorino
ef1ec65ae7 Make DefaultSerializer include AM::Serializable so embedded_in_root_associations is always defined also there 2013-11-01 22:35:56 -02:00
Santiago Pastorino
882dbafa7e embedded_in_root_associations is always defined 2013-11-01 21:37:49 -02:00
Santiago Pastorino
66f9256534 Embed objects should return singular and not wrap in array
Closes #437
2013-11-01 14:22:52 -02:00
Santiago Pastorino
d3d6c98148 Make ArraySerializer reuse Serializer embedded_in_root_associations code 2013-10-31 17:28:39 -02:00
Santiago Pastorino
5598bb0f79 Make Associations in root work with ArraySerializer
Closes #414
2013-10-31 17:27:36 -02:00
Santiago Pastorino
85a9c185ca Move responsibility of setting a serializer class and building a serializer for an association to the association class 2013-10-31 16:45:00 -02:00
Santiago Pastorino
4d4b820cbe has_one returns arrays with roots pluralized 2013-10-30 15:26:13 -02:00
Santiago Pastorino
1eea008336 Split root construction and serialization logic 2013-10-29 19:39:27 -02:00
Santiago Pastorino
49ab359a34 Support passing a custom ArraySerializer for has_many associations
Thanks @phoet

Closes #316
2013-10-29 00:26:45 -02:00
Santiago Pastorino
d5308b4d0b Remove old unneeded code 2013-10-26 03:01:17 -02:00
Santiago Pastorino
1eb09476ef Revert "Merge pull request #422 from marclove/reduce-serializer-code-complexity"
This reverts commit 449849516b, reversing
changes made to e103569c22.

Conflicts:
	lib/active_model/serializer.rb
2013-10-26 01:19:15 -02:00
Arthur Neves
303ac21428 Small refactoring 2013-10-25 19:58:06 -04:00
Marc Love
5ac6e626b5 Reduce complexity and duplication; make accessor definition more explicit 2013-10-25 15:33:24 -07:00