diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-11-19 12:04:51 -0800 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-11-19 12:11:26 -0800 |
commit | f767ac22fa213df754e160c59189d28ed4f95568 (patch) | |
tree | ef999dd9c51aca766da16cd1f7cbb9b7ab8944ee /activerecord/lib/active_record/type/type_map.rb | |
parent | cafed35b610d830049b7dffd924cbcdeedab72bb (diff) | |
download | rails-f767ac22fa213df754e160c59189d28ed4f95568.tar.gz rails-f767ac22fa213df754e160c59189d28ed4f95568.tar.bz2 rails-f767ac22fa213df754e160c59189d28ed4f95568.zip |
Reintroduce cache with tests
Diffstat (limited to 'activerecord/lib/active_record/type/type_map.rb')
-rw-r--r-- | activerecord/lib/active_record/type/type_map.rb | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/type/type_map.rb b/activerecord/lib/active_record/type/type_map.rb index 13d4943861..7c194c0cdf 100644 --- a/activerecord/lib/active_record/type/type_map.rb +++ b/activerecord/lib/active_record/type/type_map.rb @@ -3,26 +3,22 @@ module ActiveRecord class TypeMap # :nodoc: def initialize @mapping = {} + @cache = Hash.new do |h, key| + h[key] = {} + end end def lookup(lookup_key, *args) fetch(lookup_key, *args) { default_value } end - def fetch(lookup_key, *args) - matching_pair = @mapping.reverse_each.detect do |key, _| - key === lookup_key - end - - if matching_pair - matching_pair.last.call(lookup_key, *args) - else - yield lookup_key, *args - end + def fetch(lookup_key, *args, &block) + @cache[lookup_key][args] ||= perform_fetch(lookup_key, *args, &block) end def register_type(key, value = nil, &block) raise ::ArgumentError unless value || block + @cache.clear if block @mapping[key] = block @@ -44,6 +40,18 @@ module ActiveRecord private + def perform_fetch(lookup_key, *args) + matching_pair = @mapping.reverse_each.detect do |key, _| + key === lookup_key + end + + if matching_pair + matching_pair.last.call(lookup_key, *args) + else + yield lookup_key, *args + end + end + def default_value @default_value ||= Value.new end |