Skip to content

Commit 2b037f7

Browse files
author
Mateus Nava
committed
fix: Accept nil serializer
1 parent eb20081 commit 2b037f7

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
### 1.5.3 (Next)
44

5-
* Your contribution here.
5+
* Your contribution here
6+
* [#92](https://github.com/ruby-grape/grape-active_model_serializers/pull/92): Fix: accept nil serializer - [@mateusnava](https://github.com/mateusnava).
67

78
### 1.5.2 (March 14, 2018)
89

lib/grape-active_model_serializers/serializer_resolver.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ def serializer
1616

1717
def serializer_class
1818
return @serializer_class if defined?(@serializer_class)
19+
20+
return nil if options.has_key?(:serializer) && options[:serializer].nil?
21+
1922
@serializer_class = resource_defined_class
2023
@serializer_class ||= collection_class
2124
@serializer_class ||= options[:serializer]

spec/grape/active_model_serializers/serializer_resolver_spec.rb

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@
5252
expect(serializer).to be_kind_of(serializer_class)
5353
end
5454

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+
5567
context 'each serializer' do
5668
let(:options) {
5769
super().except(:serializer).merge(

0 commit comments

Comments
 (0)