use the name of user instead of passenger name.

.gitignore

@@ -1,4 +1,5 @@
 .bundle
+.idea
 db/*.sqlite3
 log/*.log
 tmp/

app/controllers/travels_controller.rb

@@ -6,7 +6,7 @@ def create
     flight_date = params[:flight_date]
     flight = air_route.flights.find_by_date(Date.parse(flight_date)) || air_route.flights.create!(:date => flight_date)
 
-    flight.travels.create!(:passenger_name => params[:passenger_name])
+    flight.travels.create!(:user_id => params[:user_id])
 
     redirect_to :action => :index
   end

app/models/travel.rb

@@ -1,3 +1,4 @@
 class Travel < ActiveRecord::Base
   belongs_to :flight
+  belongs_to :user
 end

app/models/user.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
 
-  #validates_presence_of :name
-  #validates_uniqueness_of :name, :email, :case_sensitive => false
+  validates_presence_of :name
+  validates_uniqueness_of :name, :email, :case_sensitive => false
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable

app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.submit "Resend confirmation instructions" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <p><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Change my password" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.submit "Send me reset password instructions" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,25 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></p>
+
+  <p><%= f.submit "Update" %></p>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= link_to "Back", :back %>

app/views/devise/registrations/new.html.erb

@@ -0,0 +1,21 @@
+<h2>Sign up</h2>
+
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :name %><br />
+  <%= f.text_field :name %></p>
+
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Sign up" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/sessions/new.html.erb

@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
+
+  <% if devise_mapping.rememberable? -%>
+    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+  <% end -%>
+
+  <p><%= f.submit "Sign in" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
+
+  <p><%= f.submit "Resend unlock instructions" %></p>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

app/views/flights/show.html.erb

@@ -1,5 +1,5 @@
 <ul>
 <% @flight.travels.each do |travel| %>
-	<li><%= travel.passenger_name %></li>
+	<li><%= travel.user.name %></li>
 <% end %>
 </ul>

app/views/layouts/application.html.erb

@@ -5,7 +5,7 @@
   <p class="alert"><%= alert %></p>
   <% if user_signed_in? %>
   <div>
-	<%= current_user.email %>, Welcome! 
+	 Welcome, <%= current_user.name %>!
 	<%= link_to 'Sign out', destroy_user_session_path %>
   </div>
   <% end %>

app/views/travels/index.html.erb

@@ -1,26 +1,27 @@
 <% content_for :head do %>
-	<%= stylesheet_link_tag 'simple_form/screen', 'simple_form/dropdown', 'simple_form/date'  %>
-	<%= javascript_include_tag 'simple_form/helpers', 'simple_form/date', 'simple_form/form', 'scriptaculous', 'AutoComplete'  %>
+    <%= stylesheet_link_tag 'simple_form/screen', 'simple_form/dropdown', 'simple_form/date' %>
+    <%= javascript_include_tag 'simple_form/helpers', 'simple_form/date', 'simple_form/form', 'scriptaculous', 'AutoComplete' %>
 <% end %>
 
-<%= form_tag(travels_path, :method => 'POST') do -%>
-	<%= field_set_tag 'Travel' do %>
-		<div>
-			<%= label_tag 'passenger_name' %>
-			<%= text_field_tag 'passenger_name' %>
-		</div>
-		<div>
-			<%= label_tag 'flight_number' %>
-			<%= text_field_tag 'flight_number', nil, :id => 'flight_number', :autocomplete => 'off' %>
-		</div>
-		<div class="date">
-			<%= label_tag 'flight_date' %>
-			<%= text_field_tag 'flight_date', nil, :class => 'date_input' %>
-		</div>
-		<div>
-			<%= submit_tag %>
-		</div>
-	<% end%>
+<%= form_tag(travels_path, :method => 'POST') do %>
+    <%= field_set_tag 'Travel' do %>
+        <div>
+          <%= label_tag 'name' %>
+          <%= current_user.name if user_signed_in? %>
+          <%= hidden_field_tag 'user_id', current_user.id %>
+        </div>
+        <div>
+          <%= label_tag 'flight_number' %>
+          <%= text_field_tag 'flight_number', nil, :id => 'flight_number', :autocomplete => 'off' %>
+        </div>
+        <div class="date">
+          <%= label_tag 'flight_date' %>
+          <%= text_field_tag 'flight_date', nil, :class => 'date_input' %>
+        </div>
+        <div>
+          <%= submit_tag %>
+        </div>
+    <% end %>
 <% end %>
 
 <table>
@@ -29,17 +30,17 @@
     <th>Flight Number &amp; Date</th>
   </tr>
 
-<% @travels.each do |travel| %>
-  <tr>
-    <td><%= travel.passenger_name %></td>
-    <td><%= link_to travel.flight.air_route.number + " " + travel.flight.date.to_s, flight_path(travel.flight) %></td>
-  </tr>
-<% end %>
+  <% @travels.each do |travel| %>
+      <tr>
+        <td><%= travel.user.name %></td>
+        <td><%= link_to travel.flight.air_route.number + " " + travel.flight.date.to_s, flight_path(travel.flight) %></td>
+      </tr>
+  <% end %>
 </table>
 
 <script type="text/javascript">
-	new AutoComplete('flight_number', 'air_routes/query/', {
-		delay: 0.25,
-		resultFormat: AutoComplete.Options.RESULT_FORMAT_JSON
-	});
+    new AutoComplete('flight_number', 'air_routes/query/', {
+        delay: 0.25,
+        resultFormat: AutoComplete.Options.RESULT_FORMAT_JSON
+    });
 </script>

db/migrate/20110627164927_change_passenger_of_travels.rb

@@ -0,0 +1,11 @@
+class ChangePassengerOfTravels < ActiveRecord::Migration
+  def self.up
+    remove_column :travels, :passenger_name
+    add_column :travels, :user_id, :integer
+  end
+
+  def self.down
+    remove_column :travels, :user_id
+    add_column :travels, :passenger_name, :string
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110606092443) do
+ActiveRecord::Schema.define(:version => 20110627164927) do
 
   create_table "air_routes", :force => true do |t|
     t.string   "number"
@@ -26,10 +26,10 @@
   end
 
   create_table "travels", :force => true do |t|
-    t.string   "passenger_name"
     t.integer  "flight_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "user_id"
   end
 
   create_table "users", :force => true do |t|