ditkrg/active_model_serializers
5
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-25 07:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move serializer caching from adapter

Browse Source
This commit is contained in:
Benjamin Fleischer
2016-01-27 15:03:34 -05:00
parent 093d198bc4
commit eda8ff1737
19 changed files with 247 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/active_model/serializer.rb
View File

@@ -48,9 +48,12 @@ module ActiveModel
# @see ActiveModelSerializers::Adapter.lookup
# Deprecated
def self.adapter
warn 'Calling adapter method in Serializer, please use the ActiveModelSerializers::Adapter.configured_adapter'
ActiveModelSerializers::Adapter.lookup(config.adapter)
end
class << self
extend ActiveModelSerializers::Deprecate
deprecate :adapter, 'ActiveModelSerializers::Adapter.configured_adapter'
end
# @api private
def self.serializer_lookup_chain_for(klass)

2
lib/active_model/serializer/attributes.rb
View File

@@ -68,7 +68,7 @@ module ActiveModel
# @api private
# maps attribute value to explict key name
# @see Serializer::attribute
# @see Adapter::FragmentCache#fragment_serializer
# @see FragmentCache#fragment_serializer
def _attributes_keys
_attributes_data
.each_with_object({}) do |(key, attr), hash|