Commit Graph

887 Commits

Author SHA1 Message Date
Alexandre de Oliveira
dc08f0ec80 Merge pull request #748 from raphaelpereira/0-9-stable
Propagate serialization_options across associations
2015-03-30 16:31:41 -03:00
Raphael Pereira
fd5cd879f8 Added test case for association propagating options 2015-03-28 13:24:03 -03:00
Josh Smith
fe240d5755 Merge pull request #841 from antstorm/fix-embed-in-root-key-issue
Fix issue with embedding multiple associations under the same root key
2015-03-22 17:38:22 -07:00
Anthony Dmitriyev
d62463de15 Fix issue with embedding multiple associations under the same root key 2015-03-13 17:24:54 +00:00
Alexandre de Oliveira
55210ab61f Merge pull request #813 from jtomaszewski/feature/custom-serializer-class
Allow to define custom serializer for given class
2015-03-09 11:43:53 -03:00
Jacek Tomaszewski
d8b78a36cf Allow to define custom serializer for given class
.. by defining #serializer_class method in serialized object's class. Resolves #515.
2015-03-08 14:58:29 +01:00
Alexandre de Oliveira
1a7395b1d1 Merge pull request #797 from afn/0-9-stable
Fix and test for #490
2015-03-01 08:54:00 -05:00
Tony Novak
263b66e423 Fix and test for #490 2015-01-30 13:49:15 -08:00
Alexandre de Oliveira
f71ac766ef Merge pull request #790 from engineyard/array-serializer-context
pass context to ArraySerializer
2015-01-29 15:05:57 -02:00
Josh Lane
e0690862ce test array serializer context 2015-01-28 11:38:54 -08:00
Josh Lane
0e7cae4d6d pass context to ArraySerializer 2015-01-27 11:37:35 -08:00
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
Alexandre de Oliveira
02c6ac96b0 Bump version to 0.9.3 2015-01-21 18:29:38 -02:00
Alexandre de Oliveira
c49baec356 Merge pull request #776 from nateberkopec/0-9-1
Revert #665
2015-01-21 18:13:40 -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
Alexandre de Oliveira
3baff109eb Merge pull request #717 from r-ideas/0-9-stable
fixed issue with rendering Hash which appears in rails 4.2.0.beta4
2015-01-06 09:34:03 -02:00
Alexandre de Oliveira
64cc5385bc Merge pull request #749 from shwoodard/whitespace-fix
remove trailing whitespace
2014-12-09 14:20:36 -02:00
Steve Klabnik
9953a60c92 Merge pull request #752 from basiam/0-9-stable
Tiny improvement of README 0-9-stable
2014-12-09 10:59:57 -05:00
Basia Madej
3b2788fc4f Tiny improvement of README 0.90 syntax 2014-12-09 16:07:14 +01:00
Sam Woodard
69315a25a5 remove trailing whitespace 2014-12-07 08:45:32 -08:00
Raphael Pereira
db566b427d serialization_options propagation - test correction 2014-12-06 09:50:42 -02:00
Raphael Pereira
ea6dc424ee Propagate serialization_options across associations 2014-12-06 09:25:30 -02:00
Steve Klabnik
f1c3268a54 bump version 2014-12-04 06:54:52 -05:00
Alexandre de Oliveira
23c2e678ed Fixes rbx gems bundling on TravisCI
Conflicts:
	.travis.yml
2014-11-06 19:24:32 +02:00
Alexandre de Oliveira
42010cc8e8 Merge pull request #660 from kbullaughey/standardize_has_one_and_has_many_on_string_roots
Standardize has one and has many on string roots
2014-11-06 14:53:37 -02:00
Roman Greshny
4b49d1b132 fixed issue with rendering Hash which appears in rails 4.2.0.beta4 2014-11-05 16:34:08 +02:00
Steve Klabnik
cd1829d0c0 Merge pull request #694 from joaomdmoura/0-9-stable
Fixing README at 0.9.0 by removing reference to attribute method #657
2014-10-24 07:05:46 -04:00
Joao Moura
6fb6162622 Fixing README at 0.9.0 and removing reference to attribute method #657 2014-10-23 18:22:21 -02:00
Kevin Bullaughey
edfd38bdee converted has many to use string key for association, makeing it compatable with has_one; fixed tests that relied on symbol keys for has_many associations 2014-10-22 10:33:11 -04:00
Kevin Bullaughey
34d684ee9a added failing spec to show how both symbol and string keys are causing problems 2014-10-22 10:31:18 -04:00
Steve Klabnik
89f87bf855 Merge pull request #679 from Ahalogy/serializer-options
Serializer options
2014-10-14 11:37:47 -04:00
Steve Klabnik
4a4bcdc57b Merge pull request #666 from jastkand/include_url_helpers
Auto-include url_helpers for Rails-apps. Fixes #563
2014-10-14 11:33:20 -04:00
Robin Daugherty
2a1d9346f6 Test to cover serialization_options 2014-10-12 19:25:38 -04:00
Robin Daugherty
341d552ae0 Make sure serialization_options is never nil 2014-10-12 13:08:45 -04:00
Robin Daugherty
f385ab05fb Make options param optional 2014-10-12 12:01:01 -04:00
Robin Daugherty
57f1c1b1f9 Fix serialization_options for array serialization 2014-10-12 02:29:50 -04:00
Robin Daugherty
d39a99d770 Add serialization_options
Prior to 0.9, @options was used to see the options passed to to_json. For some reason, with 0.9 the options were no longer passed and were entirely inaccessible within a Serializer.

This restores the access by placing it in an attribute named serializer_options.
2014-10-12 01:08:47 -04:00
Steve Klabnik
784eccd5bc Merge pull request #674 from tricknotes/support-rails4.2-for-ams0.9
Support Rails 4.2.0 with AMS 0.9
2014-10-09 12:38:57 -04:00
Ryunosuke SATO
447d96923f Support Rails 4.2.0 with AMS 0.9
This patch is the same fixes as #655 and #663 for 0-9-stable branch.
2014-10-10 00:53:56 +09:00
Steve Klabnik
5acd98e61b Merge pull request #639 from gauthier-delacroix/Unsuffixed-default-associations-keys
Allow JSONAPI unsuffixed associations keys
2014-10-08 14:45:46 -04:00
Gauthier Delacroix
a39d08d2ad Cleaner unsuffixed association keys tests 2014-10-08 16:51:44 +02:00
Gauthier Delacroix
226cbc4160 Unsuffixed association keys doc 2014-10-08 16:31:09 +02:00
Gauthier Delacroix
4ac07de799 Unsuffixed association keys tests 2014-10-08 16:20:49 +02:00
Andrey Krivko
1875cab64a Fix path where test-app is getting configured 2014-09-29 18:07:56 +07:00
Andrey Krivko
dce6e59772 Auto-include url_helpers for Rails-apps. Fixes #563 2014-09-29 17:16:33 +07:00
Steve Klabnik
06e3bb77f2 Merge pull request #662 from jastkand/remove-question-sign
Add auto-stripping of question mark for attributes
2014-09-26 10:35:43 -04:00
Andrey Krivko
bded293529 Add auto-stripping of question mark for attributes 2014-09-26 15:42:41 +07:00
Steve Klabnik
e41eedd4dd Merge pull request #630 from sachse/readme-fix
README: Change :embed_key to :key
2014-09-25 19:41:50 -04:00
Steve Klabnik
c19a254154 Merge pull request #632 from gauthier-delacroix/Default_namespace_inheritance
Default namespace option
2014-09-25 19:41:33 -04:00
Steve Klabnik
21fe89e9bb Merge pull request #634 from craiglittle/fix-meta-documentation
Fix meta_key/meta documentation for v0.9.x series
2014-09-25 19:39:22 -04:00