File tree Expand file tree Collapse file tree 3 files changed +21
-6
lines changed
lib/grape-active_model_serializers
spec/grape/active_model_serializers Expand file tree Collapse file tree 3 files changed +21
-6
lines changed Original file line number Diff line number Diff line change 2
2
3
3
### 2.0.1 (Next)
4
4
5
+ * [ #92 ] ( https://github.com/ruby-grape/grape-active_model_serializers/pull/92 ) : Fix: accept nil serializer - [ @mateusnava ] ( https://github.com/mateusnava ) .
5
6
* Your contribution here.
6
7
7
8
### 2.0.0 (2025/06/02)
Original file line number Diff line number Diff line change @@ -17,12 +17,14 @@ def serializer
17
17
def serializer_class
18
18
return @serializer_class if defined? ( @serializer_class )
19
19
20
- @serializer_class = resource_defined_class
21
- @serializer_class ||= collection_class
22
- @serializer_class ||= options [ :serializer ]
23
- @serializer_class ||= namespace_inferred_class
24
- @serializer_class ||= version_inferred_class
25
- @serializer_class ||= resource_serializer_class
20
+ return nil if options . key? ( :serializer ) && options [ :serializer ] . nil?
21
+
22
+ @serializer_class = resource_defined_class ||
23
+ collection_class ||
24
+ options [ :serializer ] ||
25
+ namespace_inferred_class ||
26
+ version_inferred_class ||
27
+ resource_serializer_class
26
28
end
27
29
28
30
def serializer_options
Original file line number Diff line number Diff line change 52
52
expect ( serializer ) . to be_kind_of ( serializer_class )
53
53
end
54
54
55
+ context 'specified nil by options' do
56
+ let ( :options ) {
57
+ super ( ) . merge (
58
+ serializer : nil
59
+ )
60
+ }
61
+
62
+ it 'returns nil' do
63
+ expect ( serializer ) . to be_nil
64
+ end
65
+ end
66
+
55
67
context 'each serializer' do
56
68
let ( :options ) {
57
69
super ( ) . except ( :serializer ) . merge (
You can’t perform that action at this time.
0 commit comments