From e06f1be269a97b2b9d2e2af03d8e737fee22ae81 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Wed, 15 Feb 2012 12:53:18 +0800 Subject: [PATCH] Page cache to caches_page. Fix setting bug. --- app/controllers/home_controller.rb | 2 +- app/models/setting.rb | 7 ++++--- app/sweepers/page_sweeper.rb | 2 +- app/views/layouts/application.html.erb | 6 ++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 87d6d82..db2212d 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,6 +1,6 @@ # coding: utf-8 class HomeController < ApplicationController - caches_action :show + caches_page :show caches_action :share, :cache_path => Proc.new { |c| "home/share" }, :expires_in => 1.days def index diff --git a/app/models/setting.rb b/app/models/setting.rb index fca1fcf..f39a930 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -2,9 +2,10 @@ class Setting < ActiveRecord::Base def self.find_create - Rails.cache.fetch("models/setting1") do - if not setting = first - create(:site_name => "PersonLab Demo", :sub_title => "This is an person website build by Ruby on Rails.", + Rails.cache.fetch("models/setting2") do + setting = first + if setting.blank? + setting = create(:site_name => "PersonLab Demo", :sub_title => "This is an person website build by Ruby on Rails.", :meta_keywords => "personlab,ruby on rails", :email => "huacnlee@gmail.com", :meta_description => "This is an person website build by Ruby on Rails.", diff --git a/app/sweepers/page_sweeper.rb b/app/sweepers/page_sweeper.rb index 7bcd152..d10003c 100644 --- a/app/sweepers/page_sweeper.rb +++ b/app/sweepers/page_sweeper.rb @@ -10,6 +10,6 @@ def after_destroy(page) end def clear_page_cache(page) - expire_action page_path(page.slug) + expire_page page_path(page.slug) end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index de78bd2..d97f677 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,8 +15,6 @@ <%= stylesheet_link_tag "application", :cache => "cached_application" %> <%= yield :styles -%> <%= auto_discovery_link_tag(:rss,(@setting.feed_url || rss_blogs_url),:title => '定阅最新博客') %> - - <%= javascript_include_tag "rails","will_paginate","common", :cache => "cached_application" %>
@@ -55,8 +53,9 @@

+ +<%= javascript_include_tag "rails","will_paginate","common", :cache => "cached_application" %> <%= yield :scripts %> - - <% if !@setting.google_analytics_id.blank? %> <% end %>