From 978c44b682bd7bc32d16f38d1ea361bc527a9381 Mon Sep 17 00:00:00 2001
From: songtianlun <tianlun.song@foxmail.com>
Date: Fri, 3 Jan 2025 10:55:42 +0800
Subject: [PATCH] feat: add user profile editing functionality

- Implemented edit and update actions in UsersController
- Created edit user view and form partial
- Updated user model validation to allow nil password
- Modified header to link to user settings
- Added integration tests for successful and unsuccessful edits

This commit introduces the ability for users to edit their profile
information, including name and email. It also includes validation
updates to allow users to update their profiles without changing
their password. Integration tests ensure that both successful and
unsuccessful edit attempts are handled correctly.
---
 app/controllers/users_controller.rb | 15 +++++++++++++
 app/models/user.rb                  |  2 +-
 app/views/layouts/_header.html.erb  |  2 +-
 app/views/users/_form.html.erb      | 18 +++++++++++++++
 app/views/users/edit.html.erb       | 13 +++++++++++
 app/views/users/new.html.erb        | 19 ++--------------
 test/integration/users_edit_test.rb | 34 +++++++++++++++++++++++++++++
 7 files changed, 84 insertions(+), 19 deletions(-)
 create mode 100644 app/views/users/_form.html.erb
 create mode 100644 app/views/users/edit.html.erb
 create mode 100644 test/integration/users_edit_test.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index bc85b72..87bf36a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -22,6 +22,21 @@ class UsersController < ApplicationController
     end
   end
 
+  def edit
+    @user = User.find(params[:id])
+  end
+
+  def update
+    @user = User.find(params[:id])
+    if @user.update(user_params)
+      flash[:success] = "Profile updated"
+      redirect_to @user
+      # redirect_to user_url(@user)
+    else
+      render 'edit'
+    end
+  end
+
   private
 
   def user_params
diff --git a/app/models/user.rb b/app/models/user.rb
index aec527c..1f45758 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -8,7 +8,7 @@ class User < ApplicationRecord
             format: { with: VALID_EMAIL_REGEX },
             uniqueness:  true
   has_secure_password
-  validates :password, presence: true, length: { minimum: 6 }
+  validates :password, presence: true, length: { minimum: 6 }, allow_nil: true
 
   def User.digest(string)
     cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST :
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 4f128d7..fa4e5b5 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -25,7 +25,7 @@
             </a>
             <ul class="dropdown-menu">
               <li><%= link_to "Profile", current_user %></li>
-              <li><%= link_to "Settings", '#' %></li>
+              <li><%= link_to "Settings", edit_user_path(current_user) %></li>
               <li class="divider"></li>
               <li>
                 <%= link_to "Log out", logout_path, data: { turbo_method: :delete } %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
new file mode 100644
index 0000000..29bbcc2
--- /dev/null
+++ b/app/views/users/_form.html.erb
@@ -0,0 +1,18 @@
+
+  <%= form_with(model: @user, local: true) do |f| %>
+    <%= render 'shared/error_messages' %>
+
+    <%= f.label :name %>
+    <%= f.text_field :name, class: 'form-control' %>
+
+    <%= f.label :email %>
+    <%= f.email_field :email, class: 'form-control' %>
+
+    <%= f.label :password %>
+    <%= f.password_field :password, class: 'form-control' %>
+
+    <%= f.label :password_confirmation, "Confirmation" %>
+    <%= f.password_field :password_confirmation, class: 'form-control' %>
+
+    <%= f.submit yield(:button_text), class: "btn btn-primary" %>
+  <% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
new file mode 100644
index 0000000..3b00571
--- /dev/null
+++ b/app/views/users/edit.html.erb
@@ -0,0 +1,13 @@
+<% provide(:title, "Edit user") %>
+<% provide(:button_text, 'Save changes') %>
+<h1>Update your profile</h1>
+
+<div class="row">
+  <div class="col-md-6 col-md-offset-3">
+    <%= render 'form' %>
+    <div class="gravatar_edit">
+      <%= gravatar_for @user %>
+      <a href="https://gravatar.com/emails" target="_blank">change</a>
+    </div>
+  </div>
+</div>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 97316f6..e029996 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -1,26 +1,11 @@
 <% provide(:title, 'Sign up') %>
+<% provide(:button_text, 'Create my account') %>
 <h1>Sign up</h1>
 
 <div class="row">
   <div class="col-md-6 col-md-offset-3">
     <%= turbo_frame_tag "signup_form" do %>
-      <%= form_with(model: @user, local: true) do |f| %>
-        <%= render 'shared/error_messages' %>
-
-        <%= f.label :name %>
-        <%= f.text_field :name, class: 'form-control' %>
-
-        <%= f.label :email %>
-        <%= f.email_field :email, class: 'form-control' %>
-
-        <%= f.label :password %>
-        <%= f.password_field :password, class: 'form-control' %>
-
-        <%= f.label :password_confirmation, "Confirmation" %>
-        <%= f.password_field :password_confirmation, class: 'form-control' %>
-
-        <%= f.submit "Create my account", class: "btn, btn-primary" %>
-      <% end %>
+      <%= render 'form' %>
     <% end %>
   </div>
 </div>
diff --git a/test/integration/users_edit_test.rb b/test/integration/users_edit_test.rb
new file mode 100644
index 0000000..80cd533
--- /dev/null
+++ b/test/integration/users_edit_test.rb
@@ -0,0 +1,34 @@
+require "test_helper"
+
+class UsersEditTest < ActionDispatch::IntegrationTest
+  def setup
+    @user = users(:michael)
+  end
+
+  test "successful edit" do
+    get edit_user_path(@user)
+    assert_template 'users/edit'
+    name = "Foo Bae"
+    email = "foo@bar.com"
+    patch user_path(@user), params: { user: { name:                   name,
+                                              email:                  email,
+                                              password:               "",
+                                              password_confirmation:  "" } }
+    assert_not flash.empty?
+    assert_redirected_to @user
+    @user.reload
+    assert_equal name, @user.name
+    assert_equal email, @user.email
+  end
+
+  test "unsuccessful edit" do
+    get edit_user_path(@user)
+    assert_template 'users/edit'
+    patch user_path(@user), params: { user: { name: "",
+                                              email: "foo@invalid",
+                                              password: "foo",
+                                              password_confirmation: "bar"
+                            } }
+    assert_template 'users/edit'
+  end
+end