Merge pull request #45 from rhokbrisbane/more_abilities

More abilities

app/controllers/application_controller.rb

@@ -5,6 +5,12 @@ class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
   before_filter :fetch_tags_by_category
 
+  before_filter do
+    resource = controller_name.singularize.to_sym
+    method = "#{resource}_params"
+    params[resource] &&= send(method) if respond_to?(method, true)
+  end
+
   private
 
   def fetch_tags_by_category

app/controllers/comments_controller.rb

@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  before_action :set_comment, only: [:show, :edit, :update, :destroy]
+  load_and_authorize_resource
 
   def create
     @comment = current_user.comments.new(comment_params)
@@ -21,10 +21,6 @@ def destroy
 
   private
 
-  def set_comment
-    @comment = current_user.comments.find(params[:id])
-  end
-
   def comment_params
     params.require(:comment).permit(:content, :commentable_id, :commentable_type)
   end

app/models/ability.rb

@@ -18,6 +18,7 @@ def initialize(user)
     can :read, Address
     can :read, Tag
     can :read, Tagging
+    can :read, Comment
 
     can :read, Note do |note|
       note.group_shares.where(shared_group_id: user.group_ids).any? ||
@@ -48,6 +49,7 @@ def initialize(user)
     can :manage, Tagging, user_id: user.id
     can :manage, Address, user_id: user.id
     can :manage, SavedSearch, user_id: user.id
+    can :manage, Comment, user_id: user.id
     can :manage, Kid do |kid|
       kid.guardianships.where(user_id: user.id).any?
     end

spec/models/ability_spec.rb

@@ -363,6 +363,14 @@
         it "should be_able_to(:create, Kid)" do
           should be_able_to(:create, Kid)
         end
+
+        it "should be_able_to(:create, SavedSearch)" do
+          should be_able_to(:create, SavedSearch)
+        end
+
+        it "should be_able_to(:create, Comment)" do
+          should be_able_to(:create, Comment)
+        end
       end
     end
   end