Commit Graph

653 Commits

Author SHA1 Message Date
Mauro George
0f05583464 Add Running tests section on CONTRIBUTING
[ci skip]
2015-10-07 19:09:16 -03:00
L. Preston Sego III
d5e6e3148a Merge pull request #1254 from bf4/remove_useless_access_modifier
Remove unnecessarily silenced warnings
2015-10-07 07:22:15 -04:00
Benjamin Fleischer
0f50847c7d Make more class attributes inheritable 2015-10-07 06:07:22 -05:00
Benjamin Fleischer
236fb6d7fb Merge branch 'Rodrigora-serializer-cache-inheritance' 2015-10-07 05:59:55 -05:00
Benjamin Fleischer
659e31b519 Change assert to assert_equal 2015-10-07 05:59:43 -05:00
Benjamin Fleischer
dc44b136aa Remove unnecessarily silenced warnings 2015-10-07 05:54:57 -05:00
Rodrigo Ra
5706e7d7fe serializer inherits cache configuration 2015-10-07 00:34:21 -03:00
Lucas Hosseini
54303b6290 Add support for toplevel JSON API links. 2015-10-06 20:01:46 +02:00
Lucas Hosseini
f4bb4c81b0 Fix duplicate resources between data and included. 2015-10-06 17:25:27 +02:00
Lucas Hosseini
29c3448922 Better reporter for tests. 2015-10-06 02:15:29 +02:00
L. Preston Sego III
d02cd30fe5 Merge pull request #1233 from beauby/move-root-to-adapter2
Move `meta`/`meta_key` handling inside adapter.
2015-10-05 14:06:00 -04:00
Lucas Hosseini
503bfe9598 Move meta/meta_key handling inside adapter. 2015-10-05 19:06:50 +02:00
L. Preston Sego III
3fe343f240 Merge pull request #1232 from beauby/move-root-to-adapter
Extract attributes filtering from serializer into adapter.
2015-10-05 12:56:54 -04:00
L. Preston Sego III
ea1a709b54 Merge pull request #1231 from beauby/remove-dead-code
Remove `root_name` class method from Serializer, as it is used nowhere.
2015-10-05 12:55:24 -04:00
Lucas Hosseini
658810e6a0 Extract attributes filtering from serializer into adapter. 2015-10-05 08:21:26 +02:00
Lucas Hosseini
7847d05ecb Remove root_name class method from Serializer, as it is used nowhere. 2015-10-05 07:27:13 +02:00
Benjamin Fleischer
b8781c4001 Merge pull request #1230 from wazery/patch-1
Fix a typo
2015-10-04 20:28:48 -05:00
Islam Wazery
4db2b8c8cf Fix a typo 2015-10-05 01:59:36 +02:00
Lucas Hosseini
066990184b Merge pull request #1201 from hut8/master
Add documentation about wildcard includes
2015-10-02 15:30:31 +02:00
Lucas Hosseini
34d65716cb Merge pull request #1214 from NullVoxPopuli/issue/1211-failing-test
Fix #1211, include_tree is null when using the key: options
2015-10-02 15:29:04 +02:00
Liam Bowen
f8323fc9e5 Fixes #1211 - retrieve the key from the reflection options when building associations 2015-10-02 08:52:21 -04:00
Benjamin Fleischer
b8a5bbd860 Merge pull request #1223 from bf4/remove_unnecessary_railtie
Fix bundle console no longer tries to load I18n::Rails
2015-10-02 00:13:37 -05:00
Benjamin Fleischer
8e8cfd45ff Fix bundle console no longer tries to load I18n::Rails 2015-10-01 23:08:34 -05:00
Benjamin Fleischer
a2bfe190e3 Merge pull request #1050 from bf4/json_api_member
Add top-level jsonapi member to JSON API adapter
2015-10-01 23:03:11 -05:00
Benjamin Fleischer
a819da6c13 Merge pull request #1213 from AutoCloud/type_setting
Add Serializer 'type' directive to control type field, for
 use by the JsonApi adapter
2015-10-01 22:59:17 -05:00
Benjamin Fleischer
c5fdfb43bf Merge pull request #1217 from maurogeorge/patch-04
Change default rake task to run test and rubocop
2015-10-01 22:57:40 -05:00
Ivan Yurov
2dd569ae51 Add Serializer 'type' directive to control type field, for use by the JsonApi adapter 2015-10-01 22:48:57 -04:00
Benjamin Fleischer
9d7da8afc4 Add support for top level jsonapi member. 2015-10-01 21:22:49 -05:00
Mauro George
c7b8c54952 Change default rake task to run test and rubocop
The rubocop only runs in the CI this way a contributor probably will see a
rubocop offense only in the CI.

Running the rubocop in the default rake task we have more chance that a offense
be get in the local machine.
2015-10-01 19:52:14 -03:00
L. Preston Sego III
345f8f30c1 Merge pull request #1220 from maurogeorge/patch-06
Remove empty rubocop.rake
2015-10-01 18:26:34 -04:00
Mauro George
908f13fe6c Remove empty rubocop.rake 2015-10-01 19:05:28 -03:00
Liam Bowen
a32ad4331f Add documentation about wildcard includes
Resolves #1200
2015-10-01 18:46:49 +00:00
Lucas Hosseini
1f08865a10 Merge pull request #1125 from bf4/no_fail_coverage_by_platform
Simplify Windows platform identification in Gemfile
2015-09-24 01:01:14 +02:00
Benjamin Fleischer
bd80c1942b Simplify Windows platform identification
Platforms map available at https://github.com/bundler/bundler/blob/master/lib/bundler/dependency.rb
2015-09-24 00:31:21 +02:00
L. Preston Sego III
f2d0a918fe Merge pull request #1195 from beauby/fix-id-override
Fix id override
2015-09-23 17:24:35 -04:00
Lucas Hosseini
e552e4329b Fix. 2015-09-23 18:59:32 +02:00
Lucas Hosseini
359f290ddc Add failing test. 2015-09-23 18:59:18 +02:00
Lucas Hosseini
a54d237e28 Merge pull request #1182 from rails-api/update_changelog
Update CHANGELOG.md using `github-changes`
2015-09-21 20:37:59 +02:00
Lucas Hosseini
35473cf983 Merge pull request #1186 from bf4/empty_else
Enforce case requires else; allow else nil
2015-09-21 17:48:27 +02:00
Benjamin Fleischer
e9a15a3b80 Merge pull request #1187 from bf4/remove_dead_code
Remove dead code
2015-09-21 10:45:14 -05:00
Benjamin Fleischer
3f91015a7b Update CHANGELOG.md using github-changes
https://github.com/lalitkapoor/github-changes
2015-09-21 10:44:49 -05:00
Lucas Hosseini
606e2ae337 Merge pull request #1127 from NullVoxPopuli/support-nested-associations-for-json-adapter
Support nested associations for Json and Attributes adapters + Refactor Attributes adapter
2015-09-21 17:20:29 +02:00
Benjamin Fleischer
1d8a3d039a Enforce case requires else; allow else nil 2015-09-21 09:50:53 -05:00
Benjamin Fleischer
839d1ab21c Remove dead code 2015-09-21 09:41:54 -05:00
L. Preston Sego III
a74ea189cd Refactors of the Attribute adapter. Adds support for nested associations specified from the include key in the controller. Adds some tests and some method documentation 2015-09-21 10:35:47 -04:00
Benjamin Fleischer
bac43af0e6 Merge pull request #1175 from bf4/quiet_success_messages
Disable coverage/warnings output when passing in dev
2015-09-21 09:31:49 -05:00
L. Preston Sego III
8f2dd66710 Merge pull request #1183 from rails-api/block_style
Update Rubocop todo
2015-09-21 01:25:50 -05:00
L. Preston Sego III
94cee192a9 Merge pull request #1185 from beauby/fix-attributes-include
Fix options passing in Json and Attributes adapters
2015-09-21 00:48:16 -05:00
Benjamin Fleischer
0e433d3b64 Add debug tracing for JRuby code coverage 2015-09-21 00:44:51 -05:00
Benjamin Fleischer
076cf64ff3 Disable coverage/warnings output when passing in dev 2015-09-21 00:39:56 -05:00