Added relationships model

app/models/relationship.rb

@@ -0,0 +1,2 @@
+class Relationship < ActiveRecord::Base
+end

app/views/shared/_homepage.html.erb

@@ -0,0 +1,14 @@
+<div class="row">
+	<aside class="col-md-4">
+		<section class="user_info">
+			<%= render 'shared/user_info' %>
+		</section>
+		<section class="micropost_form">
+			<%= render 'shared/micropost_form' %>
+		</section>
+	</aside>
+	<div class="col-md-8">
+		<h3>Micropost Feed</h3>
+		<%= render 'shared/feed' %>
+	</div>
+</div>

app/views/shared/_welcome.html.erb

@@ -0,0 +1,12 @@
+<div class="center jumbotron">
+	<h1>Welcome to the Sample App</h1>
+
+	<h2>
+		This is the home page for the
+		<a href="http://www.railstutorial.org/">Ruby on Rails Tutorial</a> sample application.
+	</h2>
+
+	<%= link_to "Sign up now!" , signup_path , class: "btn btn-lg btn-primary" %>
+</div>
+
+<%= link_to image_tag("rails.png", alt: "Rails logo"), 'http://rubyonrails.org/' %>

app/views/static_pages/home.html.erb

@@ -1,30 +1,5 @@
 <% if logged_in? %>
-	<div class="row">
-		<aside class="col-md-4">
-			<section class="user_info">
-				<%= render 'shared/user_info' %>
-			</section>
-			<section class="micropost_form">
-				<%= render 'shared/micropost_form' %>
-			</section>
-		</aside>
-		<div class="col-md-8">
-			<h3>Micropost Feed</h3>
-			<%= render 'shared/feed' %>
-		</div>
-	</div>
+	<%= render 'shared/homepage' %>
 <% else %>
-	<div class="center jumbotron">
-		<h1>Welcome to the Sample App</h1>
-
-		<h2>
-			This is the home page for the
-			<a href="http://www.railstutorial.org/">Ruby on Rails Tutorial</a> sample application.
-		</h2>
-
-		<%= link_to "Sign up now!" , signup_path , class: "btn btn-lg btn-primary" %>
-	</div>
-
-<%= link_to image_tag("rails.png", alt: "Rails logo"), 'http://rubyonrails.org/' %>
-
+	<%= render 'shared/welcome' %>
 <% end %>

db/migrate/20150903200654_create_relationships.rb

@@ -0,0 +1,13 @@
+class CreateRelationships < ActiveRecord::Migration
+  def change
+    create_table :relationships do |t|
+      t.integer :follower_id
+      t.integer :followed_id
+
+      t.timestamps null: false
+    end
+    add_index :relationships, :follower_id
+    add_index :relationships, :followed_id
+    add_index :relationships, [:follower_id, :followed_id], unique: true
+  end
+end

test/fixtures/relationships.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  follower_id: 1
+  followed_id: 1
+
+two:
+  follower_id: 1
+  followed_id: 1

test/fixtures/users.yml

@@ -13,6 +13,13 @@ archer:
   activated: true
   activated_at: <%= Time.zone.now %>
 
+mallory:
+  name: Mallory Archer
+  email: [email protected]
+  password_digest: <%= User.digest('password') %>
+  activated: true
+  activated_at: <%= Time.zone.now %>
+
 <% 30.times do |n| %>
 user_<%= n %>:
   name: <%= "User #{n}" %>

test/integration/microposts_interface_test.rb

@@ -33,4 +33,18 @@ def setup
   	get user_path(users(:archer))
   	assert_select 'a', text: 'delete', count: 0
   end
+
+  test "micropost sidebar count" do
+    log_in_as(@user)
+    get root_path
+    assert_match "33 microposts", response.body
+    #User with zero microposts
+    other_user = users(:mallory)
+    log_in_as(other_user)
+    get root_path
+    assert_match "0 microposts", response.body
+    other_user.microposts.create!(content: "I need a drink")
+    get root_path
+    assert_match "1 micropost", response.body
+  end
 end

test/models/relationship_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class RelationshipTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end