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

Better serializer registration, get more than just the first module

Browse Source 
But is potentially breaking anyone on rc3, but the fix is just
to manually register the adapter with the rc3-style name
This commit is contained in:
Benjamin Fleischer 2015-09-17 14:47:11 -05:00
parent ee40e9fcef
commit eb1264ad99
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/active_model/serializer/adapter.rb
View File

@ -38,12 +38,16 @@ module ActiveModel
# Adds an adapter 'klass' with 'name' to the 'adapter_map' # Adds an adapter 'klass' with 'name' to the 'adapter_map'
# Names are stringified and underscored # Names are stringified and underscored
# @param [Symbol, String] name of the registered adapter # @param name [Symbol, String, Class] name of the registered adapter
# @param [Class] klass - adapter class itself # @param klass [Class] adapter class itself, optional if name is the class
# @example # @example
# AMS::Adapter.register(:my_adapter, MyAdapter) # AMS::Adapter.register(:my_adapter, MyAdapter)
def register(name, klass) # @note The registered name strips out 'ActiveModel::Serializer::Adapter::'
adapter_map.update(name.to_s.underscore => klass) # so that registering 'ActiveModel::Serializer::Adapter::Json' and
# 'Json' will both register as 'json'.
def register(name, klass = name)
name = name.to_s.gsub(/\AActiveModel::Serializer::Adapter::/, ''.freeze)
adapter_map.update(name.underscore => klass)
self self
end end
@ -78,7 +82,7 @@ module ActiveModel
# Automatically register adapters when subclassing # Automatically register adapters when subclassing
def self.inherited(subclass) def self.inherited(subclass)
ActiveModel::Serializer::Adapter.register(subclass.to_s.demodulize, subclass) ActiveModel::Serializer::Adapter.register(subclass)
end end
attr_reader :serializer, :instance_options attr_reader :serializer, :instance_options

6
test/serializers/adapter_for_test.rb
View File

@ -138,14 +138,14 @@ module ActiveModel
Object.send(:remove_const, :MyAdapter) Object.send(:remove_const, :MyAdapter)
end end
def test_inherited_adapter_hooks_register_demodulized_adapter def test_inherited_adapter_hooks_register_namespaced_adapter
Object.const_set(:MyNamespace, Module.new) Object.const_set(:MyNamespace, Module.new)
MyNamespace.const_set(:MyAdapter, Class.new) MyNamespace.const_set(:MyAdapter, Class.new)
my_adapter = MyNamespace::MyAdapter my_adapter = MyNamespace::MyAdapter
ActiveModel::Serializer::Adapter.inherited(my_adapter) ActiveModel::Serializer::Adapter.inherited(my_adapter)
assert_equal ActiveModel::Serializer::Adapter.lookup(:my_adapter), my_adapter assert_equal ActiveModel::Serializer::Adapter.lookup(:'my_namespace/my_adapter'), my_adapter
ensure ensure
ActiveModel::Serializer::Adapter.adapter_map.delete('my_adapter'.freeze) ActiveModel::Serializer::Adapter.adapter_map.delete('my_namespace/my_adapter'.freeze)
MyNamespace.send(:remove_const, :MyAdapter) MyNamespace.send(:remove_const, :MyAdapter)
Object.send(:remove_const, :MyNamespace) Object.send(:remove_const, :MyNamespace)
end end