From 7dab186fded971e69f9d8bf5db524c20da326b83 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yatiohi@ideopolis.gr>
Date: Thu, 16 Sep 2010 19:44:18 +0300
Subject: Issue one Cache#read command instead of two in the case of a fragment
cache hit
---
actionpack/lib/action_view/helpers/cache_helper.rb | 4 ++--
actionpack/test/controller/log_subscriber_test.rb | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'actionpack')
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index 30e6c078b1..385378ea29 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -44,8 +44,8 @@ module ActionView
private
# TODO: Create an object that has caching read/write on it
def fragment_for(name = {}, options = nil, &block) #:nodoc:
- if controller.fragment_exist?(name, options)
- controller.read_fragment(name, options)
+ if fragment = controller.read_fragment(name, options)
+ fragment
else
# VIEW TODO: Make #capture usable outside of ERB
# This dance is needed because Builder can't use capture
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index e6fe0b1f04..cac0881133 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -139,20 +139,20 @@ class ACLogSubscriberTest < ActionController::TestCase
wait
assert_equal 4, logs.size
- assert_match(/Exist fragment\? views\/foo/, logs[1])
+ assert_match /Read fragment views\/foo/, logs[1]
assert_match(/Write fragment views\/foo/, logs[2])
ensure
@controller.config.perform_caching = true
end
-
+
def test_with_fragment_cache_and_percent_in_key
@controller.config.perform_caching = true
get :with_fragment_cache_and_percent_in_key
wait
assert_equal 4, logs.size
- assert_match(/Exist fragment\? views\/foo%bar/, logs[1])
- assert_match(/Write fragment views\/foo%bar/, logs[2])
+ assert_match /Read fragment views\/foo/, logs[1]
+ assert_match /Write fragment views\/foo/, logs[2]
ensure
@controller.config.perform_caching = true
end
--
cgit v1.2.3