Permalink
Browse files

Fixed memoize with punctuation and freezing memoized methods with arg…

…uments

Signed-off-by: Joshua Peek <josh@joshpeek.com>
  • Loading branch information...
1 parent 105093f commit a8057669ff6ba11e228fc73eef7390b826d0de25 @jeremy jeremy committed with josh Aug 7, 2008
Showing with 26 additions and 4 deletions.
  1. +11 −4 activesupport/lib/active_support/memoizable.rb
  2. +15 −0 activesupport/test/memoizable_test.rb
@@ -10,9 +10,16 @@ def self.included(base)
end
def freeze_with_memoizable
- methods.each do |method|
- __send__($1) if method.to_s =~ /^_unmemoized_(.*)/
- end unless frozen?
+ unless frozen?
+ methods.each do |method|
+ if method.to_s =~ /^_unmemoized_(.*)/
+ begin
+ __send__($1)
+ rescue ArgumentError
+ end
+ end
+ end
+ end
freeze_without_memoizable
end
@@ -21,7 +28,7 @@ def freeze_with_memoizable
def memoize(*symbols)
symbols.each do |symbol|
original_method = "_unmemoized_#{symbol}"
- memoized_ivar = "@_memoized_#{symbol}"
+ memoized_ivar = "@_memoized_#{symbol.to_s.sub(/\?\Z/, '_query').sub(/!\Z/, '_bang')}"
class_eval <<-EOS, __FILE__, __LINE__
include Freezable
@@ -16,6 +16,16 @@ def name
"Josh"
end
+ def name?
+ true
+ end
+ memoize :name?
+
+ def update(name)
+ "Joshua"
+ end
+ memoize :update
+
def age
@age_calls += 1
nil
@@ -88,6 +98,10 @@ def test_memoization
assert_equal 1, @person.name_calls
end
+ def test_memoization_with_punctuation
+ assert_equal true, @person.name?
+ end
+
def test_memoization_with_nil_value
assert_equal nil, @person.age
assert_equal 1, @person.age_calls
@@ -114,6 +128,7 @@ def test_memoization_cache_is_different_for_each_instance
def test_memoized_is_not_affected_by_freeze
@person.freeze
assert_equal "Josh", @person.name
+ assert_equal "Joshua", @person.update("Joshua")
end
def test_memoization_with_args

0 comments on commit a805766

Please sign in to comment.