zuul 0.2.2 → 0.2.3

data/lib/zuul/active_record/permission.rb

@@ -4,6 +4,7 @@ module Zuul
       def self.included(base)
         base.send :extend, ClassMethods
         base.send :include, ContextMethods # defined in lib/zuul/active_record.rb
+        base.send :include, InstanceMethods
       end
 
       module ClassMethods
@@ -26,6 +27,27 @@ module Zuul
           base.send :has_many, base.auth_scope.subjects_table_name.to_sym, :through => base.auth_scope.permission_subjects_table_name.to_sym
         end
       end
+
+      module InstanceMethods
+        # Returns a list of contexts within which the permission has been assigned to roles and/or subjects
+        def assigned_contexts
+          role_contexts.concat(subject_contexts).uniq
+        end
+
+        # Returns a list of contexts within which the permission has been assigned to roles
+        def role_contexts
+          auth_scope do
+            send(permission_roles_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+          end
+        end
+        
+        # Returns a list of contexts within which the permission has been assigned to subjects
+        def subject_contexts
+          auth_scope do
+            send(permission_subjects_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+          end
+        end
+      end
     end
   end
 end

data/lib/zuul/active_record/role.rb

@@ -4,6 +4,7 @@ module Zuul
       def self.included(base)
         base.send :extend, ClassMethods
         base.send :include, ContextMethods # defined in lib/zuul/active_record.rb
+        base.send :include, InstanceMethods
         base.send :include, PermissionMethods if base.auth_scope.config.with_permissions
       end
 
@@ -32,6 +33,15 @@ module Zuul
         end
       end
 
+      module InstanceMethods
+        # Returns a list of contexts within which the role has been assigned to subjects
+        def assigned_contexts
+          auth_scope do
+            send(role_subjects_table_name.to_sym).group(:context_type, :context_id).map(&:context)
+          end
+        end
+      end
+
       module PermissionMethods
         # Assigns a permission to a role within the provided context.
         #

data/lib/zuul/context.rb

@@ -34,6 +34,12 @@ module Zuul
       :instance
     end
 
+    def type_s
+      return 'global' if class_name.nil?
+      return class_name if id.nil?
+      "#{class_name}(#{id})"
+    end
+
     def to_context
       return nil if class_name.nil?
       return class_name.constantize if id.nil?

data/lib/zuul/version.rb

@@ -1,3 +1,3 @@
 module Zuul
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/zuul/active_record/permission_spec.rb

@@ -171,4 +171,113 @@ describe "Zuul::ActiveRecord::Permission" do
       @permission.context_id.should == context.id
     end
   end
+
+  describe "assigned context methods" do
+    before(:each) do
+      User.acts_as_authorization_subject
+      Role.acts_as_authorization_role
+      Permission.acts_as_authorization_permission
+      @permission = Permission.create(:name => 'Edit', :slug => 'edit')
+    end
+    
+    context "#role_contexts" do
+      it "should return an array of contexts within which the permission is assigned to roles" do
+        context = Context.create(:name => "Test Context")
+        role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+        role.assign_permission(:edit)
+        role.assign_permission(:edit, Context)
+        role.assign_permission(:edit, context)
+        @permission.role_contexts.length.should == 3
+        @permission.role_contexts.each do |actxt|
+          ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+      
+      it "should return a de-duped array of only unique contexts" do
+        context = Context.create(:name => "Test Context")
+        admin = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+        mod = Role.create(:name => 'Moderator', :slug => 'moderator', :level => 100)
+        admin.assign_permission(:edit)
+        admin.assign_permission(:edit, Context)
+        admin.assign_permission(:edit, context)
+        mod.assign_permission(:edit, Context)
+        mod.assign_permission(:edit, context)
+        @permission.role_contexts.length.should == 3
+        @permission.role_contexts.each do |actxt|
+          ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+    end
+
+    context "#subject_contexts" do
+      it "should return an array of contexts within which the permission is assigned to subjects" do
+        context = Context.create(:name => "Test Context")
+        user = User.create(:name => "Test User")
+        user.assign_permission(:edit)
+        user.assign_permission(:edit, Context)
+        user.assign_permission(:edit, context)
+        @permission.subject_contexts.length.should == 3
+        @permission.subject_contexts.each do |actxt|
+          ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+      
+      it "should return a de-duped array of only unique contexts" do
+        context = Context.create(:name => "Test Context")
+        user_one = User.create(:name => "Test User")
+        user_two = User.create(:name => "Other Test User")
+        user_one.assign_permission(:edit)
+        user_one.assign_permission(:edit, Context)
+        user_one.assign_permission(:edit, context)
+        user_two.assign_permission(:edit, Context)
+        user_two.assign_permission(:edit, context)
+        @permission.subject_contexts.length.should == 3
+        @permission.subject_contexts.each do |actxt|
+          ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+    end
+    
+    context "#assigned_contexts" do
+      it "should return an array of contexts within which the permission is assigned to roles and subjects" do
+        context = Context.create(:name => "Test Context")
+        user = User.create(:name => "Test User")
+        user.assign_permission(:edit)
+        user.assign_permission(:edit, Context)
+        user.assign_permission(:edit, Weapon)
+        user.assign_permission(:edit, context)
+        role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+        role.assign_permission(:edit)
+        role.assign_permission(:edit, Context)
+        role.assign_permission(:edit, context)
+        @permission.assigned_contexts.length.should == 4
+        @permission.assigned_contexts.each do |actxt|
+          ['global', 'Context', 'Weapon', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+      
+      it "should return a de-duped array of only unique contexts" do
+        context = Context.create(:name => "Test Context")
+        user_one = User.create(:name => "Test User")
+        user_two = User.create(:name => "Other Test User")
+        user_one.assign_permission(:edit)
+        user_one.assign_permission(:edit, Context)
+        user_one.assign_permission(:edit, context)
+        user_two.assign_permission(:edit, Context)
+        user_two.assign_permission(:edit, context)
+        admin = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+        mod = Role.create(:name => 'Moderator', :slug => 'moderator', :level => 100)
+        admin.assign_permission(:edit)
+        admin.assign_permission(:edit, Context)
+        admin.assign_permission(:edit, Weapon)
+        admin.assign_permission(:edit, context)
+        mod.assign_permission(:edit, Context)
+        mod.assign_permission(:edit, context)
+        @permission.assigned_contexts.length.should == 4
+        @permission.assigned_contexts.each do |actxt|
+          ['global', 'Context', 'Weapon', "Context(#{context.id})"].should include(actxt.type_s)
+        end
+      end
+    end
+  end
 end

data/spec/zuul/active_record/role_spec.rb

@@ -190,6 +190,41 @@ describe "Zuul::ActiveRecord::Role" do
       @role.context_id.should == context.id
     end
   end
+
+  context "#assigned_contexts" do
+    before(:each) do
+      User.acts_as_authorization_subject
+      Role.acts_as_authorization_role
+      @role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+    end
+
+    it "should return an array of contexts within which the role is assigned to subjects" do
+      context = Context.create(:name => "Test Context")
+      user = User.create(:name => "Test User")
+      user.assign_role(:admin)
+      user.assign_role(:admin, Context)
+      user.assign_role(:admin, context)
+      @role.assigned_contexts.length.should == 3
+      @role.assigned_contexts.each do |actxt|
+        ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+      end
+    end
+
+    it "should return a de-duped array of only unique contexts" do
+      context = Context.create(:name => "Test Context")
+      user_one = User.create(:name => "Test User")
+      user_two = User.create(:name => "Other Test User")
+      user_one.assign_role(:admin)
+      user_one.assign_role(:admin, Context)
+      user_one.assign_role(:admin, context)
+      user_two.assign_role(:admin, Context)
+      user_two.assign_role(:admin, context)
+      @role.assigned_contexts.length.should == 3
+      @role.assigned_contexts.each do |actxt|
+        ['global', 'Context', "Context(#{context.id})"].should include(actxt.type_s)
+      end
+    end
+  end
   
   context "with permissions disabled" do
     before(:each) do

data/spec/zuul/active_record_spec.rb

@@ -47,7 +47,7 @@ describe "Zuul::ActiveRecord" do
       Skill.auth_scope.subject_class.should == Soldier
       Skill.auth_scope.role_class.should == Rank
 
-      Weapon.acts_as_authorization_context :permission_class => Skill
+      Weapon.acts_as_authorization_context :subject_class => Soldier, :role_class => Rank, :permission_class => Skill
       Weapon.auth_scope.permission_class.should == Skill
     end
 
@@ -61,7 +61,7 @@ describe "Zuul::ActiveRecord" do
       Skill.acts_as_authorization_permission :subject_class => Soldier, :role_class => :Rank
       Skill.auth_scope.subject_class.should == Soldier
       Skill.auth_scope.role_class.should == Rank
-      Weapon.acts_as_authorization_context :permission_class => Skill
+      Weapon.acts_as_authorization_context :subject_class => "soldier", :role_class => :rank, :permission_class => Skill
       Weapon.auth_scope.permission_class.should == Skill
     end
 

data/spec/zuul/context_spec.rb

@@ -125,4 +125,19 @@ describe "Zuul::Context" do
       Zuul::Context.new('Context', obj.id).type.should == :instance
     end
   end
+  
+  describe "#type_s" do
+    it "should return 'global' for a nil context" do
+      Zuul::Context.new.type_s.should == 'global'
+    end
+
+    it "should return class name for a class context" do
+      Zuul::Context.new('Context', nil).type_s.should == 'Context'
+    end
+
+    it "should return class name and ID for an instance context" do
+      obj = Context.create(:name => "Test Context")
+      Zuul::Context.new('Context', obj.id).type_s.should == "Context(#{obj.id})"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuul
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Authorizaion and ACL for Activerecord and ActionController.