app/views/shared/_s_content.html.erb @@ -55,6 +55,8 @@ class Admin::PostsController < Admin::AdminController end def preview + #mark the post as a preview + @post_preview = true if session["post_preview"] @post = session["post_preview"] @@ -70,10 +72,13 @@ class Admin::PostsController < Admin::AdminController end def post_preview + #mark the post as a preview + @post_preview = true + @post = Post.new(:title => params[:post_title], :body => params[:post_body]) respond_to do |format| - format.html { render :template => 'posts/show'} + format.html { render :template => 'posts/show', :layout => 'application'} end end app/controllers/admin/posts_controller.rb @@ -1,6 +1,6 @@ class PostsController < ApplicationController - #caches_page :index + before_filter :setup_sidebar def index @posts = Post.by_published(:limit => 5) @@ -45,4 +45,12 @@ class PostsController < ApplicationController format.html # by_year.html.erb end end + + protected + + def setup_sidebar + if request.format.to_sym == :html + @recent_posts = Post.by_published(:limit => 5) + end + end end app/controllers/posts_controller.rb @@ -25,6 +25,10 @@ module ApplicationHelper Soapbox['strapline'] end + def post_preview? + @post_preview + end + private def viewing_post? app/helpers/application_helper.rb @@ -18,4 +18,10 @@ module PostsHelper end list.join("\n ") end + + def recent_posts + content_tag(:ul, + @recent_posts.collect { |post| content_tag(:li, link_to_post(post)) }.join("\n"), + :id => "recent_posts") + end end app/helpers/posts_helper.rb @@ -25,12 +25,13 @@ <%= content_tag(:p, blog_strapline) if blog_strapline %> </div><!-- #header --> <div class="p-content"> - <%#= display_page_title %> - <%#= render :partial => 'layouts/flashes' -%> <%= yield %> </div><!-- .p-content --> + <div id="s-content"> + <%= render :partial => 'shared/s_content' unless post_preview? -%> + </div> <div id="footer"> <p>Some footer text and a copywrite</p> </div> app/views/layouts/application.html.erb @@ -1,4 +1,8 @@ - +<% + @page = {:title => "Archives" } +%> +<h1>Archives</h1> +<p>Browse the archives and find what you want</p> <h2>By Month</h2> <ul> <%= by_month_list(@post_sum_by_month) %> app/views/posts/archives.html.erb @@ -1,3 +1,5 @@ <% unless @posts.empty? %> - <%= render :partial => "post", :collection => @posts %> + <div id="posts"> + <%= render :partial => "post", :collection => @posts %> + </div> <% end %> \ No newline at end of file app/views/posts/by_month.html.erb @@ -1,5 +1,5 @@ <% - @page = {:title => @post.title } + @page = {:title => @post.try(:title) } %> <% if @post %> app/views/posts/show.html.erb @@ -5,6 +5,17 @@ describe PostsController do def mock_post(stubs={}) @mock_post ||= mock(Post, stubs) end + + before(:each) do + # minimal spec to check the before filter runs + controller.should_receive(:setup_sidebar).once.and_return(true) + end + + shared_examples_for "the sidebar has been setup" do + it "should have setup the sidebar" do + assigns[:recent_posts].should == [mock_post] + end + end describe "GET 'index'" do @@ -18,6 +29,7 @@ describe PostsController do get :index assigns[:posts].should == [mock_post] end + end describe "GET 'show'" do @@ -89,4 +101,4 @@ describe PostsController do end end -end +end \ No newline at end of file spec/controllers/posts_controller_spec.rb @@ -30,4 +30,11 @@ describe PostsHelper do by_month_list(@post_sum_by_month).should == "<li><a href=\"/2009/08\">August 2009</a> <span>1</span></li>\n <li><a href=\"/2009/06\">June 2009</a> <span>1</span></li>" end end + + describe "recent post list" do + it "should render a list of recent posts" do + @recent_posts = [mock_post(:permalink => "a-title", :year_and_month => ["2009", "06"], :title => "a title")] + recent_posts.should == "<ul id=\"recent_posts\"><li><a href=\"2009/06/a-title\">a title</a></li></ul>" + end + end end spec/helpers/posts_helper_spec.rb @@ -66,5 +66,4 @@ end def logout @user_session = nil -end - +end \ No newline at end of file spec/spec_helper.rb 5d79609a269c09b830f5f5fec448cde74c9fcaf2 Ben Aldred benaldred@gmail.com http://github.com/benaldred/soapbox/commit/e90d3c82eb04f9c16467c2887e69661546c00061 e90d3c82eb04f9c16467c2887e69661546c00061 2009-09-29T02:38:24-07:00 2009-09-29T02:38:24-07:00 lots 9d60006c32fa3d89ff8bdcf56ad0fa304133fc41 Ben Aldred benaldred@gmail.com