ktopping_acl9 0.12.0 → 0.13.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
+:major: 0
 :build: 
-:minor: 12
+:minor: 13
 :patch: 0
-:major: 0

data/lib/acl9/model_extensions/for_subject.rb

@@ -160,8 +160,9 @@ module Acl9
       def delete_role(role)
         if role
           self.role_objects.delete role
-
-          role.destroy if role.send(self._auth_subject_class_name.demodulize.tableize).empty?
+          if role.send(self._auth_subject_class_name.demodulize.tableize).empty?
+            role.destroy unless role.respond_to?(:system?) && role.system?
+          end
         end
       end
       

data/test/roles_test.rb

@@ -5,6 +5,21 @@ require 'support/models'
 #Logger = ActiveRecord::Base.logger
 load 'support/schema.rb'
 
+
+class SystemRolesTest < Test::Unit::TestCase
+  it "should not delete a system role" do
+    Role.destroy_all
+    @role=Role.create(:name=>"admin", :system=>true)
+    @role.system.should be_true
+    Role.count.should==1
+    @user = User.create!
+    @user.has_role!(:admin)
+    Role.count.should==1
+    @user.has_no_role!(:admin)
+    Role.count.should==1
+  end
+end
+
 class RolesTest < Test::Unit::TestCase
   before do
     Role.destroy_all
@@ -269,6 +284,7 @@ class RolesTest < Test::Unit::TestCase
   end
 end
 
+
 class RolesWithCustomClassNamesTest < Test::Unit::TestCase
   before do
     AnotherRole.destroy_all
@@ -352,4 +368,3 @@ class UsersRolesAndSubjectsWithNamespacedClassNamesTest < Test::Unit::TestCase
     @user2.has_no_roles!
   end
 end
-

data/test/support/schema.rb

@@ -1,6 +1,7 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table "roles", :force => true do |t|
     t.string   "name",              :limit => 40
+    t.boolean "system", :default=>false
     t.string   "authorizable_type", :limit => 40
     t.string  "authorizable_id"
     t.datetime "created_at"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - oleg dashevskii