Show 404 when MongoMapper::DocumentNotFound is raised

apps/_base.rb

@@ -27,7 +27,12 @@ def find_template(views, name, engine, &block)
       @page_title = "404 Not Found"
       erb :'404', :layout => false, :views => settings.root + '/views'
     end
+
+    error MongoMapper::DocumentNotFound do
+      @page_title = "404 Not Found"
+      erb :'404', :layout => false, :views => settings.root + '/views/'
+    end
 
   end
 
-end
+end

apps/blog.rb

@@ -9,10 +9,10 @@ class BlogApp < Base
     end
 
     get '/post/:slug' do
-      @post = Post.find_by_slug(params[:slug])
+      @post = Post.find_by_slug!(params[:slug])
       @page_title = @post.title
       erb :detail
     end
 
   end
-end
+end

apps/manage_posts.rb

@@ -13,14 +13,14 @@ class ManagePostsApp < AdminApp
     end
 
     get '/new/:type' do
-      raise not_found unless valid_post_type?(params[:type])
+      not_found unless valid_post_type?(params[:type])
       @post = build_post(params[:type], params[:post])
       @page_title = "New Post"
       erb :new
     end
 
     post '/' do
-      raise not_found unless valid_post_type?(params[:type])
+      not_found unless valid_post_type?(params[:type])
       @post = build_post(params[:type], params[:post])
 
       if @post.save
@@ -33,7 +33,7 @@ class ManagePostsApp < AdminApp
     end
 
     get '/:slug/edit' do
-      @post = Post.where(:slug => params[:slug]).first
+      @post = Post.find_by_slug!(params[:slug])
       @page_title = "Editing #{@post.title}"
       erb :edit
     end
@@ -72,4 +72,4 @@ class ManagePostsApp < AdminApp
     end
 
   end
-end
+end

spec/apps/blog_spec.rb

@@ -21,5 +21,10 @@
     visit "/post/#{a.slug}"
     page.should have_content(a.title)
   end
+
+  it "should show 404 if post not found" do
+    visit "/post/non-existent-post"
+    page.should have_content(404)
+  end
 
-end
+end