Merge pull request #46 from mamebro/fix-name-validation

Fix name validation
mamebro · Sep 28, 2013 · 885097a · 885097a
2 parents 102ae68 + 54ceb6a
commit 885097a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/models/brother.rb b/app/models/brother.rb
@@ -18,7 +18,7 @@ class Brother < ActiveRecord::Base
   VALID_EMAIL_REGEX = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
   validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }
 
-  VALID_NAME_REGEX = /[a-z0-9]+\z/i
+  VALID_NAME_REGEX = /\A[a-z0-9]+\z/i
   validates :name, presence: true, length: {within: 3..20},
             format: { with: VALID_NAME_REGEX }, uniqueness: true
 

diff --git a/spec/models/brother_spec.rb b/spec/models/brother_spec.rb
@@ -37,14 +37,19 @@
     it { should_not be_valid }
   end
 
+  describe "when name contains white space" do
+    before { @brother.name = "kun shi ka" }
+    it { should_not be_valid }
+  end
+
   describe "when name is too long" do
     before { @brother.name = "a" * 51 }
     it { should_not be_valid }
   end
 
   describe "when name format is invalid" do
     it "should be invalid" do
-      brothername = %w[@@@, #, ||, ---]
+      brothername = %w[@@@, #, ||, ---, www.nakaotakashi.com]
       brothername.each do |invalid_name|
         @brother.name = invalid_name
         @brother.should_not be_valid