Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### 2.0.1 (Next)

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

### 2.0.0 (2025/06/02)
Expand Down
14 changes: 8 additions & 6 deletions lib/grape-active_model_serializers/serializer_resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ def serializer
def serializer_class
return @serializer_class if defined?(@serializer_class)

@serializer_class = resource_defined_class
@serializer_class ||= collection_class
@serializer_class ||= options[:serializer]
@serializer_class ||= namespace_inferred_class
@serializer_class ||= version_inferred_class
@serializer_class ||= resource_serializer_class
return nil if options.key?(:serializer) && options[:serializer].nil?

@serializer_class = resource_defined_class ||
collection_class ||
options[:serializer] ||
namespace_inferred_class ||
version_inferred_class ||
resource_serializer_class
end

def serializer_options
Expand Down
12 changes: 12 additions & 0 deletions spec/grape/active_model_serializers/serializer_resolver_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
expect(serializer).to be_kind_of(serializer_class)
end

context 'specified nil by options' do
let(:options) {
super().merge(
serializer: nil
)
}

it 'returns nil' do
expect(serializer).to be_nil
end
end

context 'each serializer' do
let(:options) {
super().except(:serializer).merge(
Expand Down
Loading