ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 14:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1006 from bf4/inflector-testing

Browse Source 
Fix adapter inflection bug for api -> API
This commit is contained in:
João Moura 2015-07-20 23:20:00 -04:00
commit 6266b6a002
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,8 @@ module ActiveModel
end
def self.adapter_class(adapter)
"ActiveModel::Serializer::Adapter::#{adapter.to_s.classify}".safe_constantize
adapter_name = adapter.to_s.classify.sub("API", "Api")
"ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
end
def fragment_cache(*args)
@ -42,7 +43,7 @@ module ActiveModel
private
def cache_check(serializer)
def cache_check(serializer)
@cached_serializer = serializer
@klass = @cached_serializer.class
if is_cached?

9
test/adapter_test.rb
View File

@ -38,6 +38,15 @@ module ActiveModel
adapter = ActiveModel::Serializer::Adapter.create(@serializer, { adapter: :json_api})
assert_equal ActiveModel::Serializer::Adapter::JsonApi, adapter.class
end
def test_inflected_adapter_class_for_known_adapter
ActiveSupport::Inflector.inflections(:en){|inflect| inflect.acronym 'API' }
klass = ActiveModel::Serializer::Adapter.adapter_class(:json_api)
ActiveSupport::Inflector.inflections.acronyms.clear
assert_equal ActiveModel::Serializer::Adapter::JsonApi, klass
end
end
end
end