Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pundit and policies #5

Merged
merged 5 commits into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ gem 'bootsnap', require: false
gem 'draper'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma'
gem 'pundit'
gem 'rails', '= 5.2.2'
gem 'slim-rails'
gem 'webpacker', '~> 3' # 3.x does not support npm package webpack 4.x. Will be fixed in 4.x.
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ GEM
pry-rails (0.3.9)
pry (>= 0.10.4)
puma (3.12.0)
pundit (2.0.1)
activesupport (>= 3.0.0)
rack (2.0.6)
rack-proxy (0.6.5)
rack
Expand Down Expand Up @@ -215,6 +217,7 @@ DEPENDENCIES
pry-byebug
pry-rails
puma
pundit
rails (= 5.2.2)
slim-rails
spring
Expand Down
11 changes: 11 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
# frozen_string_literal: true

class ApplicationController < ActionController::Base
include Pundit

delegate :current_user, to: :helpers, allow_nil: true

rescue_from Pundit::NotAuthorizedError, with: :redirect_user_back

private

def redirect_user_back
redirect_back(fallback_location: root_path, alert: 'You are not authorized to perform this action.')
end
end
14 changes: 11 additions & 3 deletions app/controllers/notes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

class NotesController < ApplicationController
def index
@notes = Note.not_ended.not_completed.decorate
@notes = policy_scope(Note).decorate
end

def show
@note = Note.find(params[:id]).decorate
authorize(@note)
end

def new
Expand All @@ -25,10 +26,14 @@ def create

def edit
@note = Note.find(params[:id])
authorize(@note)

end

def update
@note = Note.find(params[:id])
authorize(@note)

if @note.update(note_params)
redirect_to @note, notice: 'Note successfully updated.'
else
Expand All @@ -38,18 +43,21 @@ def update

def complete
@note = Note.find(params[:id])
authorize(@note)

service = Notes::Complete.new(note: @note)
if service.save
flash[:notice] = 'Note successfully marked as completed.'
redirect_to notes_path
else
flash[:alert] = "Note not marked as completed: #{service.errors.full_messages.join(', ')}"
redirect_to @note
end
redirect_to @note
end

private

def note_params
params.require(:note).permit(:title, :description, :started_at, :ended_at).merge(user: helpers.current_user)
params.require(:note).permit(:title, :description, :started_at, :ended_at).merge(user: current_user)
end
end
6 changes: 6 additions & 0 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

class SessionsController < ApplicationController
def new
authorize(:session)

@login = Login.new
end

def create
authorize(:session)

@login = Login.new(user_params)
if @login.save
helpers.log_in(@login.user)
Expand All @@ -16,6 +20,8 @@ def create
end

def destroy
authorize(:session)

helpers.log_out
redirect_to notes_path, notice: 'Successfully logged out.'
end
Expand Down
4 changes: 4 additions & 0 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

class UsersController < ApplicationController
def new
authorize(:register)

@register = Register.new
end

def create
authorize(:register)

@register = Register.new(user_params)
if @register.save
helpers.log_in(@register.user)
Expand Down
57 changes: 57 additions & 0 deletions app/policies/application_policy.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# frozen_string_literal: true

class ApplicationPolicy
attr_reader :user, :record

class Scope
attr_reader :user, :scope

def initialize(user, scope)
@user = user
@scope = scope
end

def resolve
scope.all
end
end

def initialize(user, record)
@user = user
@record = record
end

def index?
false
end

def show?
false
end

def new?
create?
end

def create?
false
end

def edit?
update?
end

def update?
false
end

def destroy?
false
end

private

def logged_in?
user.present?
end
end
23 changes: 23 additions & 0 deletions app/policies/note_policy.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# frozen_string_literal: true

class NotePolicy < ApplicationPolicy
class Scope < Scope
def resolve
scope.not_completed.where(user: user.presence)
end
end

def show?
record.user == user.presence
end

def update?
return false if record.completed?

show?
end

def complete?
update?
end
end
7 changes: 7 additions & 0 deletions app/policies/register_policy.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# frozen_string_literal: true

class RegisterPolicy < ApplicationPolicy
def create?
!logged_in?
end
end
11 changes: 11 additions & 0 deletions app/policies/session_policy.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# frozen_string_literal: true

class SessionPolicy < ApplicationPolicy
def create?
!logged_in?
end

def destroy?
logged_in?
end
end