ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,235 Commits 15 Branches 40 Tags 5 MiB
13015680a7
Commit Graph

1235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Mills
4de8d8c16a Remove default key case change message (#1752) 2016-05-26 15:15:30 -04:00
L. Preston Sego III
7d7329bbcf Merge pull request #1426 from brigade/default-include 
Add a default_include_tree config variable to ActiveModel::Serializer
 2016-05-26 13:31:53 -04:00
Ben Mills
9cffc10208
Add Rails >= 5.0.beta3 JSON API params parsing (#1751) 
This reverts commit 6288203277.
 2016-05-26 11:19:23 -06:00
Ben Mills
6288203277 Revert "Add Rails >= 5.0.beta3 JSON API params parsing" (#1751) 2016-05-26 11:17:32 -06:00
Noah Silas
94db09b3f6 Fix RuboCop 0.40 linter errors (#1722) 
These errors are breaking the build, which seems to use RuboCop 0.40 [1]
despite the Gemfile.lock pinning rubocop to 0.38.

New lints that I am updating the code style to reflect:

- Style/EmptyCaseCondition: Do not use empty case condition, instead use
  an if expression.

- Style/MultilineArrayBraceLayout: Closing array brace must be on the
  same line as the last array element when opening brace is on the same
  line as the first array element.

- Style/MultilineHashBraceLayout: Closing hash brace must be on the same
  line as the last hash element when opening brace is on the same line
  as the first hash element.

- Style/MultilineMethodCallBraceLayout: Closing method call brace must
  be on the line after the last argument when opening brace is on a
  separate line from the first argument.

[1] https://github.com/bbatsov/rubocop/releases/tag/v0.40.0
 2016-05-26 12:58:05 -04:00
Benjamin Fleischer
8a3196d920 Improve jsonapi mime type registration for Rails 5 (#1747) 2016-05-26 10:55:12 -06:00
Ben Woosley
8c18d18cdb Add default_includes configuration 
This is useful to set application-wide default behavior - e.g. in
previous versions of AMS the default behavior was to serialize the
full object graph by default - equivalent to the '**' include tree.

Currently just the global setting, but I think this could also work
on a per-serializer basis, with more attention.
 2016-05-26 00:16:14 +00:00
Yohan Robert
a701777bd5 Prevent loading association when include_data is set to false (#1710) 
This should fix #1707.
 2016-05-24 20:46:22 -04:00
Ben Mills
cbca1350b9 Merge pull request #1741 from krisleech/pin-gem-version 
Encourage pinning of pre-1.0.0 release [skip ci]
 2016-05-23 10:15:00 -06:00
Ben Mills
835aad3c74 Merge pull request #1734 from lambda2/patch-1 
Adding documentation on conditional attributes
 2016-05-19 18:30:50 -06:00
André Aubin
efdee6041b Adding documentation on conditional attributes 
Adding documentation and short example ([from this pull request](https://github.com/rails-api/active_model_serializers/pull/1403)) on conditional attributes.

Adding lambda literal notation and example.

Adding lambda literal notation and example, and fixing typo.

Removing PR reminder

Adding Changelog entry

Moving CHANGELOG entry under master (unreleased)

Use option instead of parameter
 2016-05-20 00:47:53 +02:00
Kris Leech
e30039a49b Encourage pinning of pre-1.0.0 release [skip ci] 2016-05-19 09:25:55 +01:00
Ben Mills
b5e2b41a33 Merge pull request #1736 from bf4/patch_gemspec 
Correct ruby/rails version requirements in gemspec
 2016-05-18 12:36:37 -06:00
Benjamin Fleischer
fde4f6776d Update README/CHANGELOG 2016-05-18 10:23:10 -05:00
Benjamin Fleischer
b089a7277d Correct ruby/rails version requirements in gemspec 2016-05-18 10:16:05 -05:00
cgmckeever
ec15fa9de3 Adds documentation for overriding default serializer based on conditions (#1730) 
suggested changes

update changelog
 2016-05-17 15:28:54 -04:00
Ben Mills
b75db81ca4
Update README. 0.10 is no longer RC 2016-05-17 13:13:53 -06:00
Ben Mills
b6d4ec03de
Bump to v0.10.0 2016-05-17 12:49:37 -06:00
Ben Mills
660e982c72 Merge pull request #1726 from cgmckeever/nesting-polymorphs 
adds polymorphic option to association definition which includes asso…
 2016-05-17 12:25:10 -06:00
cgmckeever
5e35b7bf4c adds mac files to .gitignore (#1728) 2016-05-17 13:51:26 -04:00
cgmckeever
ec23518eb9 adds prompt for version script and a little more documentation (#1729) 
better version handling

looks up via yml
 2016-05-17 13:50:18 -04:00
cgmckeever
bbed12864d adds polymorphic option to association definition which includes association type in serializer 
regen gemlock

regen gemlock

better variable naming

rubocop fixes

adds to changelog

adds empty relationship and has_many polymorph tests

indent

test cleaning

-rubocop

rubocop

rubocop

rubocop

changelog

remove silly .DS

fix roque failure

fix
 2016-05-17 12:30:59 -05:00
Benjamin Fleischer
6c321cd862 Assert Schema (#1677) 
* Assert Schema

* Fix regression from #1695 where JSONAPI renders empty meta

* Add changelog
 2016-05-17 13:22:38 -04:00
Benjamin Fleischer
9f59398f2b Merge pull request #1732 from remear/jsonapi-renderer 
Include ControllerSupport on ActiveSupport on_load action_controller
 2016-05-17 12:10:17 -05:00
Benjamin Fleischer
7fcac0c536 Merge pull request #1697 from bf4/minitest_assertion_exception 
Include actual exception message with custom exceptions
 2016-05-17 10:56:59 -05:00
Ben Mills
7356071ea0
Include ControllerSupport on ActiveSupport on_load action_controller 2016-05-17 09:39:30 -06:00
Benjamin Fleischer
93cad825b7 Include actual exception message with custom exceptions 2016-05-17 10:32:53 -05:00
Benjamin Fleischer
d0d7af470c Test::Schema exceptions should be Minitest::Assertions 2016-05-17 10:31:35 -05:00
Ben Mills
070d58eacf Merge pull request #1723 from remear/rubocop-0_39_0 
Pin rubocop to 0.39.0
 2016-05-10 18:43:01 -06:00
Ben Mills
446c2d486c
Pin rubocop to 0.39.0 2016-05-10 18:25:01 -06:00
Yohan Robert
2b49899351 Merge pull request #1712 from bf4/fix_jsonapi_response_header 
Setting the content_type sets the response Content-Type
 2016-05-02 11:38:53 +02:00
Benjamin Fleischer
05fd59644d Setting the content_type sets the response Content-Type 
Otherwise we have two headers, 'Content-Type' and 'CONTENT_TYPE'.
I don't know when Rails decides to use one or the other.
 2016-05-01 23:30:52 -05:00
Benjamin Fleischer
0433869cc1 Merge pull request #1699 from mtsmfm/str-lambda-support-for-if 
String/Lambda support for conditional attributes/associations
 2016-04-26 12:10:35 -05:00
Fumiaki MATSUSHIMA
aa087a22b5 String/Lambda support for conditional attributes/associations 2016-04-26 21:37:25 +09:00
L. Preston Sego III
d43b32a4d3 Merge pull request #1708 from christopherstyles/fix-typo-in-architecture-primitive-handling-docs 
Fix typo in PRIMITIVE HANDLING docs
 2016-04-25 23:20:58 -04:00
Christopher Styles
ad9e69a737 Fix typo in PRIMITIVE HANDLING docs [ci skip] 2016-04-25 20:02:36 -07:00
Lucas Hosseini
0165215c95 Merge pull request #1706 from mtsmfm/fix-appveyor-setting-for-jruby 
Fix AppVeyor settings for JRuby.
 2016-04-25 17:56:32 +02:00
Fumiaki MATSUSHIMA
d9eac2a4bd Fix appveyor setting for JRuby 
Path for JRuby is not correct so tests run on CRuby 1.9 till now...
 2016-04-25 09:24:51 +09:00
Benjamin Fleischer
bade0f2dd6 Fix CHANGELOG sections [ci skip] 2016-04-22 12:10:59 -05:00
Benjamin Fleischer
8404f80dc4 Fix CHANGELOG sections [ci skip] 2016-04-22 12:07:08 -05:00
L. Preston Sego III
8c8edd6457 Merge pull request #1700 from iamnader/master 
Support pagination link for Kaminari when no data is returned
 2016-04-22 13:05:18 -04:00
Nader Akhnoukh
37ca0c1f6c Support pagination link for Kaminari when no data is returned 2016-04-22 11:04:40 -06:00
Benjamin Fleischer
17d0759c97 Merge pull request #1698 from bf4/fix/benchmark 
Fix CachingPostSerializer defining associations twice; add FragmentCaching benchmaking
 2016-04-21 23:44:54 -05:00
Lucas Hosseini
b4e2ac300c Merge pull request #1695 from beauby/meta-madness 
Meta no longer handled in Base adapter.
 2016-04-22 01:13:06 +02:00
Lucas Hosseini
e804d37924 Meta no longer handled in Base adapter. 2016-04-21 18:25:17 +02:00
L. Preston Sego III
f0fa74328f Merge pull request #1692 from beauby/fix-jsonapi-tests 
Fix tests to comply with the JSON API spec.
 2016-04-20 22:15:35 -04:00
Benjamin Fleischer
335869ec0b Add FragmentCaching benchmark 2016-04-20 10:47:55 -05:00
Benjamin Fleischer
02ad8c26b0 Fix CachingPostSerializer defining associations twice 2016-04-20 10:13:02 -05:00
Lucas Hosseini
ebda34b3d3 Fix tests to comply with the JSON API spec. 2016-04-20 03:08:54 +02:00
Benjamin Fleischer
7485c8487e Merge pull request #1687 from bf4/lazyify_calculating_caller_digest 
Lazify calculating caller file digest until used
 2016-04-18 16:09:24 -05:00