Benjamin Fleischer
cd9689683c
Merge branch 'ouvrages-exclude_nil_links'
2016-06-09 02:55:32 -05:00
Benjamin Fleischer
b9e7dc5584
Merge pull request #1785 from bf4/fix_benchmark_expected_cache_response
...
Make bencharked model names reflect relationships; fix expected response
2016-06-09 00:07:59 -05:00
Benjamin Fleischer
af368af53e
Make bencharked model names reflect relationships; fix expected response
2016-06-08 23:40:36 -05:00
Benjamin Fleischer
3d9ab37ffa
Merge pull request #1781 from bf4/serializer_cleanup_6
...
Fix up caching, especially fragment_cache
2016-06-08 23:39:40 -05:00
Benjamin Fleischer
b599360ae3
Provide convenience serializer_class for all the self.class calls
...
per groyoh
https://github.com/rails-api/active_model_serializers/pull/1781#discussion_r66021340
2016-06-07 20:28:50 -05:00
Benjamin Fleischer
5375e009e2
Test caching with fragmented key
...
- on association, fix up assocation logic
- on attribute
2016-06-07 20:26:38 -05:00
Benjamin Fleischer
b8924157d7
Remove remaining fragmented cache class
2016-06-07 03:42:03 -05:00
Benjamin Fleischer
253205bb49
Improve Coverage
2016-06-07 01:50:03 -05:00
Benjamin Fleischer
35a7c81034
Fix up caching, especially fragment_cache
2016-06-07 00:52:05 -05:00
Benjamin Fleischer
d191342a6c
Merge pull request #1766 from bf4/serializer_cleanup_4
...
Move serialization logic into Serializer and CollectionSerializer
2016-06-05 23:56:03 -05:00
Benjamin Fleischer
7254d34c90
Move Serializer#serialize into Serializer#serializable_hash
2016-06-05 23:33:37 -05:00
Benjamin Fleischer
caf4910b6e
Remove controller :assigns warnings/shim
2016-06-04 15:00:51 -05:00
Benjamin Fleischer
913f396bb1
Move adapter cache properties to class level (where they belong).
2016-06-04 15:00:51 -05:00
Benjamin Fleischer
516e7da8ff
Move serialization logic into Serializer and CollectionSerializer
2016-06-04 14:59:51 -05:00
Benjamin Fleischer
41575e36f7
Moving Attributes#serializable_hash_for_single_resource to Serializer
2016-06-04 14:59:51 -05:00
Benjamin Fleischer
f28e486d4a
Remove Attributes adapter recursion
2016-06-04 14:59:51 -05:00
Spencer Oberstadt
998ca55e3d
Fix docs for deserialization ( #1768 )
...
I found in the tests that deserialization expects relationships to be under a `relationships` key.
https://github.com/rails-api/active_model_serializers/blob/master/test/action_controller/json_api/deserialization_test.rb#L68
2016-06-01 16:50:15 -04:00
Yohan Robert
44128a5d23
Merge pull request #1769 from remear/upgrade-rubocop
...
Upgrade to rubocop ~> 0.40.0
2016-06-01 19:51:10 +02:00
Ben Mills
d900b09f8d
Upgrade to rubocop ~> 0.40.0
2016-06-01 09:21:29 -06:00
Benjamin Fleischer
f2f747edda
Merge pull request #1765 from bf4/serializer_cleanup_3
...
Remove unnecessary Serializer#cached_fields; Extracted cached_attributes
2016-06-01 01:41:42 -05:00
Benjamin Fleischer
385abb4ba0
Simplify Serializer#cached_attributes to take a fields argument
2016-06-01 01:02:17 -05:00
Benjamin Fleischer
ba23de686d
Complete extracting to Serializer#cached_attributes
2016-06-01 01:02:13 -05:00
Benjamin Fleischer
96750b2f9a
Remove unnecessary Serializer#cached_fields
2016-06-01 00:47:10 -05:00
Benjamin Fleischer
eb86663393
Remove unnecessary Adapter::Base#resource_object_for
2016-06-01 00:43:24 -05:00
Benjamin Fleischer
fcfbc0d529
Merge pull request #1764 from bf4/serializer_cleanup_2
...
Remove unnecessary Adapter::Base#cache_attributes
2016-06-01 00:42:54 -05:00
Benjamin Fleischer
3f38a60d89
Merge pull request #1763 from bf4/serializer_cleanup_1
...
Remove unnecessary Adapter::Base#cache_check
2016-06-01 00:37:23 -05:00
Benjamin Fleischer
ee518e1856
Remove unnecessary Adapter::Base#cache_attributes
2016-06-01 00:35:11 -05:00
Benjamin Fleischer
0cc87fde40
Remove unnecessary Adapter::Base#cache_check
2016-06-01 00:15:29 -05:00
Yohan Robert
b8af2892f7
[skip ci] Fix root key documentation ( #1761 )
...
The current documentation stated that it was not possible to override
the root key for the JSON adapter. This was removed from the
documentation and it now links the useful documentation pages.
2016-05-31 13:30:47 -06:00
Benjamin Fleischer
6e609c1218
Merge pull request #1760 from bf4/remove_dead_file
...
Remove IncludeTree; missing from #1685
2016-05-31 07:57:18 -05:00
Benjamin Fleischer
5a4eef6cea
Remove IncludeTree; missing from #1685
2016-05-30 23:08:23 -05:00
Ryunosuke Sato
4f085441bd
Update README to write how to configure adapter ( #1758 )
2016-05-30 15:43:00 -04:00
Lucas Hosseini
f48fd2a327
Extract IncludeTree. ( #1685 )
2016-05-28 10:07:11 -04:00
Ben Mills
f2cb497fe3
Add key transform performance note to docs ( #1753 )
2016-05-26 16:19:19 -04:00
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