<%= form_for(@user) do |f| %>
- <%= render 'shared/error_messages' %>
+ <%= render 'shared/error_messages', object: f.object %>
<%= f.label :name %>
<%= f.text_field :name %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 0e42845..0558efe 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -5,7 +5,7 @@
<%= form_for(@user) do |f| %>
- <%= render 'shared/error_messages' %>
+ <%= render 'shared/error_messages', object: f.object %>
<%= f.label :name %>
<%= f.text_field :name %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a6db57a..0ebe5a2 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -8,4 +8,13 @@
+
+ <% if @user.microposts.any? %>
+
Microposts (<%= @user.microposts.count %>)
+
+ <%= render @microposts %>
+
+ <%= will_paginate @microposts %>
+ <% end %>
+
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index cfde7b3..763b8e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,9 +2,10 @@ SampleApp::Application.routes.draw do
resources :products
resources :users
resources :sessions, only: [:new, :create, :destroy]
+ resources :microposts, only: [:create, :destroy]
root 'static_pages#home'
match '/signup', to: 'users#new', via: 'get'
- match '/signin', to: 'sessions#new', via: 'get'
+ match '/signin', to: 'sessions#new', via: 'get'
match '/signout', to: 'sessions#destroy', via: 'delete'
match '/help', to: 'static_pages#help', via: 'get'
match '/about', to: 'static_pages#about', via: 'get'
diff --git a/db/migrate/20131107052554_create_microposts.rb b/db/migrate/20131107052554_create_microposts.rb
new file mode 100644
index 0000000..988c9df
--- /dev/null
+++ b/db/migrate/20131107052554_create_microposts.rb
@@ -0,0 +1,11 @@
+class CreateMicroposts < ActiveRecord::Migration
+ def change
+ create_table :microposts do |t|
+ t.string :content
+ t.integer :user_id
+
+ t.timestamps
+ end
+ add_index :microposts, [:user_id, :created_at]
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 47b80bc..1c0e962 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,16 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20131105022512) do
+ActiveRecord::Schema.define(version: 20131107052554) do
+
+ create_table "microposts", force: true do |t|
+ t.string "content"
+ t.integer "user_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "microposts", ["user_id", "created_at"], name: "index_microposts_on_user_id_and_created_at"
create_table "products", force: true do |t|
t.string "name"
diff --git a/lib/tasks/sample_data.rake b/lib/tasks/sample_data.rake
index 7c0fc50..52b02c4 100644
--- a/lib/tasks/sample_data.rake
+++ b/lib/tasks/sample_data.rake
@@ -1,7 +1,9 @@
namespace :db do
+
desc "Fill database with sample data"
task populate: :environment do
- User.create!(name: "Example User",
+
+ User.create!(name: "Example User",
email: "example@railstutorial.org",
password: "foobar",
password_confirmation: "foobar")
@@ -14,5 +16,11 @@ namespace :db do
password: password,
password_confirmation: password)
end
- end
-end
\ No newline at end of file
+ users = User.all(limit: 6)
+ 50.times do
+ content = Faker::Lorem.sentence(5)
+ users.each { |user| user.microposts.create!(content: content) }
+ end
+end
+end
+
\ No newline at end of file
diff --git a/spec/factories.rb b/spec/factories.rb
index 5c0cbc2..5bbc0ab 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -4,5 +4,14 @@ FactoryGirl.define do
sequence(:email) { |n| "person_#{n}@example.com"}
password "foobar"
password_confirmation "foobar"
+
+ factory :admin do
+ admin true
+ end
+ end
+
+ factory :micropost do
+ content "Lorem ipsum"
+ user
end
end
\ No newline at end of file
diff --git a/spec/models/micropost_spec.rb b/spec/models/micropost_spec.rb
new file mode 100644
index 0000000..b255ed5
--- /dev/null
+++ b/spec/models/micropost_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Micropost do
+
+ let(:user) { FactoryGirl.create(:user) }
+ before { @micropost = user.microposts.build(content: "Lorem ipsum") }
+
+ subject { @micropost }
+
+ it { should respond_to(:content) }
+ it { should respond_to(:user_id) }
+ it { should respond_to(:user) }
+ its(:user) { should eq user }
+
+ it { should be_valid }
+
+ describe "when user_id is not present" do
+ before { @micropost.user_id = nil }
+ it { should_not be_valid }
+ end
+end
\ No newline at end of file
diff --git a/spec/requests/micropost_pages_spec.rb b/spec/requests/micropost_pages_spec.rb
new file mode 100644
index 0000000..0d3091d
--- /dev/null
+++ b/spec/requests/micropost_pages_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe "Micropost pages" do
+
+ subject { page }
+
+ let(:user) { FactoryGirl.create(:user) }
+ before { sign_in user }
+
+ describe "micropost creation" do
+ before { visit root_path }
+
+ describe "with invalid information" do
+
+ it "should not create a micropost" do
+ expect { click_button "Post" }.not_to change(Micropost, :count)
+ end
+
+ describe "error messages" do
+ before { click_button "Post" }
+ it { should have_content('error') }
+ end
+ end
+
+ describe "with valid information" do
+
+ before { fill_in 'micropost_content', with: "Lorem ipsum" }
+ it "should create a micropost" do
+ expect { click_button "Post" }.to change(Micropost, :count).by(1)
+ end
+ end
+ end
+end
\ No newline at end of file