Merge branch 'master' into admin-post-paging

Conflicts:
	app/controllers/monologue/admin/posts_controller.rb

app/controllers/monologue/admin/posts_controller.rb

@@ -4,7 +4,7 @@ class Monologue::Admin::PostsController < Monologue::Admin::BaseController
 
   def index
     @page = params[:page].nil? ? 1 : params[:page]
-    @posts = Monologue::Post.listing_page(@page)
+    @posts = Monologue::Post.listing_page(@page).includes(:user)
   end
 
   def new

app/controllers/monologue/posts_controller.rb

@@ -1,7 +1,7 @@
 class Monologue::PostsController < Monologue::ApplicationController
   def index
     @page = params[:page].nil? ? 1 : params[:page]
-    @posts = Monologue::Post.page(@page).published
+    @posts = Monologue::Post.page(@page).includes(:user).published
   end
 
   def show

app/views/monologue/posts/_post.html.erb

@@ -1,4 +1,4 @@
-<section>
+<section data-tags="<%= post.tags.map(&:name).join(' ') %>">
   <%= render partial: 'monologue/posts/post_header', locals: {post: post} %>
 
   <div class="content" data-monologue="content">
@@ -9,4 +9,4 @@
     <%= render post.tags %>
   </div>
   <%= link_to t(".readmore"), post.full_url, class: "button" %>
-</section>
+</section>

app/views/monologue/tags/_tag.html.erb

@@ -1 +1 @@
-<span class='tag'><%=link_to tag.name, tag_url(tag) %></span>
+<span class='tag tag-<%= tag.name.parameterize %>'><%=link_to tag.name, tag_url(tag) %></span>

spec/requests/posts_spec.rb

@@ -5,9 +5,11 @@
   end
 
   it "lists posts" do
+    Factory(:post, title: "post Y")
     visit "/monologue"
 
     page.should have_content("post X")
+    page.should have_content("post Y")
   end
 
   it "should route to a post" do
@@ -31,4 +33,10 @@
     visit root_path
     page.should_not have_content "I am Marty McFly"
   end
-end
+
+  it "should not show an unpublished post" do
+    Factory(:post, published: false, title: "I am Marty McFly")
+    visit root_path
+    page.should_not have_content "I am Marty McFly"
+  end
+end