1 files changed, 17 insertions, 15 deletions
diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index d06250171a..c41feef4c7 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -5,28 +5,30 @@ module ActiveSupport
     end
 
     module ClassMethods
-      def memoize(symbol)
-        original_method = "_unmemoized_#{symbol}"
-        memoized_ivar = "@_memoized_#{symbol}"
-        raise "Already memoized #{symbol}" if instance_methods.map(&:to_s).include?(original_method)
+      def memoize(*symbols)
+        symbols.each do |symbol|
+          original_method = "unmemoized_#{symbol}"
+          memoized_ivar = "@#{symbol}"
+          raise "Already memoized #{symbol}" if instance_methods.map(&:to_s).include?(original_method)
 
-        alias_method original_method, symbol
-        class_eval <<-EOS, __FILE__, __LINE__
-          def #{symbol}
-            if defined? #{memoized_ivar}
-              #{memoized_ivar}
-            else
-              #{memoized_ivar} = #{original_method}
+          alias_method original_method, symbol
+          class_eval <<-EOS, __FILE__, __LINE__
+            def #{symbol}(reload = false)
+              if !reload && defined? #{memoized_ivar}
+                #{memoized_ivar}
+              else
+                #{memoized_ivar} = #{original_method}.freeze
+              end
             end
-          end
-        EOS
+          EOS
+        end
       end
     end
 
     def freeze
       methods.each do |method|
-        if m = method.to_s.match(/\A_unmemoized_(.*)/)
-          send(m[1]).freeze
+        if m = method.to_s.match(/\Aunmemoized_(.*)/)
+          send(m[1])
         end
       end
       super