Enhanced User model

Raven · Raven · commit d676613e6924 · 2011-04-25T22:53:06.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
