spud_cms 0.4.0 → 0.4.3

data/app/controllers/pages_controller.rb

@@ -1,5 +1,5 @@
 class PagesController < ApplicationController
-	caches_page :show,:expires_in => Spud::Cms.page_cache_expires_in, :if => Proc.new { |c| Spud::Cms.enable_full_page_caching }
+	caches_action :show,:layout => false, :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

@@ -20,6 +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])
@@ -41,6 +42,8 @@ class Spud::Admin::MenuItemsController < Spud::Admin::ApplicationController
 		end
 		flash[:notice] = "Menu Created successfully!" if @menu_item.save
 
+
+
 		respond_with @menu_item,:location => spud_admin_menu_menu_items_url
 	end
 
@@ -54,6 +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?
@@ -70,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
@@ -94,4 +98,18 @@ private
 		end
 	end
 
+	def clear_action_cache
+		if(Spud::Cms.enable_full_page_caching == false)
+			return
+		end
+		@pages = SpudPage.published_pages.all
+		if !@pages.blank?
+			@pages.each do |page|
+				expire_action page_url(:id => page.url_name)
+			end
+		end
+	end
+	
+
+
 end

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

@@ -72,7 +72,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		expire_page page_path(:id => @page.url_name)
+		expire_action page_url(:id => @page.url_name)
 		if @page.update_attributes(params[:spud_page])
 			flash[:notice] = "Page updated successfully!"
 			redirect_to spud_admin_pages_url() and return
@@ -85,8 +85,7 @@ class Spud::Admin::PagesController < Spud::Admin::ApplicationController
 
 	def destroy
 		status = 500
-		expire_page page_path(:id => @page.url_name)
-
+		expire_action page_url(:id => @page.url_name)
 		if @page.destroy
 			flash[:notice] = "Page removed successfully!"
 			status = 200

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

@@ -33,6 +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])
 		
@@ -41,6 +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
@@ -54,4 +56,16 @@ private
 			redirect_to spud_admin_templates_url and return false
 		end
 	end
+
+	def clear_action_cache
+		if(Spud::Cms.enable_full_page_caching == false)
+			return
+		end
+		if !@template.spud_pages.blank?
+			@template.spud_pages.each do |page|
+				expire_action page_path(:id => page.url_name)
+			end
+		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,:page_cache_expires_in
+    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
 
     self.root_page_name = "home"
     self.menus_enabled = true
@@ -11,7 +11,6 @@ module Spud
     self.default_page_parts = ["Body"]
   	self.yield_body_as_content_block = false    
     self.enable_full_page_caching = false
-    self.page_cache_expires_in = 10.minutes
     self.enable_sitemap = true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70189195378020 !ruby/object:Gem::Requirement
+  requirement: &70142195494420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70189195378020
+  version_requirements: *70142195494420
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &70189195377540 !ruby/object:Gem::Requirement
+  requirement: &70142195510320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189195377540
+  version_requirements: *70142195510320
 description: 
 email: destes@redwindsw.com
 executables: []