From f767ac22fa213df754e160c59189d28ed4f95568 Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Wed, 19 Nov 2014 12:04:51 -0800
Subject: Reintroduce cache with tests

---
 activerecord/lib/active_record/type/type_map.rb | 28 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'activerecord/lib/active_record/type/type_map.rb')

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
-- 
cgit v1.2.3