Commit Graph

1121 Commits

Author SHA1 Message Date
Benjamin Fleischer
a7a6841fee Merge pull request #1631 from rtsinani/doc-architecture-fix
Architecture doc fix
2016-03-30 09:08:10 -05:00
Benjamin Fleischer
52e2798619 Merge pull request #1632 from fidrelity/master
Update deprecation warning with correct namespace
2016-03-30 09:07:40 -05:00
Andre Schweighofer
a1ae7dc0d9 Update deprecation warning with correct namespace 2016-03-30 15:51:13 +02:00
Arti Sinani
9e2edded7c architecture doc fix 2016-03-30 14:18:27 +01:00
L. Preston Sego III
396395666f Merge pull request #1608 from groyoh/move_serializable_resource
Move SerializableResource to ActiveModelSerializers namespace
2016-03-30 07:26:41 -04:00
Yohan Robert
21cb896802 Move SerializableResource to ActiveModelSerializers namespace
Ref. https://github.com/rails-api/active_model_serializers/pull/1310
2016-03-30 11:33:04 +02:00
Yohan Robert
874b8cab30 Merge pull request #1630 from bf4/cleanup_test_app
Clean up test app
2016-03-30 10:19:48 +02:00
Benjamin Fleischer
ff8c6f9dd4 Clean up test app 2016-03-30 00:23:04 -05:00
Benjamin Fleischer
355e0f6a37 Merge branch 'lserman-master'
Followup needed:
- Update code comments https://github.com/rails-api/active_model_serializers/pull/1622#discussion_r57750471
- Move test class into test scope https://github.com/rails-api/active_model_serializers/pull/1622#discussion_r57659150
2016-03-29 21:50:27 -05:00
Moritz Lawitschka
afe786d19a Properly deserialize dasherized keys
The JSON API adapater dasherizes every key, but the deserializer left the keys
unaltered. Thus, the client had to send underscored keys in the request body in
order for Rails to properly match sent values to model attributes.

This commit adds automatic key transformation on deserialization. Per default the
deserializer transforms the keys to underscore, but this behaviour can also be
changed by including `key_transform` in the deserializer options.
2016-03-29 22:46:01 +02:00
Benjamin Fleischer
c7b2916f37 Merge pull request #1547 from bf4/jsonapi_renderer
Basic Jsonapi Renderer registration
2016-03-28 22:23:40 -05:00
Benjamin Fleischer
5af8536713 Merge pull request #1616 from bf4/more_controller_logic_to_serializable_resource
SerializableResource handles no serializer like controller
2016-03-28 22:05:19 -05:00
Benjamin Fleischer
d364c4f188 Spike Jsonapi Renderer registration 2016-03-28 22:04:16 -05:00
Benjamin Fleischer
ec5dc497b0 Handle render.ams with nil serializer or adapter 2016-03-28 21:33:23 -05:00
Benjamin Fleischer
84197e4dad SerializableResource handles no serializer like controller 2016-03-28 20:04:45 -05:00
Logan Serman
d0389ca765 Fix fragment caching inherited serializers to use distinct per-serializer caches. 2016-03-28 16:26:51 -05:00
Yohan Robert
5af7d96294 Merge pull request #1618 from bf4/RomanKapitonov-master
Empty collection root key from explicit serializer option
2016-03-27 18:38:14 +02:00
Yohan Robert
edbbf6dad5 Merge pull request #1624 from bf4/fix_warnings
Silence @_routes warnings
2016-03-27 18:07:15 +02:00
Benjamin Fleischer
a74d174420 Include Serializer._type in collection serializer json_key cascade 2016-03-27 10:55:31 -05:00
Roman Kapitonov
2dd0c33461 [FIX] Fetch json key from item serializer if empty collection is passed to collection serializer and each_searializer is specified. 2016-03-27 10:52:25 -05:00
Benjamin Fleischer
2627740806 Silence @_routes warnings 2016-03-27 10:45:57 -05:00
Yohan Robert
33a0f9c806 Merge pull request #1588 from bf4/benchmark_revision_runner
Add benchmark regression runner
2016-03-27 11:24:07 +02:00
Yohan Robert
17711a8d81 Merge pull request #1620 from bf4/fix_warnings
Fix warnings
2016-03-27 10:49:31 +02:00
Benjamin Fleischer
638e8853cc Remove annoying progress reporter 2016-03-26 19:27:33 -05:00
Benjamin Fleischer
fb06a462bb Fix warnings 2016-03-25 10:28:13 -05:00
Yohan Robert
82da04de67 Merge pull request #1478 from bf4/caching_fix
[FIX] Serializers can now be defined *before* Rails initializes and cache store will be correctly set
2016-03-25 11:32:31 +01:00
Benjamin Fleischer
912daa99f3 Merge pull request #1619 from bf4/allow_devs_to_opt_out_of_warnings
Allow devs to opt out of test warnings
2016-03-25 01:25:36 -05:00
Benjamin Fleischer
39623e8ba4 Add missing object context needed for tests to be run alone 2016-03-25 00:20:10 -05:00
Benjamin Fleischer
408daae045 Allow devs to opt out of test warnings 2016-03-25 00:19:20 -05:00
Benjamin Fleischer
dd60a371ae Simplify caching of value of config.perform_caching 2016-03-24 22:22:19 -05:00
Benjamin Fleischer
1230dd95ba Add CHANGELOG [ci skip] 2016-03-24 22:22:19 -05:00
Benjamin Fleischer
c3c69a607a Separate enabling of caching and setting the cache store 2016-03-24 22:20:42 -05:00
Benjamin Fleischer
9953d7abe0 Trigger callback to set serializer#_cache when controller loaded 2016-03-24 22:20:42 -05:00
Benjamin Fleischer
27b514a63b Add missing object context needed for tests to be run alone 2016-03-24 22:20:42 -05:00
Benjamin Fleischer
9ce36904cf Allow devs to opt out of test warnings 2016-03-24 22:20:42 -05:00
Yohan Robert
61412d80ca Merge pull request #1598 from bf4/fix_simplecov
Remove dead code preventing simplecov from running
2016-03-19 01:54:53 +01:00
Yohan Robert
9bd4c22f40 Replace -d by --debug in JRUBY_OPTS for travis
It seems that for coverage to work properly the "--debug" option is
needed when using JRuby.
2016-03-19 01:30:16 +01:00
Ben Mills
db6083af2f Merge pull request #1602 from remear/docs-adapter-output-examples
Add output examples to Adapters docs
2016-03-17 14:30:22 -06:00
Ben Mills
bfff46b66e Add output examples to Adapters docs 2016-03-17 14:07:32 -06:00
Benjamin Fleischer
4a251e3fd0 Add -d JRUBY_OPTS for simplecov 2016-03-17 14:31:30 -05:00
Ben Mills
e1d1a3dbf9 Add #1557 to CHANGELOG 2016-03-17 10:54:22 -06:00
Jeffrey Wan
297e1f7e9d Update docs regarding overriding the root key 2016-03-17 10:54:22 -06:00
L. Preston Sego III
88d4fe5b5e Merge pull request #1431 from beauby/deserialization-docs
Add docs for deserialization.
2016-03-17 12:48:55 -04:00
L. Preston Sego III
586ff09cc5 Added more detailed examples to deserialization.md from json_api/deserialization.rb 2016-03-17 07:58:51 -04:00
Benjamin Fleischer
bcdd1ccdd5 Remove dead code preventing simplecov from running 2016-03-16 21:31:02 -05:00
Ben Mills
db87f8d85e Merge pull request #1435 from bf4/fix_rails_warnings
Fix Rails 5 warnings (uses Rails5Shim)
2016-03-15 13:42:51 -06:00
Ben Mills
9e992358d8 Merge pull request #1574 from remear/key-casing
Provide key transformation
2016-03-15 13:42:24 -06:00
Ben Mills
a85d6af1c4 Merge pull request #1420 from marcgarreau/master
Adds tests and documentation for polymorphism
2016-03-15 13:35:16 -06:00
Marc Garreau
045fa9bc07 Adds polymorphic tests and documentation 2016-03-15 13:09:59 -06:00
Ben Mills
c533d1a7fe Provide key case translation 2016-03-15 12:21:10 -06:00