Permalink
Browse files

Escaping symbol passed into Memoizable's flush_cache for query method…

…s to allow them to be cleared

Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#3138 state:committed]
  • Loading branch information...
1 parent e01f997 commit d48ebeade2d907573e3fb086495b57b10115066c Jay Pignata committed with NZKoz Sep 4, 2009
Showing with 12 additions and 3 deletions.
  1. +2 −2 activesupport/lib/active_support/memoizable.rb
  2. +10 −1 activesupport/test/memoizable_test.rb
@@ -57,10 +57,10 @@ def prime_cache(*syms)
end
end
- def flush_cache(*syms, &block)
+ def flush_cache(*syms)
syms.each do |sym|
(methods + private_methods + protected_methods).each do |m|
- if m.to_s =~ /^_unmemoized_(#{sym})/
+ if m.to_s =~ /^_unmemoized_(#{sym.to_s.gsub(/\?\Z/, '\?')})/
ivar = ActiveSupport::Memoizable.memoized_ivar_for($1)
instance_variable_get(ivar).clear if instance_variable_defined?(ivar)
end
@@ -4,12 +4,13 @@ class MemoizableTest < ActiveSupport::TestCase
class Person
extend ActiveSupport::Memoizable
- attr_reader :name_calls, :age_calls, :is_developer_calls
+ attr_reader :name_calls, :age_calls, :is_developer_calls, :name_query_calls
def initialize
@name_calls = 0
@age_calls = 0
@is_developer_calls = 0
+ @name_query_calls = 0
end
def name
@@ -18,6 +19,7 @@ def name
end
def name?
+ @name_query_calls += 1
true
end
memoize :name?
@@ -116,6 +118,13 @@ def test_memoization_with_punctuation
end
end
+ def test_memoization_flush_with_punctuation
+ assert_equal true, @person.name?
+ @person.flush_cache(:name?)
+ 3.times { assert_equal true, @person.name? }
+ assert_equal 2, @person.name_query_calls
+ end
+
def test_memoization_with_nil_value
assert_equal nil, @person.age
assert_equal 1, @person.age_calls

0 comments on commit d48ebea

Please sign in to comment.