mirror of
https://github.com/ditkrg/active_model_serializers.git
synced 2026-01-24 06:46:50 +00:00
Merge pull request #2079 from dylanahsmith/backport-serializers-cache
Backport caching of the constant lookup
This commit is contained in:
commit
1e04d1128b
@ -21,5 +21,6 @@ Gem::Specification.new do |gem|
|
|||||||
gem.required_ruby_version = ">= 1.9.3"
|
gem.required_ruby_version = ">= 1.9.3"
|
||||||
|
|
||||||
gem.add_dependency "activemodel", ">= 3.2"
|
gem.add_dependency "activemodel", ">= 3.2"
|
||||||
|
gem.add_dependency "concurrent-ruby", "~> 1.0"
|
||||||
gem.add_development_dependency "rails", ">= 3.2"
|
gem.add_development_dependency "rails", ">= 3.2"
|
||||||
end
|
end
|
||||||
|
|||||||
@ -33,7 +33,11 @@ module ActiveModel
|
|||||||
end
|
end
|
||||||
|
|
||||||
def namespace
|
def namespace
|
||||||
get_namespace && Utils._const_get(get_namespace)
|
if module_name = get_namespace
|
||||||
|
Serializer.serializers_cache.fetch_or_store(module_name) do
|
||||||
|
Utils._const_get(module_name)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def embedded_in_root_associations
|
def embedded_in_root_associations
|
||||||
|
|||||||
@ -4,6 +4,7 @@ require 'active_model/serializer/association'
|
|||||||
require 'active_model/serializer/config'
|
require 'active_model/serializer/config'
|
||||||
|
|
||||||
require 'thread'
|
require 'thread'
|
||||||
|
require 'concurrent/map'
|
||||||
|
|
||||||
module ActiveModel
|
module ActiveModel
|
||||||
class Serializer
|
class Serializer
|
||||||
@ -65,7 +66,10 @@ end
|
|||||||
ArraySerializer
|
ArraySerializer
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
_const_get build_serializer_class(resource, options)
|
klass_name = build_serializer_class(resource, options)
|
||||||
|
Serializer.serializers_cache.fetch_or_store(klass_name) do
|
||||||
|
_const_get(klass_name)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -100,6 +104,10 @@ end
|
|||||||
associate(Association::HasMany, *attrs)
|
associate(Association::HasMany, *attrs)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def serializers_cache
|
||||||
|
@serializers_cache ||= Concurrent::Map.new
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def strip_attribute(attr)
|
def strip_attribute(attr)
|
||||||
|
|||||||
@ -14,6 +14,9 @@ begin
|
|||||||
ActionController::Base.send(:include, ::ActionController::Serialization)
|
ActionController::Base.send(:include, ::ActionController::Serialization)
|
||||||
ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
|
ActionController::TestCase.send(:include, ::ActionController::SerializationAssertions)
|
||||||
end
|
end
|
||||||
|
ActionDispatch::Reloader.to_prepare do
|
||||||
|
ActiveModel::Serializer.serializers_cache.clear
|
||||||
|
end
|
||||||
end
|
end
|
||||||
rescue LoadError
|
rescue LoadError
|
||||||
# rails not installed, continuing
|
# rails not installed, continuing
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user