@@ -1,2 +1,3 @@ class Admin::ArticlesController < Admin::PostsController + for_type :articles end app/controllers/admin/articles_controller.rb @@ -1,2 +1,3 @@ class Admin::GistsController < Admin::PostsController + for_type :gists end app/controllers/admin/gists_controller.rb @@ -1,2 +1,3 @@ class Admin::LinksController < Admin::PostsController + for_type :links end app/controllers/admin/links_controller.rb @@ -1,2 +1,3 @@ class Admin::PicturesController < Admin::PostsController + for_type :pictures end app/controllers/admin/pictures_controller.rb @@ -6,6 +6,10 @@ class Admin::PostsController < ApplicationController after_filter :expire_index!, :only => [:create, :update, :destroy] after_filter :expire_post!, :only => [:update, :destroy] + def self.for_type(name) + define_method(:post_type) { name } + end + # GET /posts # GET /posts.xml def index app/controllers/admin/posts_controller.rb @@ -1,2 +1,3 @@ class Admin::QuotesController < Admin::PostsController + for_type :quotes end app/controllers/admin/quotes_controller.rb @@ -1,2 +1,3 @@ class Admin::SnippetsController < Admin::PostsController + for_type :snippets end app/controllers/admin/snippets_controller.rb @@ -1,2 +1,3 @@ class Admin::TweetsController < Admin::PostsController + for_type :tweets end app/controllers/admin/tweets_controller.rb @@ -5,8 +5,6 @@ class ApplicationController < ActionController::Base include AuthenticatedSystem protect_from_forgery - rescue_from ActiveRecord::RecordNotFound, :with => :not_found - helper :all # include all helpers, all the time filter_parameter_logging :password, :password_confirmation app/controllers/application_controller.rb @@ -1,2 +1,3 @@ class ArticlesController < PostsController + for_type :articles end app/controllers/articles_controller.rb @@ -1,2 +1,3 @@ class GistsController < PostsController + for_type :gists end app/controllers/gists_controller.rb @@ -1,2 +1,3 @@ class LinksController < PostsController + for_type :links end \ No newline at end of file app/controllers/links_controller.rb @@ -1,2 +1,3 @@ class PicturesController < PostsController + for_type :pictures end app/controllers/pictures_controller.rb @@ -1,4 +1,8 @@ class PostsController < ApplicationController + + def self.for_type(name) + define_method(:post_type) { name } + end # Used by feeds_controller to calculate cache expirations. @@subtypes = [:articles, :links, :pictures, :quotes, :snippets, :tweets, :gists] @@ -14,7 +18,7 @@ class PostsController < ApplicationController def index if fresh_when \ :etag => (post_repo.etag || 'empty'), - :last_modified => post_repo.last_modified.utc + :last_modified => post_repo.last_modified.try(:utc) return end app/controllers/posts_controller.rb @@ -1,2 +1,3 @@ class QuotesController < PostsController + for_type :quotes end app/controllers/quotes_controller.rb @@ -1,2 +1,3 @@ class SnippetsController < PostsController + for_type :snippets end app/controllers/snippets_controller.rb @@ -1,2 +1,3 @@ class TweetsController < PostsController + for_type :tweets end app/controllers/tweets_controller.rb @@ -135,18 +135,6 @@ class PostsControllerTest < ActionController::TestCase end end - test "should_redirect_to_root_when_post_not_found" do - get :show, :id => 999999 - assert_redirected_to root_path - end - - test "should_redirect_to_root_when_post_not_found_even_for_relative_urls" do - set_relative_url do - get :show, :id => 999999 - assert_redirected_to root_path - end - end - test "feed_tag" do get :index assert(h = Hpricot.parse(@response.body)) test/functional/posts_controller_test.rb @@ -189,7 +189,9 @@ class CachingIntegrationTest < ActionController::IntegrationTest private def get_paths(*urls) - urls.each { |url| get url } + urls.each do |url| + get url + end end def login_as(name) test/integration/caching_integration_test.rb fcb28565c5e5b4f9d6af53feb600473462b9bbdc Pat Nakajima patnakajima@gmail.com http://github.com/nakajima/aintablog/commit/6b5d6c08cd86412d122c23ec4ab43a9f8a1bdcf9 6b5d6c08cd86412d122c23ec4ab43a9f8a1bdcf9 2009-02-26T01:44:31-08:00 2009-02-26T01:44:31-08:00 Fixed that post filters weren't working. 3eb43d4f4455f4aab1d68051d572a13b90752e5d Pat Nakajima patnakajima@gmail.com