From 309820f4a4c6dfaf34217343d90339c9ff0285ef Mon Sep 17 00:00:00 2001
From: Raven <me@imraven.com>
Date: Sun, 24 Apr 2011 22:39:30 +0800
Subject: [PATCH 1/3] Added User database and model

---
 app/helpers/application_helper.rb         |  5 +++++
 app/models/user.rb                        |  2 ++
 app/views/layouts/_header.html.erb        |  2 +-
 db/migrate/20110424142757_create_users.rb | 14 ++++++++++++++
 db/schema.rb                              | 22 ++++++++++++++++++++++
 spec/models/user_spec.rb                  |  5 +++++
 spec/requests/layout_links_spec.rb        |  3 ++-
 webrat.log                                |  5 +++++
 8 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/models/user.rb
 create mode 100644 db/migrate/20110424142757_create_users.rb
 create mode 100644 db/schema.rb
 create mode 100644 spec/models/user_spec.rb
 create mode 100644 webrat.log

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6912e62..e094c52 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,4 +9,9 @@ def title
 		end
 	end
 
+	def logo
+		image_tag("logo.png", :alt => "Sample App", :class => "round")
+	end
+
+
 end
diff --git a/app/models/user.rb b/app/models/user.rb
new file mode 100644
index 0000000..4a57cf0
--- /dev/null
+++ b/app/models/user.rb
@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 10f8943..32b46f8 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,5 +1,5 @@
 		<header>
-			<%= link_to image_tag("logo.png", :alt => "Sample App", :class => "round"), "/"%>
+			<%= link_to logo, "/"%>
 			<nav class="round">
 				<ul>
 					<li> <%= link_to "Home", "/" %> </li>
diff --git a/db/migrate/20110424142757_create_users.rb b/db/migrate/20110424142757_create_users.rb
new file mode 100644
index 0000000..805ba7b
--- /dev/null
+++ b/db/migrate/20110424142757_create_users.rb
@@ -0,0 +1,14 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :name
+      t.string :email
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000..6758eee
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,22 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110424142757) do
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "email"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
new file mode 100644
index 0000000..44032b4
--- /dev/null
+++ b/spec/models/user_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe User do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/requests/layout_links_spec.rb b/spec/requests/layout_links_spec.rb
index a58f27d..822b9ea 100644
--- a/spec/requests/layout_links_spec.rb
+++ b/spec/requests/layout_links_spec.rb
@@ -23,8 +23,9 @@
   end
 
   it "should have a signup page at '/signup'" do
-    get '/help'
+    get '/signup'
     response.should have_selector('title', :content => "Sign up")
   end
 
+
 end
diff --git a/webrat.log b/webrat.log
new file mode 100644
index 0000000..251609e
--- /dev/null
+++ b/webrat.log
@@ -0,0 +1,5 @@
+# Logfile created on 2011-04-24 22:04:38 +0800 by logger.rb/25413
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: GET //about with {} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: GET //help with {} and HTTP headers {"HTTP_REFERER"=>"/"}

From d676613e6924a3602bbe40d425aa46dff4434874 Mon Sep 17 00:00:00 2001
From: Raven <me@imraven.com>
Date: Mon, 25 Apr 2011 22:53:06 +0800
Subject: [PATCH 2/3] Enhanced User model

---
 Gemfile                  |  1 +
 Gemfile.lock             |  2 ++
 app/models/user.rb       | 24 +++++++++++++++++++++--
 spec/models/user_spec.rb | 41 +++++++++++++++++++++++++++++++++++++++-
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5edd03d..e64d3a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'rails'
 group :development do
   gem 'rspec-rails'
   gem 'sqlite3'
+  gem 'annotate-models'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 3967abd..79f47db 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,6 +28,7 @@ GEM
       activemodel (= 3.0.7)
       activesupport (= 3.0.7)
     activesupport (3.0.7)
+    annotate-models (1.0.4)
     arel (2.0.9)
     builder (2.1.2)
     diff-lcs (1.1.2)
@@ -89,6 +90,7 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  annotate-models
   rails
   rspec
   rspec-rails
diff --git a/app/models/user.rb b/app/models/user.rb
index 4a57cf0..d178337 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,2 +1,22 @@
-class User < ActiveRecord::Base
-end
+# == Schema Information
+# Schema version: 20110424142757
+#
+# Table name: users
+#
+#  id         :integer         not null, primary key
+#  name       :string(255)
+#  email      :string(255)
+#  created_at :datetime
+#  updated_at :datetime
+#
+
+class User < ActiveRecord::Base
+	attr_accessible :name, :email
+
+	validates :name, :presence => true,
+	                 :length   => { :maximum => 50 }
+	validates :email, :presence => true,
+					  :format   => { :with => email_regex }
+
+	email_regex = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 44032b4..a3f249a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,5 +1,44 @@
 require 'spec_helper'
 
 describe User do
-  pending "add some examples to (or delete) #{__FILE__}"
+
+  before(:each) do
+    @attr = { :name => "Example User", :email => "user@example.com" }
+  end
+
+  it "should create a new instance given valid attributes" do
+    User.create!(@attr)
+  end
+  
+  #Test for no blank email address
+  it "should require an email address" do
+    no_email_user = User.new(@attr.merge(:email => ""))
+    no_email_user.should_not be_valid
+  end
+
+
+  #Test for maximum length
+    it "should reject names that are too long" do
+    long_name = "a" * 51
+    long_name_user = User.new(@attr.merge(:name => long_name))
+    long_name_user.should_not be_valid
+  end
+
+  #Test for proper email
+    it "should accept valid email addresses" do
+    addresses = %w[user@foo.com THE_USER@foo.bar.org first.last@foo.jp]
+    addresses.each do |address|
+      valid_email_user = User.new(@attr.merge(:email => address))
+      valid_email_user.should be_valid
+    end
+  end
+
+  it "should reject invalid email addresses" do
+    addresses = %w[user@foo,com user_at_foo.org example.user@foo.]
+    addresses.each do |address|
+      invalid_email_user = User.new(@attr.merge(:email => address))
+      invalid_email_user.should_not be_valid
+    end
+  end
+
 end

From f6b3c91c1d59683ff089342d221a8ec9cd5d5423 Mon Sep 17 00:00:00 2001
From: Raven <me@imraven.com>
Date: Tue, 26 Apr 2011 17:41:37 +0800
Subject: [PATCH 3/3] Finisbed first cut of the User model

---
 app/controllers/users_controller.rb             |  4 ++++
 app/models/user.rb                              |  4 ++--
 app/views/layouts/application.html.erb          |  3 ++-
 app/views/users/show.html.erb                   |  1 +
 config/routes.rb                                |  2 +-
 ...20110426084417_add_email_uniqueness_index.rb |  9 +++++++++
 db/schema.rb                                    |  4 +++-
 spec/models/user_spec.rb                        | 17 ++++++++++++++++-
 8 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 app/views/users/show.html.erb
 create mode 100644 db/migrate/20110426084417_add_email_uniqueness_index.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d54d3ca..2ddd7f3 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,4 +4,8 @@ def new
   	@title = "Sign up"
   end
 
+  def show
+  	@user = User.find(params[:id])
+  end
+
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index d178337..220512a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -16,7 +16,7 @@ class User < ActiveRecord::Base
 	validates :name, :presence => true,
 	                 :length   => { :maximum => 50 }
 	validates :email, :presence => true,
-					  :format   => { :with => email_regex }
+					  :format   => { :with => /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i },
+					  :uniqueness => true
 
-	email_regex = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9cbfb9e..da71e59 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -12,6 +12,7 @@
 		</section>
 
 		<%= render 'layouts/footer' %>
-	</div>
+        <%= debug(params) if Rails.env.development? %>	
+    </div>
 </body>
 </html>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 0000000..e65d224
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1 @@
+<%= @user.name %>, <%= @user.email %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index be41156..10210cc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 MicroTwitter::Application.routes.draw do
-  get "users/new"
+  resources :users
 
   root :to => 'pages#home'
 
diff --git a/db/migrate/20110426084417_add_email_uniqueness_index.rb b/db/migrate/20110426084417_add_email_uniqueness_index.rb
new file mode 100644
index 0000000..0841e68
--- /dev/null
+++ b/db/migrate/20110426084417_add_email_uniqueness_index.rb
@@ -0,0 +1,9 @@
+class AddEmailUniquenessIndex < ActiveRecord::Migration
+  def self.up
+  	add_index :users, :email, :unique => true
+  end
+
+  def self.down
+  	remove_index :users, :email
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6758eee..592703b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110424142757) do
+ActiveRecord::Schema.define(:version => 20110426084417) do
 
   create_table "users", :force => true do |t|
     t.string   "name"
@@ -19,4 +19,6 @@
     t.datetime "updated_at"
   end
 
+  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a3f249a..b668468 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -31,7 +31,8 @@
       valid_email_user = User.new(@attr.merge(:email => address))
       valid_email_user.should be_valid
     end
-  end
+    end
+
 
   it "should reject invalid email addresses" do
     addresses = %w[user@foo,com user_at_foo.org example.user@foo.]
@@ -41,4 +42,18 @@
     end
   end
 
+
+    it "should reject duplicate email addresses" do
+    # Put a user with given email address into the database.
+    User.create!(@attr)
+    user_with_duplicate_email = User.new(@attr)
+    user_with_duplicate_email.should_not be_valid
+  end
+
+    it "should reject email addresses identical up to case" do
+    upcased_email = @attr[:email].upcase
+    User.create!(@attr.merge(:email => upcased_email))
+    user_with_duplicate_email = User.new(@attr)
+    user_with_duplicate_email.should_not be_valid
+  end
 end