Commit Graph

473 Commits

Author SHA1 Message Date
Benjamin Fleischer
43e09c03de Fix incorrect s/options = {}/options ||= {}
Introduced in #965, surfaced in #1041
2015-08-11 17:08:09 -05:00
Josh Lane
033ce8e88d allow for a type attribute
* "namespace" json_api specific type method
2015-08-11 08:33:05 -07:00
Josh Lane
4af98852b8 fix warning
* don't overshadow serializer variable
2015-08-11 08:32:20 -07:00
João Moura
f7a1585b75 Merge pull request #1034 from engineyard/id-attribute
allow id attribute to be overriden
2015-08-11 02:02:07 -03:00
João Moura
03ddeeeec1 Merge pull request #1035 from artLopez/master
Fixed Comments highlight
2015-08-05 20:24:17 -03:00
artLopez
b68305f560 Fixed Comments highlight 2015-08-04 12:00:53 -07:00
Josh Lane
f6e3d4e1f9 allow id attribute to be overriden 2015-08-04 09:22:05 -07:00
João Moura
c4af610ed2 Merge pull request #1031 from bolshakov/feature/disaplow_to_define_multiple_associations_at_once
Disallow to define multiple associations at once
2015-08-01 18:22:00 -03:00
João Moura
9ace77e655 Merge pull request #1032 from elliotlarson/master
Wrap railtie requirement with rescue
2015-08-01 17:22:12 -03:00
elliotlarson
b99a6350cc only require railtie if Rails is present 2015-07-31 12:51:57 -07:00
Артём Большаков
424a053ee5 Disallow to define multiple associations at once 2015-07-31 19:15:56 +03:00
João Moura
728b8f980e Merge pull request #1026 from jfelchner/patch-1
Bump Version Number to 0.10.0.rc2
2015-07-31 11:34:42 -03:00
João Moura
c703d0f35c Merge pull request #985 from bolshakov/feature/each_association
Associations implementation refactoring
2015-07-31 10:57:03 -03:00
Jeff Felchner
e468030cbf Bump Version Number to 0.10.0.rc2
Due to the fact that users need to switch from the released version to `master` occasionally to pull in upstream bugfixes, it's important that this version number stays in sync with the released version.
2015-07-31 04:51:55 -05:00
João M. D. Moura
88eabdf6ac fixing tests by using a Profile intance to avoid unrelated warning 2015-07-31 03:28:50 -03:00
João Moura
b78126565c Merge pull request #954 from bf4/encapsulate_serialization
Encapsulate serialization in ActiveModel::SerializableResource
2015-07-31 03:09:58 -03:00
João Moura
7bc16666fe Merge pull request #972 from bf4/capture_app_warnings
Capture app warnings on test run
2015-07-30 22:24:08 -03:00
Артём Большаков
2952a332e0 Associations refactoring
* Move all associations related code from Serializer class to Associations module
* Introduce Reflection class hierarchy
* Introduce Association class
* Rid off Serializer#each_association
* Introduce Serializer#associations enumerator
2015-07-30 11:20:29 +03:00
João Moura
438d8f411a Merge pull request #1019 from baojjeu/master
Improve README.md
2015-07-28 21:32:01 -03:00
Baozi Wu
672618447e Update README.md 2015-07-27 02:44:53 +08:00
Baozi Wu
e388be9c01 Update README.md 2015-07-26 16:01:52 +08:00
Benjamin Fleischer
df140293d3 Remove unused controller rescue_with_handler
Per
https://github.com/rails-api/active_model_serializers/pull/954#discussion_r32589882

Ref 917, 918
2015-07-23 11:06:11 -05:00
Benjamin Fleischer
a66df3009a Encapsulate serialization in ActiveModel::SerializableResource
Usage: ActiveModel::SerializableResource.serialize(resource, options)
2015-07-23 11:05:23 -05:00
João Moura
e1c25e86e3 Merge pull request #998 from joaomdmoura/changing_root_to_model_class_name
Changing root to model class name
2015-07-23 02:18:47 -04:00
João Moura
9817a5b595 updating tests 2015-07-23 02:11:34 -04:00
João Moura
418721302b defining json_key(root) as model class name 2015-07-23 02:11:34 -04:00
João Moura
6266b6a002 Merge pull request #1006 from bf4/inflector-testing
Fix adapter inflection bug for api -> API
2015-07-20 23:20:00 -04:00
João Moura
4c3114236d Merge pull request #1016 from bf4/fix_railtie_missing_require
require rails/railtie before subclassing Rails::Railtie
2015-07-19 12:51:52 -04:00
Benjamin Fleischer
ed23a37de9 require rails/railtie before subclassing Rails::Railtie 2015-07-17 14:16:30 -05:00
Benjamin Fleischer
4359026c0e Handle inflecting api to s/API/Api without side-effects 2015-07-17 14:09:13 -05:00
João Moura
7066b1f6cb Merge pull request #1013 from vyrak/root-option
Root option with empty array support
2015-07-17 12:48:35 -04:00
João Moura
357d0d4e36 Merge pull request #994 from joaomdmoura/master
Starting Docs structure
2015-07-16 23:36:08 -04:00
João M. D. Moura
63436c73e8 minor updates and TYPOs 2015-07-16 23:29:03 -04:00
vyrak bunleang
1b09d0ec42 array serializer uses root option for json_key if available 2015-07-16 15:34:19 -06:00
vyrak bunleang
1d31096600 include old implicit serialization custom root tests with failing empty array test 2015-07-16 15:32:09 -06:00
Marek Pietrucha
e5ccb8e4dd root option is working (fixed #986) 2015-07-16 15:32:09 -06:00
João Moura
456f9158ca removing useless exmaple lines 2015-07-16 10:18:04 -04:00
João Moura
420f7959c0 creating initial general and how to docs 2015-07-16 10:18:04 -04:00
João Moura
b0a2e9f5e2 starting initial docs structure 2015-07-16 10:18:04 -04:00
João Moura
d7140949cd Merge pull request #1007 from jiajiawang/array_serializer_json_key_fix
Bug fix for ArraySerializer json_key
2015-07-15 23:49:25 -04:00
Jiajia Wang
91ffec41af Add test for ArraySerializer json_key method
test json key when resource is empty
2015-07-16 11:11:14 +10:00
Jiajia Wang
7faa5e8e2e Bug fix for ArraySerializer json_key
When the resource is a zero result query,
i.e. post_comments = PostComment.where("1=0")
the json_key will become 'postcomments' rather than 'post_comments'.
Using 'underscore' instead of 'downcase' fixes the error.
2015-07-15 10:11:06 +10:00
Benjamin Fleischer
e7174a7820 Capture and print app warnings on test run
Configure not to fail the test, for now
2015-07-14 01:05:26 -05:00
João Moura
954e4c51fe Merge pull request #1003 from Rodrigora/fix-transient-test-failures
Fix transient test failures
2015-07-14 01:35:45 -04:00
Rodrigo Ra
851d121ea8 fix transient test failures 2015-07-13 22:44:04 -03:00
João Moura
775737619a Merge pull request #996 from bf4/serializer_lint
Add linter for serializable resource
2015-07-13 19:37:39 -04:00
Rob McFadzean
506739d4fb Added a (failing) test for when inflecting API 2015-07-10 11:23:55 +09:30
Benjamin Fleischer
28174e297d Add linter for serializable resource 2015-07-09 11:20:19 -05:00
João Moura
0201f2dd2a Merge pull request #990 from joaomdmoura/adding-json-api-meta-test
Adding json-api meta test
2015-07-08 10:39:36 -03:00
João Moura
7fb94234a8 adding json-api meta test help 2015-07-08 10:15:14 -03:00