Some performance tweaks to ActiveSupport::Memoizable

Signed-off-by: Joshua Peek <josh@joshpeek.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/memoizable.rb b/activesupport/lib/active_support/memoizable.rb
index 65feca363a..5af50df023 100644
--- a/activesupport/lib/active_support/memoizable.rb
+++ b/activesupport/lib/active_support/memoizable.rb
@@ -7,10 +7,12 @@ module ActiveSupport
     module ClassMethods
       def memoize(symbol)
         original_method = "_unmemoized_#{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 instance_variable_defined?(:@#{symbol})
+            if defined? @#{symbol}
               @#{symbol}
             else
               @#{symbol} = #{original_method}
@@ -22,7 +24,7 @@ module ActiveSupport
 
     def freeze
       methods.each do |method|
-        if m = method.to_s.match(/^_unmemoized_(.*)/)
+        if m = method.to_s.match(/\A_unmemoized_(.*)/)
           send(m[1]).freeze
         end
       end
diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
index 1b6cec2b2f..fc24a2942d 100644
--- a/activesupport/test/memoizable_test.rb
+++ b/activesupport/test/memoizable_test.rb
@@ -41,5 +41,9 @@ uses_mocha 'Memoizable' do
       person.freeze
       assert_equal nil, person.age
     end
+
+    def test_double_memoization
+      assert_raise(RuntimeError) { Person.memoize :name }
+    end
   end
 end