atomaka/budget
1
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

Compare commits

base: atomaka:108959f2b0219a74044fffd0334db1b43e685247
Branches Tags
atomaka:main
atomaka:update-tailwind
atomaka:clear-rdoc-deprecations
atomaka:test-actions
atomaka:v1-ruby
atomaka:yjit
atomaka:14
atomaka:test-7
atomaka:test-6
atomaka:test-5
atomaka:test-4
atomaka:test-3
atomaka:13
atomaka:12
atomaka:11
atomaka:10
atomaka:test-2
atomaka:test-1
atomaka:9
atomaka:8
atomaka:7
atomaka:6
atomaka:5
atomaka:4
atomaka:3
atomaka:2
atomaka:1
..
compare: atomaka:9227fad48af423b05faa180cff3eab46234c2571
Branches Tags
atomaka:update-tailwind
atomaka:main
atomaka:clear-rdoc-deprecations
atomaka:test-actions
atomaka:v1-ruby
atomaka:yjit
atomaka:14
atomaka:test-7
atomaka:test-6
atomaka:test-5
atomaka:test-4
atomaka:test-3
atomaka:13
atomaka:12
atomaka:11
atomaka:10
atomaka:test-2
atomaka:test-1
atomaka:9
atomaka:8
atomaka:7
atomaka:6
atomaka:5
atomaka:4
atomaka:3
atomaka:2
atomaka:1

No commits in common. "108959f2b0219a74044fffd0334db1b43e685247" and "9227fad48af423b05faa180cff3eab46234c2571" have entirely different histories.
108959f2b0 ... 9227fad48a

15 changed files with 10 additions and 79 deletions
Show stats Expand all files Collapse all files

1
app/controllers/application_controller.rb
View file

@ -1,4 +1,3 @@
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include Authenticatable include Authenticatable
include Authorizable
end end

37
app/controllers/concerns/authorizable.rb
View file

@ -1,37 +0,0 @@
module Authorizable
extend ActiveSupport::Concern
included do
before_action :require_registered_user
end
class_methods do
def allow_unregistered_user(**args)
skip_before_action :require_registered_user, **args
end
def require_unregistered_user(**args)
skip_before_action :require_registered_user, **args
before_action :require_unregistered_user, **args
end
end
private
def require_registered_user
Current.user.registered? || redirect_to_sign_in
end
def require_unregistered_user
Current.user.unregistered? || redirect_to_dashboard
end
def redirect_to_sign_in
session[:return_url] = request.url
redirect_to new_session_url, alert: "You must be logged in to continue."
end
def redirect_to_dashboard
redirect_to root_url, alert: "You are already logged in."
end
end

4
app/controllers/sessions_controller.rb
View file

@ -1,5 +1,4 @@
class SessionsController < ApplicationController class SessionsController < ApplicationController
require_unregistered_user only: %i[new create]
# GET /sessions/new # GET /sessions/new
def new def new
@session = Session.new @session = Session.new
@ -12,6 +11,7 @@ class SessionsController < ApplicationController
respond_to do |format| respond_to do |format|
if @session.save if @session.save
session[:current_user_id] = @session.user_id session[:current_user_id] = @session.user_id
Rails.logger.info("ID: #{@session.user_id}")
format.html { redirect_to root_url, notice: "Session was successfully created." } format.html { redirect_to root_url, notice: "Session was successfully created." }
format.json { render :show, status: :created, location: @session } format.json { render :show, status: :created, location: @session }
@ -27,7 +27,7 @@ class SessionsController < ApplicationController
session[:current_user_id] = nil session[:current_user_id] = nil
respond_to do |format| respond_to do |format|
format.html { redirect_to new_session_url, notice: "Session was successfully destroyed." } format.html { redirect_to root_url, notice: "Session was successfully destroyed." }
format.json { head :no_content } format.json { head :no_content }
end end
end end

9
app/controllers/users_controller.rb
View file

@ -1,6 +1,4 @@
class UsersController < ApplicationController class UsersController < ApplicationController
require_unregistered_user only: %i[new create]
before_action :set_user, only: %i[ show edit update destroy ] before_action :set_user, only: %i[ show edit update destroy ]
# GET /users or /users.json # GET /users or /users.json
@ -27,9 +25,6 @@ class UsersController < ApplicationController
respond_to do |format| respond_to do |format|
if @user.save if @user.save
@session = Session.new(session_params).save
session[:current_user_id] = @session.user_id
format.html { redirect_to user_url(@user), notice: "User was successfully created." } format.html { redirect_to user_url(@user), notice: "User was successfully created." }
format.json { render :show, status: :created, location: @user } format.json { render :show, status: :created, location: @user }
else else
@ -72,8 +67,4 @@ class UsersController < ApplicationController
def user_params def user_params
params.require(:user).permit(:email, :password, :password_confirmation) params.require(:user).permit(:email, :password, :password_confirmation)
end end
def session_params
user_params.slice(:email, :password)
end
end end

2
app/models/guest_user.rb
View file

@ -1,5 +1,3 @@
class GuestUser class GuestUser
def registered? = false def registered? = false
def unregistered? = true
end end

2
app/models/user.rb
View file

@ -2,6 +2,4 @@ class User < ApplicationRecord
has_secure_password has_secure_password
def registered? = true def registered? = true
def unregistered? = false
end end

3
app/views/layouts/application.html.erb
View file

@ -14,15 +14,14 @@
<body> <body>
<nav class="w-100 p-6 bg-gray-900 flex items-center justify-between flex-wrap"> <nav class="w-100 p-6 bg-gray-900 flex items-center justify-between flex-wrap">
<ul class="flex"> <ul class="flex">
<% if Current.user.registered? %>
<li class="mr-6"><%= link_to "Dashboard", root_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Dashboard", root_path, class: "text-white" %></li>
<li class="mr-6"><%= link_to "Expenses", expenses_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Expenses", expenses_path, class: "text-white" %></li>
<li class="mr-6"><%= link_to "Credit Card Bills", credit_card_bills_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Credit Card Bills", credit_card_bills_path, class: "text-white" %></li>
<li class="mr-6"><%= link_to "Incomes", incomes_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Incomes", incomes_path, class: "text-white" %></li>
<li class="mr-6"><%= link_to "Members", members_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Members", members_path, class: "text-white" %></li>
<% if Current.user.registered? %>
<li class="mr-6"><%= link_to "Log out", session_path, data: {turbo_method: :delete}, class: "text-white" %></li> <li class="mr-6"><%= link_to "Log out", session_path, data: {turbo_method: :delete}, class: "text-white" %></li>
<% else %> <% else %>
<li class="mr-6"><%= link_to "Sign up", new_user_path, class: "text-white" %></li>
<li class="mr-6"><%= link_to "Log in", new_session_path, class: "text-white" %></li> <li class="mr-6"><%= link_to "Log in", new_session_path, class: "text-white" %></li>
<% end %> <% end %>
</ul> </ul>

3
test/controllers/sessions_controller_test.rb
View file

@ -20,9 +20,8 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
end end
test "should destroy session" do test "should destroy session" do
login(users(:one).email)
delete session_url(@session) delete session_url(@session)
assert_redirected_to new_session_url assert_redirected_to root_url
end end
end end

5
test/controllers/users_controller_test.rb
View file

@ -6,7 +6,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
end end
test "should get index" do test "should get index" do
login(@user.email)
get users_url get users_url
assert_response :success assert_response :success
end end
@ -32,25 +31,21 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
end end
test "should show user" do test "should show user" do
login(@user.email)
get user_url(@user) get user_url(@user)
assert_response :success assert_response :success
end end
test "should get edit" do test "should get edit" do
login(@user.email)
get edit_user_url(@user) get edit_user_url(@user)
assert_response :success assert_response :success
end end
test "should update user" do test "should update user" do
login(@user.email)
patch user_url(@user), params: { user: { email: @user.email, password: "secret", password_confirmation: "secret" } } patch user_url(@user), params: { user: { email: @user.email, password: "secret", password_confirmation: "secret" } }
assert_redirected_to user_url(@user) assert_redirected_to user_url(@user)
end end
test "should destroy user" do test "should destroy user" do
login(@user.email)
assert_difference("User.count", -1) do assert_difference("User.count", -1) do
delete user_url(@user) delete user_url(@user)
end end

1
test/system/credit_card_bills_test.rb
View file

@ -3,7 +3,6 @@ require "application_system_test_case"
class CreditCardBillsTest < ApplicationSystemTestCase class CreditCardBillsTest < ApplicationSystemTestCase
setup do setup do
@credit_card_bill = credit_card_bills(:one) @credit_card_bill = credit_card_bills(:one)
login(users(:one).email)
end end
test "visiting the index" do test "visiting the index" do

1
test/system/expenses_test.rb
View file

@ -3,7 +3,6 @@ require "application_system_test_case"
class ExpensesTest < ApplicationSystemTestCase class ExpensesTest < ApplicationSystemTestCase
setup do setup do
@expense = expenses(:monthly_expense) @expense = expenses(:monthly_expense)
login(users(:one).email)
end end
test "visiting the index" do test "visiting the index" do

1
test/system/incomes_test.rb
View file

@ -3,7 +3,6 @@ require "application_system_test_case"
class IncomesTest < ApplicationSystemTestCase class IncomesTest < ApplicationSystemTestCase
setup do setup do
@income = incomes(:included_1) @income = incomes(:included_1)
login(users(:one).email)
end end
test "visiting the index" do test "visiting the index" do

1
test/system/members_test.rb
View file

@ -3,7 +3,6 @@ require "application_system_test_case"
class MembersTest < ApplicationSystemTestCase class MembersTest < ApplicationSystemTestCase
setup do setup do
@member = members(:one) @member = members(:one)
login(users(:one).email)
end end
test "visiting the index" do test "visiting the index" do

7
test/system/users_test.rb
View file

@ -6,14 +6,13 @@ class UsersTest < ApplicationSystemTestCase
end end
test "visiting the index" do test "visiting the index" do
login(@user.email)
visit users_url visit users_url
assert_selector "h1", text: "Users" assert_selector "h1", text: "Users"
end end
test "should create user" do test "should create user" do
visit users_url visit users_url
click_on "Sign up" click_on "New user"
fill_in "Email", with: "userthree@example.local" fill_in "Email", with: "userthree@example.local"
fill_in "Password", with: "secret" fill_in "Password", with: "secret"
@ -25,7 +24,6 @@ class UsersTest < ApplicationSystemTestCase
end end
test "should update User" do test "should update User" do
login(@user.email)
visit user_url(@user) visit user_url(@user)
click_on "Edit this user", match: :first click_on "Edit this user", match: :first
@ -39,8 +37,7 @@ class UsersTest < ApplicationSystemTestCase
end end
test "should destroy User" do test "should destroy User" do
login(@user.email) visit user_url(@user)
visit user_url(users(:two))
click_on "Destroy this user", match: :first click_on "Destroy this user", match: :first
assert_text "User was successfully destroyed" assert_text "User was successfully destroyed"

4
test/test_helper.rb
View file

@ -10,8 +10,4 @@ class ActiveSupport::TestCase
fixtures :all fixtures :all
# Add more helper methods to be used by all tests here... # Add more helper methods to be used by all tests here...
def login(email, password = "secret")
post sessions_url, params: { session: { email: email, password: password } }
assert session[:current_user_id].present?
end
end end