rails_apps_pages 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59152aa2c474ade2742bbf471e1d7db7cd22aa0
-  data.tar.gz: 57671f13698c915d66146b6b7819e0a96ffa3681
+  metadata.gz: 91f0a789ab7a631bd1c960d6e31c4a3e930cacc1
+  data.tar.gz: fb311d6dd546c5db30530a373ae690a0fca919f8
 SHA512:
-  metadata.gz: ebb4c99313753694356250e3fc95c0bbfd763442c2de03417c33153ce6395c7f6454bdcc96d3cf382804a22655a77cb39a54666a9ed9ab524bf78c6aa5d49a2e
-  data.tar.gz: ef1bc29a33bffb1b369343365a36427b727d3853947b616695f202389f92c78f30ea7f8740815de317b9e65142e2c6fbb81659308e1b8eb74a4bbf038259b700
+  metadata.gz: 49aad27b6c788032096b48110223eb49da2ebe8e621b9f42f85259ffd68ae188f2853acbf70e58fe06b3b2b3493af77e25d52e61c9c0f78f9d1b5daac9009d43
+  data.tar.gz: 6ade9f5fd9558ed5f8ae98174ff73c91b11ab869ab7750cb40f22e62bea9a181b41b1370057ee5e42766bbdf04bb1a4e2224f060e0279e59dfd2aedaff70e22b

data/CHANGELOG.textile

@@ -1,5 +1,9 @@
 h1. CHANGELOG
 
+h3. 0.5.1 June 13, 2014
+
+* updated User controller and policy for Pundit example
+
 h3. 0.5.0 June 6, 2014
 
 * tests for Devise are now available in the rails_apps_testing gem (removed here)

data/lib/generators/pages/authorized/templates/user_policy.rb

@@ -1,21 +1,26 @@
 class UserPolicy
-  attr_reader :user, :record
+  attr_reader :current_user, :model
 
-  def initialize(user, record)
-    @user = user
-    @record = record
+  def initialize(current_user, model)
+    @current_user = current_user
+    @user = model
   end
 
   def index?
-    @user.admin?
+    @current_user.admin?
+  end
+
+  def show?
+    @current_user.admin? or @current_user == @user
   end
 
   def update?
-    @user.admin?
+    @current_user.admin?
   end
 
   def destroy?
-    @user.admin?
+    raise "Cannot delete yourself." if @current_user == @user
+    @current_user.admin?
   end
 
 end

data/lib/generators/pages/authorized/templates/users_controller.rb

@@ -1,19 +1,15 @@
 class UsersController < ApplicationController
   before_filter :authenticate_user!
-  after_action :verify_authorized, except: [:show]
+  after_action :verify_authorized
 
   def index
     @users = User.all
-    authorize @users
+    authorize User
   end
 
   def show
     @user = User.find(params[:id])
-    unless current_user.admin?
-      unless @user == current_user
-        redirect_to :back, :alert => "Access denied."
-      end
-    end
+    authorize @user
   end
 
   def update
@@ -29,12 +25,8 @@ class UsersController < ApplicationController
   def destroy
     user = User.find(params[:id])
     authorize user
-    unless user == current_user
-      user.destroy
-      redirect_to users_path, :notice => "User deleted."
-    else
-      redirect_to users_path, :notice => "Can't delete yourself."
-    end
+    user.destroy
+    redirect_to users_path, :notice => "User deleted."
   end
 
   private

data/lib/rails_apps_pages/version.rb

@@ -1,3 +1,3 @@
 module RailsAppsPages
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_pages
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler