Add user microposts

app/controllers/microposts_controller.rb

 class MicropostsController < ApplicationController
 class MicropostsController < ApplicationController
   before_action :signed_in_user, only: [:create, :destroy]
   before_action :signed_in_user, only: [:create, :destroy]
+  before_action :correct_user, only: :destroy
 
 
   def index
   def index
   end
   end
@@ -10,11 +11,14 @@ class MicropostsController < ApplicationController
       flash[:success] = "Micropost created!"
       flash[:success] = "Micropost created!"
       redirect_to root_url
       redirect_to root_url
     else
     else
+      @feed_items = []
       render 'static_pages/home'
       render 'static_pages/home'
     end
     end
   end
   end
 
 
   def destroy
   def destroy
+    @micropost.destroy
+    redirect_to root_url
   end
   end
 
 
   private
   private
@@ -22,4 +26,9 @@ class MicropostsController < ApplicationController
   def micropost_params
   def micropost_params
     params.require(:micropost).permit(:content)
     params.require(:micropost).permit(:content)
   end
   end
+
+  def correct_user
+    @micropost = current_user.microposts.find_by(id: params[:id])
+    redirect_to root_url if @micropost.nil?
+  end
 end
 end
\ No newline at end of file

app/controllers/static_pages_controller.rb

 class StaticPagesController < ApplicationController
 class StaticPagesController < ApplicationController
   def home
   def home
-    @micropost = current_user.microposts.build if signed_in?
+    if signed_in?
+      @micropost = current_user.microposts.build
+      @feed_items = current_user.feed.paginate(page: params[:page])
+    end
   end
   end
 
 
   def help
   def help

app/models/user.rb

@@ -18,6 +18,10 @@ class User < ActiveRecord::Base
     Digest::SHA1.hexdigest(token.to_s)
     Digest::SHA1.hexdigest(token.to_s)
   end
   end
 
 
+  def feed
+    Micropost.where("user_id = ?", id)
+  end
+  
   private
   private
 
 
   def create_remember_token
   def create_remember_token

app/views/microposts/_micropost.html.erb

@@ -3,4 +3,9 @@
   <span class="timestamp">
   <span class="timestamp">
     Posted <%= time_ago_in_words(micropost.created_at) %> ago.
     Posted <%= time_ago_in_words(micropost.created_at) %> ago.
   </span>
   </span>
+  <% if current_user?(micropost.user) %>
+    <%= link_to "delete", micropost, method: :delete,
+                                     data: { confirm: "You sure?" },
+                                     title: micropost.content %>
+  <% end %>
 </li>
 </li>
\ No newline at end of file

app/views/shared/_feed.html.erb

+<% if @feed_items.any? %>
+  <ol class="microposts">
+    <%= render partial: 'shared/feed_item', collection: @feed_items %>
+  </ol>
+  <%= will_paginate @feed_items %>
+<% end %>
\ No newline at end of file

app/views/shared/_feed_item.html.erb

+<li id="<%= feed_item.id %>">
+  <%= link_to gravatar_for(feed_item.user), feed_item.user %>
+  <span class="user">
+    <%= link_to feed_item.user.name, feed_item.user %>
+  </span>
+  <span class="content"><%= feed_item.content %></span>
+  <span class="timestamp">
+    Posted <%= time_ago_in_words(feed_item.created_at) %> ago.
+  </span>
+  <% if current_user?(feed_item.user) %>
+    <%= link_to "delete", feed_item, method: :delete, data: { confirm: "You sure?" }, title: feed_item.content %>
+  <% end %>
+</li>
\ No newline at end of file

app/views/static_pages/home.html.erb

@@ -8,6 +8,10 @@
         <%= render 'shared/micropost_form' %>
         <%= render 'shared/micropost_form' %>
       </section>
       </section>
     </aside>
     </aside>
+    <div class="span8">
+      <h3>Micropost Feed</h3>
+      <%= render 'shared/feed' %>
+    </div>
   </div>
   </div>
 <% else %>
 <% else %>
   <div class="center hero-unit">
   <div class="center hero-unit">

spec/models/user_spec.rb

@@ -15,6 +15,7 @@ describe User do
 
 
   it { should respond_to(:admin) }
   it { should respond_to(:admin) }
   it { should respond_to(:microposts) }
   it { should respond_to(:microposts) }
+  it { should respond_to(:feed) }
 
 
   it { should be_valid }
   it { should be_valid }
 
 
@@ -140,5 +141,15 @@ describe User do
         expect(Micropost.where(id: micropost.id)).to be_empty
         expect(Micropost.where(id: micropost.id)).to be_empty
       end
       end
     end
     end
+
+    describe "status" do
+      let(:unfollowed_post) do
+        FactoryGirl.create(:micropost, user: FactoryGirl.create(:user))
+      end
+        
+      its(:feed) { should include(newer_micropost) }
+      its(:feed) { should include(older_micropost) }
+      its(:feed) { should_not include(unfollowed_post) }
+    end
   end
   end
 end
 end

spec/requests/micropost_pages_spec.rb

@@ -29,4 +29,16 @@ describe "MicropostPages" do
       end
       end
     end
     end
   end
   end
+
+  describe "micropost destruction" do
+    before { FactoryGirl.create(:micropost, user: user) }
+
+    describe "as correct user" do
+      before { visit root_path }
+      
+      it "should delete a micropost" do
+        expect { click_link "delete" }.to change(Micropost, :count).by(-1)
+      end
+    end
+  end
 end
 end