Commit Graph

1421 Commits

Author SHA1 Message Date
Benjamin Fleischer
a5554e0d9f Use a different controller in different tests
A number of test were defining and using the same controller
MyController = Class.new(ActionController::Base)
which was causing some state to leak across tests.
2015-06-12 11:27:20 -05:00
Santiago Pastorino
460150fef2 Fix No such file or directory tmp/cache issue in tests 2015-06-10 21:23:23 -03:00
Santiago Pastorino
4752e6723a Make resource generator invoke serializer generator 2015-06-10 20:45:33 -03:00
Santiago Pastorino
e117615465 This should be MAJOR >= 4 2015-06-10 20:26:37 -03:00
Santiago Pastorino
3fb55db1cd Load generators on test_helper and avoid repetead code 2015-06-10 20:26:37 -03:00
Santiago Pastorino
cbc7f114c0 Move generators test to it's own directory 2015-06-10 20:26:24 -03:00
Edward Loveall
0f0ef2baf5 Don't pass serializer option to associated serializers
Fixes #870

Commit af81a40 introduced passing a serializer's 'options'
along to its associated model serializers.

Thus, an explicit 'each_serializer' passed to render for a
singular resource would be passed on as the implicit 'serializer'
for its associations.

With @bf4
2015-06-10 18:20:34 -04:00
Sandro Munda
a865ba53ea AMS supports JSONAPI 1.0 instead of RC4 2015-06-10 14:11:28 +02:00
João Moura
7b0a85fdda Merge pull request #936 from insphire/fix-meta-with-custom-root
Include meta when using json adapter with custom root
2015-06-08 19:55:03 -03:00
João Moura
4c7442dd0f Merge pull request #942 from thiagofm/patch-1
Small code styling issue
2015-06-08 17:54:41 -03:00
Thiago Fernandes Massa
5fac4d8f33 Update poro.rb 2015-06-05 10:50:35 +02:00
Chris Branson
d34bba07b9 Ensure the adapters honor a custom root option and include meta when required 2015-06-04 17:33:41 +01:00
João Moura
35fb9de310 Merge pull request #930 from joaomdmoura/master
Reverting PR #909
2015-05-27 23:38:02 -03:00
João Moura
a40df8fd3d reverting PR #909 and adding json api usage advise on readme 2015-05-27 18:35:00 -03:00
João Moura
12adb2e6d4 Merge pull request #924 from navinpeiris/fragment-cache
Avoid unecessary calls to attribute methods when fragment caching
2015-05-27 14:55:31 -03:00
Alexandre de Oliveira
16f75126a8 Merge pull request #925 from benedikt/json-api
Updates JSON API Adapter to generate RC4 schema
2015-05-27 11:43:04 -05:00
Benedikt Deicke
2f6c431d5a Updates Readme to reflect changes to JSON API RC4 2015-05-22 14:34:00 +02:00
Navin Peiris
e0947fcbd4 Fixing issue where fragment cache calls attribute methods multiple times, even when they are supposed to be cached 2015-05-22 00:40:22 +05:30
Benedikt Deicke
4f576a1463 Adjusts JsonApi adapter to serialize relationships in a nested relationships hash 2015-05-21 16:35:35 +02:00
Benedikt Deicke
ca41901fb8 Adjusts JsonApi adapter to serialize attributes in a nested attributes hash 2015-05-21 16:23:01 +02:00
João Moura
5f05944826 Merge pull request #918 from aceofsales/rescue_from
Adding rescue_with_handler to clear state
2015-05-20 23:39:45 -03:00
Guillermo Iguaran
f7fb4dbb98 Merge pull request #909 from joaomdmoura/json-api-default
Defining Json-API Adapter as Default
2015-05-20 20:50:19 -05:00
Ryan Schlesinger
a5db2c52c5 Clearer exception description 2015-05-20 09:19:32 -07:00
Ryan Schlesinger
9355416ad0 Add rescue_from handler to clear state
Fixes #917
2015-05-19 17:23:29 -07:00
João Moura
a59cc4c779 Merge pull request #914 from groyoh/fix_904
Prevent possible duplicated attributes in serializer
2015-05-18 18:14:09 -03:00
groyoh
5393e5d235 Prevent possible duplicated attributes
Calling ActiveModel::Serializer.attributes or ActiveModel::Serializer.attribute
methods multiple times won't create duplicated attributes anymore.
2015-05-18 22:42:10 +02:00
João Moura
d981ee5106 Merge pull request #880 from groyoh/serializer-inheritance
Inabling subclasses serializers to inherit attributes
2015-05-18 11:34:10 -03:00
João Moura
1e4ff264cf Merge pull request #913 from groyoh/fix_911
Avoiding the serializer option when instantiating a new one for ArraySerializer Fixed #911
2015-05-18 10:25:31 -03:00
groyoh
a794a06fa5 Fixed #911 2015-05-17 22:47:44 +02:00
João Moura
9b502a4ae0 changing tests name to support new default adapter 2015-05-11 16:23:38 -03:00
João Moura
738894e5b4 updating readme declaring JsonApi as default adapter 2015-05-11 16:21:14 -03:00
João Moura
2c9c36e21f adding json_api as default adapter 2015-05-10 03:58:18 -03:00
João Moura
46ae776175 Merge pull request #897 from imanel/patch-1
Allow to define custom serializer for given class
2015-05-10 03:28:14 -03:00
Cristian Bica
7a62d31777 Added serializer file digest to the cache_key
Fixes #901
2015-05-06 08:37:18 +03:00
João Moura
ece43f344a Merge pull request #892 from groyoh/fix-json-nil-association
Fixed a bug that appeared when json adapter serialize a nil association
2015-05-05 11:04:26 -03:00
Bernard Potocki
c91b649504 Allow to define custom serializer for given class by defining #serializer_class method in serialized object's class. Resolves #515. 2015-05-03 17:47:52 +02:00
João Moura
6a06b90743 Merge pull request #895 from adomokos/adding-meta-test
Adding a test to cover 'meta' and 'meta_key' attr_readers
2015-05-01 15:13:27 -03:00
Attila Domokos
bd06647b31 Adding a test to cover 'meta' and 'meta_key' attr_readers 2015-04-30 22:17:19 -05:00
João Moura
2fac65ae0e Merge pull request #894 from adomokos/fixing-readme
Fixing typos in README.md
2015-04-30 21:44:26 -03:00
Attila Domokos
cbd1e672d8 Fixing typos in README.md 2015-04-30 18:28:21 -05:00
groyoh
5dcdfaaef3 Fixed a bug that appeared when json adapter serialize a nil association 2015-04-28 22:20:21 +02:00
João Moura
fc6276cab8 Merge pull request #888 from groyoh/fix-action-controller-test-name
Changed duplicated test name in action controller test
2015-04-28 12:09:02 -03:00
João Moura
b82d6f383f Merge pull request #890 from JustinAiken/feature/remove_def_serializer
Remove unused method `def_serializer`
2015-04-28 12:07:20 -03:00
Justin Aiken
cf1c57d2a9 Remove unused method 2015-04-27 16:53:36 -06:00
groyoh
1ef2badb32 Changed duplicated test name in action controller test 2015-04-27 21:22:28 +02:00
João Moura
40d95c2d8a Merge pull request #887 from joaomdmoura/fixing-jruby-tests
Fixing tests on JRuby
2015-04-27 16:16:42 -03:00
João Moura
49e41cb83c adding tests order config 2015-04-27 15:45:49 -03:00
João Moura
b706e521ef Merge pull request #885 from tonyta/updates-rails-versions-for-test-and-dev
Updates rails versions for test and dev
2015-04-27 15:08:58 -03:00
Tony Ta
b224d50005 removes test env for incompatible Rails 3.2 and adds Rails 4.2
gemspec requires "rails" and "activemodel, ">= 4.0", so testing
on 3.2 will always fail to resolve dependencies.

adds and defaults to Rails 4.2 when RAILS_VERSION is not specified
2015-04-26 18:16:07 -07:00
Yohan Robert
02ffff599f Serializers now inherit attributes 2015-04-23 13:25:36 +02:00