zuul 0.2.3 → 0.2.4

data/lib/zuul/active_record/context.rb

@@ -9,7 +9,11 @@ module Zuul
       module ClassMethods
         def self.extended(base)
           base.send :extend, RoleMethods
-          base.send :extend, PermissionMethods if base.auth_scope.config.with_permissions
+          base.send :before_destroy, :destroy_zuul_roles
+          if base.auth_scope.config.with_permissions
+            base.send :extend, PermissionMethods
+            base.send :before_destroy, :destroy_zuul_permissions
+          end
         end
       end
 
@@ -25,6 +29,13 @@ module Zuul
         def allowed?(subject, role)
           subject.has_role?(role, self)
         end
+
+        def destroy_zuul_roles
+          auth_scopes.each do |name,scope|
+            scope.role_class.where(:context_type => self.class.name, :context_id => self.id).each(&:destroy)
+            scope.role_subject_class.where(:context_type => self.class.name, :context_id => self.id).each(&:destroy)
+          end
+        end
       end
 
       module PermissionMethods
@@ -32,6 +43,14 @@ module Zuul
         def allowed_to?(subject, permission)
           subject.has_permission?(permission, self)
         end
+
+        def destroy_zuul_permissions
+          auth_scopes.each do |name,scope|
+            scope.permission_class.where(:context_type => self.class.name, :context_id => self.id).each(&:destroy)
+            scope.permission_role_class.where(:context_type => self.class.name, :context_id => self.id).each(&:destroy)
+            scope.permission_subject_class.where(:context_type => self.class.name, :context_id => self.id).each(&:destroy)
+          end
+        end
       end
     end
   end

data/lib/zuul/active_record/permission.rb

@@ -21,9 +21,9 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym
+          base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym, :dependent => :destroy
           base.send :has_many, base.auth_scope.roles_table_name.to_sym, :through => base.auth_scope.permission_roles_table_name.to_sym
-          base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym
+          base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym, :dependent => :destroy
           base.send :has_many, base.auth_scope.subjects_table_name.to_sym, :through => base.auth_scope.permission_subjects_table_name.to_sym
         end
       end

data/lib/zuul/active_record/role.rb

@@ -24,10 +24,10 @@ module Zuul
         end
 
         def self.add_associations(base)
-          base.send :has_many, base.auth_scope.role_subjects_table_name.to_sym
+          base.send :has_many, base.auth_scope.role_subjects_table_name.to_sym, :dependent => :destroy
           base.send :has_many, base.auth_scope.subjects_table_name.to_sym, :through => base.auth_scope.role_subjects_table_name.to_sym
           if base.auth_scope.config.with_permissions
-            base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym
+            base.send :has_many, base.auth_scope.permission_roles_table_name.to_sym, :dependent => :destroy
             base.send :has_many, base.auth_scope.permissions_table_name.to_sym, :through => base.auth_scope.permission_roles_table_name.to_sym
           end
         end

data/lib/zuul/active_record/subject.rb

@@ -14,7 +14,7 @@ module Zuul
 
         module ClassMethods
           def self.extended(base)
-            base.send :has_many, base.auth_scope.role_subjects_table_name.to_sym
+            base.send :has_many, base.auth_scope.role_subjects_table_name.to_sym, :dependent => :destroy
             base.send :has_many, base.auth_scope.roles_table_name.to_sym, :through => base.auth_scope.role_subjects_table_name.to_sym
           end
         end
@@ -137,7 +137,7 @@ module Zuul
 
         module ClassMethods
           def self.extended(base)
-            base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym
+            base.send :has_many, base.auth_scope.permission_subjects_table_name.to_sym, :dependent => :destroy
             base.send :has_many, base.auth_scope.permissions_table_name.to_sym, :through => base.auth_scope.permission_subjects_table_name.to_sym
           end
         end

data/lib/zuul/version.rb

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

data/spec/zuul/active_record/context_spec.rb

@@ -52,4 +52,48 @@ describe "Zuul::ActiveRecord::Context" do
       context.allowed_to?(user, permission).should == user.has_permission?(permission, context)
     end
   end
+
+  describe "destroy_zuul_roles" do
+    it "should destroy all role_subjects and roles that use this context" do
+      context = Context.create(:name => 'Test Context')
+      user = User.create(:name => 'Tester')
+      role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+      ctxtrole = Role.create(:name => 'Context Admin', :slug => 'ctxtadmin', :level => 100, :context => context)
+      user.assign_role(:admin, context)
+      user.assign_role(:ctxtadmin, context)
+      Role.count.should == 2
+      RoleUser.where(:context_type => context.class.name, :context_id => context.id).count.should == 2
+      context.destroy
+      Role.count.should == 1
+      RoleUser.where(:context_type => context.class.name, :context_id => context.id).count.should == 0
+    end
+  end
+
+  describe "destroy_zuul_permissions" do
+    it "should not be available if permissions are disabled" do
+      Weapon.acts_as_authorization_context :with_permissions => false
+      Weapon.new.should_not respond_to(:destroy_zuul_permissions)
+    end
+    
+    it "should destroy all permission_subjects, permission_roles and permissions that use this context" do
+      context = Context.create(:name => 'Test Context')
+      user = User.create(:name => 'Tester')
+      role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+      perm = Permission.create(:name => 'Edit', :slug => 'edit')
+      ctxtperm = Permission.create(:name => 'Context Edit', :slug => 'ctxtedit', :context => context)
+      user.assign_permission(:edit, context)
+      user.assign_permission(:ctxtedit, context)
+      role.assign_permission(:edit, context)
+      
+      Permission.count.should == 2
+      Permission.where(:context_type => context.class.name, :context_id => context.id).count.should == 1
+      PermissionRole.where(:context_type => context.class.name, :context_id => context.id).count.should == 1
+      PermissionUser.where(:context_type => context.class.name, :context_id => context.id).count.should == 2
+      context.destroy
+      Permission.count.should == 1
+      Permission.where(:context_type => context.class.name, :context_id => context.id).count.should == 0
+      PermissionRole.where(:context_type => context.class.name, :context_id => context.id).count.should == 0
+      PermissionUser.where(:context_type => context.class.name, :context_id => context.id).count.should == 0
+    end
+  end
 end

data/spec/zuul/active_record/permission_spec.rb

@@ -87,6 +87,17 @@ describe "Zuul::ActiveRecord::Permission" do
     permission.should respond_to(:users)
   end
   
+  it "should use :dependent => :destroy for the permission_subjects association" do
+    Permission.acts_as_authorization_permission
+    User.acts_as_authorization_subject
+    permission = Permission.create(:name => 'Edit', :slug => 'edit')
+    user = User.create(:name => 'Tester')
+    user.assign_permission(:edit)
+    PermissionUser.count.should == 1
+    permission.destroy
+    PermissionUser.count.should == 0
+  end
+  
   it "should use the reflection classes to create the has_many associations" do
     Skill.acts_as_authorization_permission :subject_class => :soldier, :role_class => :rank
     Skill.reflections.keys.should include(:skill_soldiers)
@@ -104,6 +115,17 @@ describe "Zuul::ActiveRecord::Permission" do
     permission.should respond_to(:permission_roles)
     permission.should respond_to(:roles)
   end
+    
+  it "should use :dependent => :destroy for the permission_roles association" do
+    Permission.acts_as_authorization_permission
+    Role.acts_as_authorization_role
+    permission = Permission.create(:name => 'Edit', :slug => 'edit')
+    role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+    role.assign_permission(:edit)
+    PermissionRole.count.should == 1
+    permission.destroy
+    PermissionRole.count.should == 0
+  end
   
   it "should use the reflection classes to create the has_many associations" do
     Skill.acts_as_authorization_permission :subject_class => :soldier, :role_class => :rank

data/spec/zuul/active_record/role_spec.rb

@@ -123,6 +123,17 @@ describe "Zuul::ActiveRecord::Role" do
     role.should respond_to(:role_users)
     role.should respond_to(:users)
   end
+
+  it "should use :dependent => :destroy for the role_subjects association" do
+    User.acts_as_authorization_subject
+    Role.acts_as_authorization_role
+    user = User.create(:name => 'Tester')
+    role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+    user.assign_role(:admin)
+    RoleUser.count.should == 1
+    role.destroy
+    RoleUser.count.should == 0
+  end
   
   it "should use the reflection classes to create the has_many associations" do
     Rank.acts_as_authorization_role :subject_class => :soldier, :with_permissions => false
@@ -262,6 +273,15 @@ describe "Zuul::ActiveRecord::Role" do
       role.should respond_to(:permission_roles)
       role.should respond_to(:permissions)
     end
+
+    it "should use :dependent => :destroy for the permission_roles association" do
+      permission = Permission.create(:name => 'Edit', :slug => 'edit')
+      role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+      role.assign_permission(:edit)
+      PermissionRole.count.should == 1
+      role.destroy
+      PermissionRole.count.should == 0
+    end
     
     it "should use the reflection classes to create the has_many associations" do
       Rank.acts_as_authorization_role :subject_class => :soldier, :permission_class => :skill

data/spec/zuul/active_record/subject_spec.rb

@@ -29,6 +29,15 @@ describe "Zuul::ActiveRecord::Subject" do
       user.should respond_to(:role_users)
       user.should respond_to(:roles)
     end
+  
+    it "should use :dependent => :destroy for the role_subjects association" do
+      user = User.create(:name => 'Tester')
+      role = Role.create(:name => 'Admin', :slug => 'admin', :level => 100)
+      user.assign_role(:admin)
+      RoleUser.count.should == 1
+      user.destroy
+      RoleUser.count.should == 0
+    end
 
     it "should use the reflection classes to create the has_many associations" do
       Soldier.acts_as_authorization_subject :role_class => :rank, :with_permissions => false
@@ -717,6 +726,15 @@ describe "Zuul::ActiveRecord::Subject" do
       user.should respond_to(:permission_users)
       user.should respond_to(:permissions)
     end
+  
+    it "should use :dependent => :destroy for the permission_subjects association" do
+      permission = Permission.create(:name => 'Edit', :slug => 'edit')
+      user = User.create(:name => 'Tester')
+      user.assign_permission(:edit)
+      PermissionUser.count.should == 1
+      user.destroy
+      PermissionUser.count.should == 0
+    end
 
     it "should use the reflection classes to create the has_many associations" do
       Soldier.acts_as_authorization_subject :permission_class => :skill, :role_class => :rank

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuul
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport