jnicklas / merb-more fork watch download tarball
public
Fork of wycats/merb-more
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/jnicklas/merb-more.git
Search Repo: 
Fixed a bug where cache_{action,page} wouldn't work with multiple 
controllers (closing #90)
booss (author)
Thu Apr 03 02:28:28 -0700 2008
jnicklas (committer)
Fri Jun 27 04:36:22 -0700 2008
commit  1db8a2aa8fec4e31e5e99a24e9ec41d76a0ec4e6
tree    ca49a512df67361b6840f2b9e82255866febf584
parent  a42601791c45f045a7b3865b867a7b2141c7f0e2
0
merb-cache/lib/merb-cache/cache-action.rb 
...
28
29
30
31
 
32
33
34
 
...
28
29
30
 
31
32
33
34
 
0
@@ -28,7 +28,7 @@ module Merb::Cache::ControllerClassMethods
0
   # ==== Example
0
   #   cache_actions :mostly_static, [:barely_dynamic, 10]
0
   def cache_actions(*actions)
0
-    if actions.any? && Merb::Cache.cached_actions.empty?
0
+    if actions.any? && !Merb::Cache.cached_actions.key?(controller_name)
0
       before(:cache_action_before)
0
       after(:cache_action_after)
0
     end
0
merb-cache/lib/merb-cache/cache-page.rb 
...
29
30
31
32
 
33
34
35
 
...
29
30
31
 
32
33
34
35
 
0
@@ -29,7 +29,7 @@ module Merb::Cache::ControllerClassMethods
0
   # ==== Example
0
   #   cache_pages :mostly_static, [:barely_dynamic, 10]
0
   def cache_pages(*pages)
0
-    if pages.any? && Merb::Cache.cached_pages.empty?
0
+    if pages.any? && !Merb::Cache.cached_pages.key?(controller_name)
0
       before(:cache_page_before)
0
       after(:cache_page_after)
0
     end

Comments

    No one has commented yet.