kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Escaping symbol passed into Memoizable's flush_cache for query methods to allow them to be cleared

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

[#3138 state:committed]
This commit is contained in:
Jay Pignata 2009-09-04 17:28:36 -04:00 committed by Michael Koziarski
parent e01f99786a
commit d48ebeade2
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activesupport/lib/active_support/memoizable.rb
View file

@ -57,10 +57,10 @@ module ActiveSupport
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

11
activesupport/test/memoizable_test.rb
View file

@ -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 @@ class MemoizableTest < ActiveSupport::TestCase
end
def name?
@name_query_calls += 1
true
end
memoize :name?
@ -116,6 +118,13 @@ class MemoizableTest < ActiveSupport::TestCase
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