add last anf first name to user

app/models/user.rb

@@ -2,7 +2,7 @@ class User < ActiveRecord::Base
   include UserRepository
 
   attr_accessible :email,   :password, :password_digest,
-                  :name,    :city,
+                  :first_name, :last_name, :city,
                   :company, :position,
                   :show_as_participant, :photo, :state_event, :about
 
@@ -22,11 +22,11 @@ class User < ActiveRecord::Base
   end
 
   def full_name
-    name
+    "#{last_name} #{first_name}"
   end
 
   def to_s
-    name
+    full_name
   end
 
 end

app/types/user_edit_type.rb

@@ -6,5 +6,6 @@ class UserEditType < User
   has_secure_password
 
   validates :email, presence: true, uniqueness: true
-  validates :name,  presence: true
+  validates :first_name,  presence: true
+  validates :last_name,  presence: true
 end

app/views/web/account/accounts/_form.html.haml

@@ -3,7 +3,8 @@
   = f.input :email
   = f.input :password
   = f.input :password_confirmation
-  = f.input :name
+  = f.input :first_name
+  = f.input :last_name
   = f.input :city
   = f.input :company
   = f.input :show_as_participant

app/views/web/admin/users/edit.html.haml

@@ -5,7 +5,8 @@
   .row
     .span4
       = f.input :state_event, :as => :state_event
-      = f.input :name
+      = f.input :first_name
+      = f.input :last_name
       = f.input :city
       = f.input :about, :as => :text, :input_html => { :cols => 50, :rows => 3 }
     .span4

app/views/web/admin/users/index.html.haml

@@ -5,7 +5,7 @@
   %thead
     %tr
       %th= User.human_attribute_name :id
-      %th= User.human_attribute_name :name
+      %th= User.human_attribute_name :first_name
       %th= User.human_attribute_name :state
       %th= t(".created_at")
       %th= t(".actions")

app/views/web/admin/users/new.html.haml

@@ -5,7 +5,8 @@
   .row
     .span4
       = f.input :state_event, :as => :state_event
-      = f.input :name
+      = f.input :first_name
+      = f.input :last_name
       = f.input :city
       = f.input :company
       = f.input :about, :as => :text, :input_html => { :cols => 50, :rows => 3 }

app/views/web/admin/users/show.html.haml

@@ -5,7 +5,7 @@
       %strong= User.human_attribute_name :id
       %br= @user.id
 
-      %strong= User.human_attribute_name :name
+      %strong= User.human_attribute_name :first_name
       %br= @user.full_name
 
       %strong= User.human_attribute_name :state

app/views/web/users/_form.html.haml

@@ -6,11 +6,15 @@
         = simple_form_for @user do |f|
           .row-fluid
             .span4
-              = f.input :name
+              = f.input :first_name
+
+            .span4
+              = f.input :last_name
 
             .span4
               = f.input :company
 
+          .row-fluid
             .span4
               = f.input :position
 

app/views/web/users/index.html.haml

@@ -2,14 +2,14 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= User.human_attribute_name :name
+      %th= User.human_attribute_name :first_name
       %th= User.human_attribute_name :city
       %th= User.human_attribute_name :company
       %th= User.human_attribute_name :position
   %tbody
     - @users.each do |user|
       %tr
-        %td= user.name
+        %td= user
         %td= user.city
         %td= user.company
         %td= user.position

config/locales/ru.yml

@@ -173,7 +173,8 @@ ru:
 
       user:
         email: "Email"
-        name:  "ФИО"
+        first_name: "Имя"
+        last_name: "Фамилия"
         password: "Пароль"
         password_confirmation: "Подтверждение пароля"
         city: "Город"

db/migrate/20130206101940_add_last_name_and_first_name_to_user.rb

@@ -0,0 +1,6 @@
+class AddLastNameAndFirstNameToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :first_name, :string
+    add_column :users, :last_name, :string
+  end
+end

db/migrate/20130206103351_remove_name_from_user.rb

@@ -0,0 +1,5 @@
+class RemoveNameFromUser < ActiveRecord::Migration
+  def change
+    remove_column :users, :name
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130205071630) do
+ActiveRecord::Schema.define(:version => 20130206103351) do
 
   create_table "ckeditor_assets", :force => true do |t|
     t.string   "data_file_name",                  :null => false
@@ -50,16 +50,17 @@
     t.string   "password_digest"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false
-    t.string   "name"
     t.string   "city"
     t.string   "company"
     t.boolean  "show_as_participant"
     t.string   "position"
     t.boolean  "admin"
     t.string   "password"
-    t.string   "state"
     t.string   "photo"
+    t.string   "state"
     t.text     "about"
+    t.string   "first_name"
+    t.string   "last_name"
   end
 
 end

test/factories/sequences.rb

@@ -4,7 +4,7 @@
     "email_#{n}@mail.com"
   end
 
-  [:name, :city,  :company,
+  [:first_name, :last_name, :city,  :company,
    :slug, :title, :body, :photo].each do |trait|
 
     sequence trait do |n|

test/factories/user.rb

@@ -2,7 +2,8 @@
 
   factory :user, :class => UserEditType do
     password              "sekret"
-    name
+    first_name
+    last_name
     city
     company
     show_as_participant