memoize_ and unmemoize_all

1 files changed, 33 insertions, 18 deletions

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index b5adc2330c..5aa73bce52 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -10,25 +10,37 @@ module ActiveSupport
       end
 
       def freeze_with_memoizable
-        unless frozen?
-          methods.each do |method|
-            if method.to_s =~ /^_unmemoized_(.*)/
-              begin
-                __send__($1).freeze
-              rescue ArgumentError
-              end
+        memoize_all unless frozen?
+        freeze_without_memoizable
+      end
+
+      def memoize_all
+        methods.each do |m|
+          if m.to_s =~ /^_unmemoized_(.*)/
+            if method(m).arity == 0
+              __send__($1)
+            else
+              ivar = :"@_memoized_#{$1}"
+              instance_variable_set(ivar, {})
             end
           end
         end
+      end
 
-        freeze_without_memoizable
+      def unmemoize_all
+        methods.each do |m|
+          if m.to_s =~ /^_unmemoized_(.*)/
+            ivar = :"@_memoized_#{$1}"
+            instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
+          end
+        end
       end
     end
 
     def memoize(*symbols)
       symbols.each do |symbol|
-        original_method = "_unmemoized_#{symbol}"
-        memoized_ivar = "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}"
+        original_method = :"_unmemoized_#{symbol}"
+        memoized_ivar = :"@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}"
 
         class_eval <<-EOS, __FILE__, __LINE__
           include Freezable
@@ -38,21 +50,24 @@ module ActiveSupport
 
           if instance_method(:#{symbol}).arity == 0
             def #{symbol}(reload = false)
-              if !reload && defined? #{memoized_ivar}
-                #{memoized_ivar}
-              else
-                #{memoized_ivar} = #{original_method}
+              if reload || !defined?(#{memoized_ivar}) || #{memoized_ivar}.empty?
+                #{memoized_ivar} = [#{original_method}]
               end
+              #{memoized_ivar}[0]
             end
           else
             def #{symbol}(*args)
-              #{memoized_ivar} ||= {}
+              #{memoized_ivar} ||= {} unless frozen?
               reload = args.pop if args.last == true || args.last == :reload
 
-              if !reload && #{memoized_ivar} && #{memoized_ivar}.has_key?(args)
-                #{memoized_ivar}[args]
+              if #{memoized_ivar}
+                if !reload && #{memoized_ivar}.has_key?(args)
+                  #{memoized_ivar}[args]
+                elsif #{memoized_ivar}
+                  #{memoized_ivar}[args] = #{original_method}(*args)
+                end
               else
-                #{memoized_ivar}[args] = #{original_method}(*args)
+                #{original_method}(*args)
               end
             end
           end