Skip to content

Commit b5c18df

Browse files
authored
Merge pull request #2468 from Shopify/0-9-stable-revert-string-serializer
[0.9 stable] Revert "Allow serializer_for to accept String instead of just class objects"
2 parents 5426bc3 + aac72cf commit b5c18df

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

lib/active_model/serializer.rb

+1-5
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,7 @@ def build_serializer_class(resource, options)
133133
klass_name = +""
134134
klass_name << "#{options[:namespace]}::" if options[:namespace]
135135
klass_name << options[:prefix].to_s.classify if options[:prefix]
136-
if resource.is_a?(String)
137-
klass_name << "#{resource}Serializer"
138-
else
139-
klass_name << "#{resource.class.name}Serializer"
140-
end
136+
klass_name << "#{resource.class.name}Serializer"
141137
end
142138

143139
def associate(klass, *attrs)

test/unit/active_model/array_serializer/serialization_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_serializer_for_array_returns_appropriate_type
4949
def object.serializer_class; CustomSerializer; end
5050

5151
assert_equal CustomSerializer, Serializer.serializer_for(object)
52-
assert_equal CustomSerializer, Serializer.serializer_for('Custom')
52+
assert_nil Serializer.serializer_for('Custom')
5353
end
5454
end
5555

0 commit comments

Comments
 (0)