ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-22 22:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation warnings on Rails 6

Browse Source 
takes into account suggestions from @bf4
This commit is contained in:
Kyle Keesling 2019-02-26 23:26:24 -05:00
parent bb0f9d088d
commit 6fbeb9a93e
No known key found for this signature in database
GPG Key ID: 3D0687B4CB8EBDE5
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/action_controller/serialization.rb
View File

@ -23,7 +23,15 @@ module ActionController
end end
def namespace_for_serializer def namespace_for_serializer
@namespace_for_serializer ||= self.class.parent unless self.class.parent == Object @namespace_for_serializer ||= namespace_for_class(self.class) unless namespace_for_class(self.class) == Object
end
def namespace_for_class(klass)
if Module.method_defined?(:module_parent)
klass.module_parent
else
klass.parent
end
end end
def serialization_scope def serialization_scope

7
test/action_controller/namespace_lookup_test.rb
View File

@ -125,7 +125,12 @@ module ActionController
tests Api::V3::LookupTestController tests Api::V3::LookupTestController
setup do setup do
@test_namespace = self.class.parent @test_namespace =
if Module.method_defined?(:module_parent)
self.class.module_parent
else
self.class.parent
end
end end
test 'uses request headers to determine the namespace' do test 'uses request headers to determine the namespace' do