spud_cms 0.4.5 → 0.4.6

data/app/controllers/pages_controller.rb

@@ -1,5 +1,6 @@
 class PagesController < ApplicationController
-	caches_action :show, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
+	caches_action :show, :if => Proc.new { |c| Spud::Cms.enable_action_caching }
+	caches_page :show, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
 	def show
 		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
 		@page = SpudPage.published_pages.where(:url_name => url_name).includes([:spud_template,:spud_page_partials]).first

data/app/controllers/spud/admin/menu_items_controller.rb

@@ -4,7 +4,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	layout 'spud/admin/cms/detail'
 	before_filter :load_menu
 	before_filter :load_menu_item, :only => [:edit,:update,:show,:destroy]
-
+	cache_sweeper :page_sweeper,:only => [:create,:update,:destroy]
 	def index
 		@page_name = "Menu Items"
 		@menu_items = @menu.spud_menu_items.order(:menu_order).includes(:spud_menu_items).paginate :page => params[:page]
@@ -20,7 +20,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	end
 
 	def create
-		clear_action_cache
+		
 		add_breadcrumb "New", :new_spud_admin_page_path
 		@page_name = "New Menu Item"
 		@menu_item = SpudMenuItem.new(params[:spud_menu_item])
@@ -57,7 +57,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		clear_action_cache
+		
 		add_breadcrumb "Edit #{@menu_item.name}", :edit_spud_admin_menu_menu_item_path
 		@page_name = "Edit #{@menu_item.name}"
 		if params[:spud_menu_item][:parent_id].blank?
@@ -74,7 +74,7 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 	end
 
 	def destroy
-		clear_action_cache
+		
 		flash[:notice] = "Menu Item removed!" if @menu_item.destroy
 
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
@@ -98,19 +98,7 @@ private
 		end
 	end
 
-	def clear_action_cache
 
-		if(Spud::Cms.enable_full_page_caching == false)
-			return
-		end
-		Rails.cache.clear
-		# @pages = SpudPage.published_pages.all
-		# if !@pages.blank?
-		# 	@pages.each do |page|
-		# 		expire_action page_url(:id => page.url_name)
-		# 	end
-		# end
-	end
 	
 
 

data/app/controllers/spud/admin/pages_controller.rb

@@ -3,7 +3,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	add_breadcrumb "Pages", :spud_admin_pages_path
 	belongs_to_spud_app :pages
 	before_filter :load_page,:only => [:edit,:update,:show,:destroy]
-	
+	cache_sweeper :page_sweeper,:only => [:update,:destroy]
 	def index
 		
 		@pages = SpudPage.where(:spud_page_id => nil).order(:page_order).includes(:spud_pages).paginate :page => params[:page]
@@ -72,7 +72,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		expire_spud_page
+		
 		if @page.update_attributes(params[:spud_page])
 			flash[:notice] = "Page updated successfully!"
 			redirect_to spud_admin_pages_url() and return
@@ -85,7 +85,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 	def destroy
 		status = 500
-		expire_spud_page
+		
 		if @page.destroy
 			flash[:notice] = "Page removed successfully!"
 			status = 200
@@ -140,12 +140,6 @@ private
 		return true
 	end
 
-	def expire_spud_page
-		if @page.url_name == Spud::Cms.root_page_name
-        	expire_action root_url
-	    else
-			expire_action page_url(:id => @page.url_name)
-		end
-	end
+	
 
 end

data/app/controllers/spud/admin/templates_controller.rb

@@ -3,7 +3,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 	add_breadcrumb "Templates", :spud_admin_templates_path
 	belongs_to_spud_app :templates
 	before_filter :load_template,:only => [:edit,:update,:show,:destroy]
-	
+	cache_sweeper :page_sweeper,:only => [:update,:destroy]
 
 	def index
 		flash.now[:warning] = "Templates are an advanced way to create modified pages and require some experience in HTML and Ruby."
@@ -33,7 +33,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		clear_action_cache
+		
 		add_breadcrumb "Edit #{@template.name}", :edit_spud_admin_template_path
 		flash[:notice] = "Template updated successfully" if @template.update_attributes(params[:spud_template])
 		
@@ -42,7 +42,7 @@ class Spud::Admin::TemplatesController < Spud::Admin::ApplicationController
 
 
 	def destroy
-		clear_action_cache
+		
 		flash[:notice] = "Template removed" if @template.destroy
 		
 		respond_with @template, :location => spud_admin_templates_url
@@ -57,16 +57,6 @@ private
 		end
 	end
 
-	def clear_action_cache
-		if(Spud::Cms.enable_full_page_caching == false)
-			return
-		end
-		Rails.cache.clear
-		# if !@template.spud_pages.blank?
-		# 	@template.spud_pages.each do |page|
-		# 		expire_action page_path(:id => page.url_name)
-		# 	end
-		# end
-	end
+	
 
 end

data/app/models/page_sweeper.rb

@@ -0,0 +1,36 @@
+class PageSweeper < ActionController::Caching::Sweeper
+  observe SpudPage,SpudTemplate,SpudMenuItem
+
+  def after_save(record)
+    logger.debug("SWEEPING!")
+    expire_cache_for(record)
+  end
+  def after_destroy(record)
+  	expire_cache_for(record)
+  end
+private
+  def expire_cache_for(record)
+  	if(record.is_a?(SpudTemplate))
+  		record.spud_pages.each do |page|
+  			expire_cache_for(page)
+  		end
+    elsif record.is_a?(SpudPage)
+    	if Spud::Cms.enable_full_page_caching
+    		if record.url_name == Spud::Cms.root_page_name
+	        	expire_page root_path
+		    else
+  				expire_page page_path(:id => record.url_name)
+			end
+    	elsif Spud::Cms.enable_action_caching
+    		if record.url_name == Spud::Cms.root_page_name
+	        	expire_action root_path
+		    else
+				expire_action page_path(:id => record.url_name)
+			end
+    	end
+    else
+    	Rails.cache.clear
+    	SpudPage.published_pages.all.each {|page| expire_cache_for(page)}
+    end
+  end
+end

data/lib/spud_cms/configuration.rb

@@ -2,7 +2,7 @@ module Spud
   module Cms
     include ActiveSupport::Configurable
 
-    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching
+    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching
 
     self.root_page_name = "home"
     self.menus_enabled = true
@@ -11,6 +11,7 @@ module Spud
     self.default_page_parts = ["Body"]
   	self.yield_body_as_content_block = false    
     self.enable_full_page_caching = false
+    self.enable_action_caching = false
     self.enable_sitemap = true
   end
 end

data/lib/spud_cms/engine.rb

@@ -4,7 +4,9 @@ module Spud
   module Cms
     class Engine < Rails::Engine
      engine_name :spud_cms
+     # config.autoload_paths << File.expand_path("../app/sweepers", __FILE__)
 
+     
      initializer :admin do
       Spud::Core.configure do |config|
           config.admin_applications += [{:name => "Pages",:thumbnail => "spud/admin/pages_thumb.png",:url => "/spud/admin/pages",:order => 0}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70275157744120 !ruby/object:Gem::Requirement
+  requirement: &70314688986880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70275157744120
+  version_requirements: *70314688986880
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70275157743640 !ruby/object:Gem::Requirement
+  requirement: &70314688986400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275157743640
+  version_requirements: *70314688986400
 description: 
 email: destes@redwindsw.com
 executables: []
@@ -58,6 +58,7 @@ files:
 - app/controllers/spud/admin/templates_controller.rb
 - app/controllers/spud/cms/sitemaps_controller.rb
 - app/helpers/spud/cms/application_helper.rb
+- app/models/page_sweeper.rb
 - app/models/spud_menu.rb
 - app/models/spud_menu_item.rb
 - app/models/spud_page.rb