hydra-access-controls 5.1.0 → 5.2.0

data/app/models/ability.rb

@@ -1,7 +1,5 @@
 # Allows you to use CanCan to control access to Models
-require 'cancan'
 class Ability
-  include CanCan::Ability
   include Hydra::Ability
   include Hydra::PolicyAwareAbility
 end

data/lib/hydra/ability.rb

@@ -1,11 +1,18 @@
 # Code for [CANCAN] access to Hydra models
+require 'cancan'
 module Hydra::Ability
   extend ActiveSupport::Concern
   
+  # once you include Hydra::Ability you can add custom permission methods by appending to ability_logic like so:
+  #
+  # self.ability_logic +=[:setup_my_permissions]
   
   included do
+    include CanCan::Ability
     include Hydra::AccessControlsEnforcement
     include Blacklight::SolrHelper
+    class_attribute :ability_logic
+    self.ability_logic = [:create_permissions, :edit_permissions, :read_permissions, :custom_permissions]
   end
 
   def self.user_class
@@ -38,10 +45,9 @@ module Hydra::Ability
   def hydra_default_permissions(user=nil, session=nil)
     ActiveSupport::Deprecation.warn("No need to pass user or session to hydra_default_permissions, use the instance_variables", caller()) if user || session
     logger.debug("Usergroups are " + user_groups.inspect)
-    create_permissions()
-    edit_permissions()
-    read_permissions()
-    custom_permissions()
+    self.ability_logic.each do |method|
+      send(method)
+    end
   end
 
   def create_permissions(user=nil, session=nil)

data/spec/unit/ability_spec.rb

@@ -245,6 +245,30 @@ describe Ability do
 
   end
 
+  describe "custom method" do
+    before do
+      class MyAbility
+        include Hydra::Ability
+        self.ability_logic +=[:setup_my_permissions]
+
+        def setup_my_permissions
+          can :accept, ActiveFedora::Base
+        end
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :MyAbility)
+    end
+
+    subject { MyAbility.new(FactoryGirl.create(:staff)) }
+
+    it "should be set the custom permission" do
+      subject.can?(:accept, ActiveFedora::Base).should be_true
+    end
+
+  end
+
   #
   # Policy-based Access Controls
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport