diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:28:25 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:28:25 -0500 |
commit | f72b55ce938a14313091a92d84c4083c3ba4f2fd (patch) | |
tree | 19439a28eb3519e060fe63e045dc412dfb3aa71a | |
parent | 0d710239a765787f10de304edc438de2dfaa9824 (diff) |
move the separate migrations into the original generates
-rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
-rw-r--r-- | app/views/users/_form.html.erb | 8 | ||||
-rw-r--r-- | app/views/users/index.html.erb | 4 | ||||
-rw-r--r-- | app/views/users/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/users/show.html.erb | 10 | ||||
-rw-r--r-- | app/views/users/show.json.jbuilder | 2 | ||||
-rw-r--r-- | db/migrate/20140306014123_add_index_to_users_email.rb | 4 | ||||
-rw-r--r-- | db/migrate/20140306014125_add_index_to_users_user_name.rb | 4 | ||||
-rw-r--r-- | db/migrate/20140306014128_add_password_digest_to_users.rb | 4 | ||||
-rw-r--r-- | db/migrate/20140306014130_add_remember_token_to_users.rb | 4 | ||||
-rw-r--r-- | db/migrate/20140306022626_create_servers.rb (renamed from db/migrate/20140306014047_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022628_create_tournaments.rb (renamed from db/migrate/20140306014050_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022631_create_matches.rb (renamed from db/migrate/20140306014052_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022633_create_teams.rb (renamed from db/migrate/20140306014054_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022635_create_alerts.rb (renamed from db/migrate/20140306014056_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022638_create_pms.rb (renamed from db/migrate/20140306014059_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022640_create_games.rb (renamed from db/migrate/20140306014101_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022642_create_users.rb (renamed from db/migrate/20140306014103_create_users.rb) | 4 | ||||
-rw-r--r-- | db/migrate/20140306022644_create_sessions.rb (renamed from db/migrate/20140306014106_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022647_create_game_attributes.rb (renamed from db/migrate/20140306014108_create_game_attributes.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022649_create_server_settings.rb (renamed from db/migrate/20140306014110_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022651_create_user_team_pairs.rb (renamed from db/migrate/20140306014112_create_user_team_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022653_create_team_match_pairs.rb (renamed from db/migrate/20140306014114_create_team_match_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306022702_create_tournament_options.rb (renamed from db/migrate/20140306014132_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 7 | ||||
-rwxr-xr-x | generate.sh | 9 | ||||
-rw-r--r-- | test/controllers/users_controller_test.rb | 4 | ||||
-rw-r--r-- | test/fixtures/users.yml | 4 |
28 files changed, 42 insertions, 30 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b18efed..989ef76 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -69,6 +69,6 @@ class UsersController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def user_params - params.require(:user).permit(:name, :email, :user_name) + params.require(:user).permit(:name, :email, :user_name, :password_digest, :remember_token) end end diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 4d28738..ad89f47 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -23,6 +23,14 @@ <%= f.label :user_name %><br> <%= f.text_field :user_name %> </div> + <div class="field"> + <%= f.label :password_digest %><br> + <%= f.text_field :password_digest %> + </div> + <div class="field"> + <%= f.label :remember_token %><br> + <%= f.text_field :remember_token %> + </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 3692112..c0d52a0 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -6,6 +6,8 @@ <th>Name</th> <th>Email</th> <th>User name</th> + <th>Password digest</th> + <th>Remember token</th> <th></th> <th></th> <th></th> @@ -18,6 +20,8 @@ <td><%= user.name %></td> <td><%= user.email %></td> <td><%= user.user_name %></td> + <td><%= user.password_digest %></td> + <td><%= user.remember_token %></td> <td><%= link_to 'Show', user %></td> <td><%= link_to 'Edit', edit_user_path(user) %></td> <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td> diff --git a/app/views/users/index.json.jbuilder b/app/views/users/index.json.jbuilder index 42d8b72..cf21a4a 100644 --- a/app/views/users/index.json.jbuilder +++ b/app/views/users/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@users) do |user| - json.extract! user, :id, :name, :email, :user_name + json.extract! user, :id, :name, :email, :user_name, :password_digest, :remember_token json.url user_url(user, format: :json) end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9455a3c..a0fa94c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -15,5 +15,15 @@ <%= @user.user_name %> </p> +<p> + <strong>Password digest:</strong> + <%= @user.password_digest %> +</p> + +<p> + <strong>Remember token:</strong> + <%= @user.remember_token %> +</p> + <%= link_to 'Edit', edit_user_path(@user) %> | <%= link_to 'Back', users_path %> diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder index 4919af3..11b0784 100644 --- a/app/views/users/show.json.jbuilder +++ b/app/views/users/show.json.jbuilder @@ -1 +1 @@ -json.extract! @user, :id, :name, :email, :user_name, :created_at, :updated_at +json.extract! @user, :id, :name, :email, :user_name, :password_digest, :remember_token, :created_at, :updated_at diff --git a/db/migrate/20140306014123_add_index_to_users_email.rb b/db/migrate/20140306014123_add_index_to_users_email.rb deleted file mode 100644 index b5f8a1a..0000000 --- a/db/migrate/20140306014123_add_index_to_users_email.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddIndexToUsersEmail < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014125_add_index_to_users_user_name.rb b/db/migrate/20140306014125_add_index_to_users_user_name.rb deleted file mode 100644 index 724cca5..0000000 --- a/db/migrate/20140306014125_add_index_to_users_user_name.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddIndexToUsersUserName < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014128_add_password_digest_to_users.rb b/db/migrate/20140306014128_add_password_digest_to_users.rb deleted file mode 100644 index 0070da7..0000000 --- a/db/migrate/20140306014128_add_password_digest_to_users.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddPasswordDigestToUsers < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014130_add_remember_token_to_users.rb b/db/migrate/20140306014130_add_remember_token_to_users.rb deleted file mode 100644 index 74c254f..0000000 --- a/db/migrate/20140306014130_add_remember_token_to_users.rb +++ /dev/null @@ -1,4 +0,0 @@ -class AddRememberTokenToUsers < ActiveRecord::Migration - def change - end -end diff --git a/db/migrate/20140306014047_create_servers.rb b/db/migrate/20140306022626_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140306014047_create_servers.rb +++ b/db/migrate/20140306022626_create_servers.rb diff --git a/db/migrate/20140306014050_create_tournaments.rb b/db/migrate/20140306022628_create_tournaments.rb index 36fcf7e..36fcf7e 100644 --- a/db/migrate/20140306014050_create_tournaments.rb +++ b/db/migrate/20140306022628_create_tournaments.rb diff --git a/db/migrate/20140306014052_create_matches.rb b/db/migrate/20140306022631_create_matches.rb index 325863d..325863d 100644 --- a/db/migrate/20140306014052_create_matches.rb +++ b/db/migrate/20140306022631_create_matches.rb diff --git a/db/migrate/20140306014054_create_teams.rb b/db/migrate/20140306022633_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140306014054_create_teams.rb +++ b/db/migrate/20140306022633_create_teams.rb diff --git a/db/migrate/20140306014056_create_alerts.rb b/db/migrate/20140306022635_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140306014056_create_alerts.rb +++ b/db/migrate/20140306022635_create_alerts.rb diff --git a/db/migrate/20140306014059_create_pms.rb b/db/migrate/20140306022638_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140306014059_create_pms.rb +++ b/db/migrate/20140306022638_create_pms.rb diff --git a/db/migrate/20140306014101_create_games.rb b/db/migrate/20140306022640_create_games.rb index 59d4ef0..59d4ef0 100644 --- a/db/migrate/20140306014101_create_games.rb +++ b/db/migrate/20140306022640_create_games.rb diff --git a/db/migrate/20140306014103_create_users.rb b/db/migrate/20140306022642_create_users.rb index f0986d4..f416771 100644 --- a/db/migrate/20140306014103_create_users.rb +++ b/db/migrate/20140306022642_create_users.rb @@ -4,8 +4,12 @@ class CreateUsers < ActiveRecord::Migration t.string :name t.string :email t.string :user_name + t.string :password_digest + t.string :remember_token t.timestamps end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true end end diff --git a/db/migrate/20140306014106_create_sessions.rb b/db/migrate/20140306022644_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140306014106_create_sessions.rb +++ b/db/migrate/20140306022644_create_sessions.rb diff --git a/db/migrate/20140306014108_create_game_attributes.rb b/db/migrate/20140306022647_create_game_attributes.rb index b63f134..b63f134 100644 --- a/db/migrate/20140306014108_create_game_attributes.rb +++ b/db/migrate/20140306022647_create_game_attributes.rb diff --git a/db/migrate/20140306014110_create_server_settings.rb b/db/migrate/20140306022649_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140306014110_create_server_settings.rb +++ b/db/migrate/20140306022649_create_server_settings.rb diff --git a/db/migrate/20140306014112_create_user_team_pairs.rb b/db/migrate/20140306022651_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140306014112_create_user_team_pairs.rb +++ b/db/migrate/20140306022651_create_user_team_pairs.rb diff --git a/db/migrate/20140306014114_create_team_match_pairs.rb b/db/migrate/20140306022653_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140306014114_create_team_match_pairs.rb +++ b/db/migrate/20140306022653_create_team_match_pairs.rb diff --git a/db/migrate/20140306014132_create_tournament_options.rb b/db/migrate/20140306022702_create_tournament_options.rb index d2df22e..d2df22e 100644 --- a/db/migrate/20140306014132_create_tournament_options.rb +++ b/db/migrate/20140306022702_create_tournament_options.rb diff --git a/db/schema.rb b/db/schema.rb index e700a4a..ca583d1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140306014132) do +ActiveRecord::Schema.define(version: 20140306022702) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -122,8 +122,13 @@ ActiveRecord::Schema.define(version: 20140306014132) do t.string "name" t.string "email" t.string "user_name" + t.string "password_digest" + t.string "remember_token" t.datetime "created_at" t.datetime "updated_at" end + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true + end diff --git a/generate.sh b/generate.sh index 0d07743..da55bca 100755 --- a/generate.sh +++ b/generate.sh @@ -24,7 +24,7 @@ bundle exec rails generate scaffold team $NOTEST bundle exec rails generate scaffold alert author:references message:text $NOTEST bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST -bundle exec rails generate scaffold user name:string email:string user_name:string $NOTEST +bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq password_digest:string remember_token:string bundle exec rails generate scaffold session user:references # Just models @@ -38,13 +38,6 @@ bundle exec rails generate controller search $NOTEST bundle exec rails generate controller main $NOTEST bundle exec rails generate controller static $NOTEST -#added some stuff to the database - -bundle exec rails generate migration add_index_to_users_email -bundle exec rails generate migration add_index_to_users_user_name -bundle exec rails generate migration add_password_digest_to_users -bundle exec rails generate migration add_remember_token_to_users - #for the tournament controller to generate options bundle exec rails generate model tournament_option $NOTEST #bundle exec rails generate scaffold diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 79a5700..fc06f63 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -18,7 +18,7 @@ class UsersControllerTest < ActionController::TestCase test "should create user" do assert_difference('User.count') do - post :create, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + post :create, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } end assert_redirected_to user_path(assigns(:user)) @@ -35,7 +35,7 @@ class UsersControllerTest < ActionController::TestCase end test "should update user" do - patch :update, id: @user, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + patch :update, id: @user, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } assert_redirected_to user_path(assigns(:user)) end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index ea3e874..cf39694 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,12 @@ one: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString two: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString |