From 24bf3af50ddd3736e0dc17ca712e8230db9332f1 Mon Sep 17 00:00:00 2001
From: AntonioTerceiro <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Sat, 12 Jul 2008 14:07:30 +0000
Subject: [PATCH] ActionItem514: caching the categories menu

---
 app/controllers/admin/categories_controller.rb | 12 ++++++++++++
 app/views/layouts/application.rhtml            |  4 +++-
 config/routes.rb                               |  8 ++------
 test/functional/categories_controller_test.rb  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb
index 304145e..9c5cac0 100644
--- a/app/controllers/admin/categories_controller.rb
+++ b/app/controllers/admin/categories_controller.rb
@@ -23,6 +23,7 @@ class CategoriesController < AdminController
     if request.post?
       begin
         @category.save!
+        @saved = true
         redirect_to :action => 'index'
       rescue Exception => e
         render :action => 'new'
@@ -36,6 +37,7 @@ class CategoriesController < AdminController
       @category = environment.categories.find(params[:id])
       if request.post?
         @category.update_attributes!(params[:category])
+        @saved = true
         redirect_to :action => 'index'
       end
     rescue Exception => e
@@ -43,10 +45,20 @@ class CategoriesController < AdminController
     end
   end
 
+  after_filter :manage_categories_menu_cache, :only => [:edit, :new]
+
   post_only :remove
   def remove
     environment.categories.find(params[:id]).destroy
     redirect_to :action => 'index'
   end
 
+  protected
+
+  def manage_categories_menu_cache
+    if @saved && request.post? && @category.display_in_menu?
+      expire_fragment(:controller => 'public', :action => 'categories_menu')
+    end
+  end
+
 end
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 3c023d8..1ed30d4 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -94,7 +94,9 @@
                       { :controller=>"home" },
                         :id=>"menu_link_to_envhome",
                         :title=>@environment.name  %>
-          <%= render :file => 'shared/categories_menu' %>
+          <% cache(:controller => 'public', :action => 'categories_menu') do %>
+            <%= render :file => 'shared/categories_menu' %>
+          <% end %>
         </div><!-- id='navigation_bar' -->
         <script type="text/javascript">
           prepareMenu('navigation_bar', { timeout: 1000 });
diff --git a/config/routes.rb b/config/routes.rb
index c9925d5..a220039 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -68,12 +68,8 @@ ActionController::Routing::Routes.draw do |map|
   map.system 'system', :controller => 'system'
   map.system 'system/:controller/:action/:id', :controller => Noosfero.pattern_for_controllers_in_directory('system')
 
-
-  ######################################################
-  ## Test controllers.
-  ## FIXME: this should not be needed
-  ######################################################
-  map.connect 'test/:controller/:action/:id'  , :controller => /.*test.*/ 
+  # cache stuff - hack
+  map.cache 'public/:action/:id', :controller => 'public'
 
   # *content viewing*
   # XXX this route must come last so other routes have priority over it.
diff --git a/test/functional/categories_controller_test.rb b/test/functional/categories_controller_test.rb
index 54ae568..d7fb47e 100644
--- a/test/functional/categories_controller_test.rb
+++ b/test/functional/categories_controller_test.rb
@@ -88,4 +88,52 @@ class CategoriesControllerTest < Test::Unit::TestCase
     end
   end
 
+  should 'expire categories menu cache when some menu category is updated' do
+    cat = Category.create!(:name => 'test category in menu', :environment => Environment.default, :display_in_menu => true)
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').once
+    post :edit, :id => cat.id, :category => { :name => 'new name for category in menu' }
+  end
+
+  should 'not touch categories menu cache whem updated category is not in menu' do
+    cat = Category.create!(:name => 'test category not in menu', :environment => Environment.default, :display_in_menu => false)
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+    post :edit, :id => cat.id, :category => { :name => 'new name for category not in menu' }
+  end
+
+  should 'expire categories menu cache when new category is created for the menu' do
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').once
+    post :new, :category => { :name => 'my new category for the menu', :display_in_menu => '1' }
+  end
+
+  should 'not handle cache when viewing "edit category" screen' do
+    cat = Category.create!(:name => 'test category in menu', :environment => Environment.default, :display_in_menu => true)
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+    get :edit, :id => cat.id
+  end
+
+  should 'not expire categories menu cache when new category is created, but not for the menu' do
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+    post :new, :category => { :name => 'my new category for the menu', :display_in_menu => '0' }
+  end
+
+  should 'not handle cache when viewing "new category" screen' do
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+    get :new
+  end
+
+  should 'not expire cache when updating fails' do
+    cat = Category.create!(:name => 'test category in menu', :environment => Environment.default, :display_in_menu => true)
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+
+    post :edit, :id => cat.id, :category => { :name => '' }
+
+    cat.reload
+    assert_equal 'test category in menu', cat.name
+  end
+
+  should 'not expire cache when creating fails' do
+    @controller.expects(:expire_fragment).with(:controller => 'public', :action => 'categories_menu').never
+    post :new, :category => { :display_in_menu => '1' }
+  end
+
 end
--
libgit2 0.21.2