@@ -35,7 +35,7 @@ module Acl9 join_table = options[:join_table_name] || Acl9::config[:default_join_table_name] || join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(role)) - has_and_belongs_to_many :roles, :class_name => role, :join_table => join_table + has_and_belongs_to_many :acl9_roles, :class_name => role, :join_table => join_table cattr_accessor :_auth_role_class_name self._auth_role_class_name = role @@ -121,8 +121,8 @@ module Acl9 join_table = options[:join_table_name] || Acl9::config[:default_join_table_name] || join_table_name(undecorated_table_name(self.to_s), undecorated_table_name(subject)) - has_and_belongs_to_many subject.demodulize.tableize.to_sym, - :class_name => subject, + has_and_belongs_to_many subject.demodulize.tableize.to_sym, + :class_name => subject, :join_table => join_table belongs_to :authorizable, :polymorphic => true lib/acl9/model_extensions.rb @@ -11,11 +11,11 @@ module Acl9 # @see Acl9::ModelExtensions::Object#accepts_role? def has_role?(role_name, object = nil) !! if object.nil? - self.roles.find_by_name(role_name.to_s) || - self.roles.member?(get_role(role_name, nil)) + self.acl9_roles.find_by_name(role_name.to_s) || + self.acl9_roles.member?(get_role(role_name, nil)) else role = get_role(role_name, object) - role && self.roles.exists?(role.id) + role && self.acl9_roles.exists?(role.id) end end @@ -35,10 +35,10 @@ module Acl9 else { :authorizable => object } end.merge( { :name => role_name.to_s }) - role = self._auth_role_class.create(role_attrs) + role = self._auth_role_class.create(role_attrs) end - self.roles << role if role && !self.roles.exists?( role.id ) + self.acl9_roles << role if role && !self.acl9_roles.exists?(role.id) end ## @@ -58,7 +58,7 @@ module Acl9 # @return [Boolean] Returns true if +self+ has any roles on +object+. # @see Acl9::ModelExtensions::Object#accepts_roles_by? def has_roles_for?(object) - !!self.roles.detect(&role_selecting_lambda(object)) + !!self.acl9_roles.detect(&role_selecting_lambda(object)) end alias :has_role_for? :has_roles_for? @@ -75,7 +75,7 @@ module Acl9 # # user.roles_for(product).map(&:name).sort #=> role names in alphabetical order def roles_for(object) - self.roles.select(&role_selecting_lambda(object)) + self.acl9_roles.select(&role_selecting_lambda(object)) end ## @@ -89,12 +89,12 @@ module Acl9 ## # Unassign all roles from +self+. def has_no_roles! - # for some reason simple + # for some reason simple # # self.roles.each { |role| delete_role(role) } # # doesn't work. seems like a bug in ActiveRecord - self.roles.map(&:id).each do |role_id| + self.acl9_roles.map(&:id).each do |role_id| delete_role self._auth_role_class.find(role_id) end end @@ -108,8 +108,8 @@ module Acl9 when nil lambda { |role| role.authorizable.nil? } else - lambda do |role| - role.authorizable_type == object.class.base_class.to_s && role.authorizable == object + lambda do |role| + role.authorizable_type == object.class.base_class.to_s && role.authorizable == object end end end @@ -123,18 +123,18 @@ module Acl9 when nil [ 'name = ? and authorizable_type IS NULL and authorizable_id IS NULL', role_name ] else - [ + [ 'name = ? and authorizable_type = ? and authorizable_id = ?', - role_name, object.class.base_class.to_s, object.id + role_name, object.class.base_class.to_s, object.id ] end self._auth_role_class.first :conditions => cond end - def delete_role(role) + def delete_role(role) if role - self.roles.delete role + self.acl9_roles.delete role role.destroy if role.send(self.class.to_s.demodulize.tableize).empty? end lib/acl9/model_extensions/subject.rb @@ -111,7 +111,7 @@ class RolesTest < Test::Unit::TestCase @user.has_role!('owner', @bar) @user2.has_role!('owner', @bar) - @user.roles.should == @user2.roles + @user.acl9_roles.should == @user2.acl9_roles end it "#has_no_role! should unassign a global role from user" do @@ -119,7 +119,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_role!('3133t') - end.should change { @user.roles.count }.by(-1) + end.should change { @user.acl9_roles.count }.by(-1) @user.has_role?('3133t').should be_false end @@ -129,7 +129,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_role!('manager', @foo) - end.should change { @user.roles.count }.by(-1) + end.should change { @user.acl9_roles.count }.by(-1) @user.has_role?('manager', @foo).should be_false @user.has_role?('user', @foo).should be_true # another role on the same object @@ -140,7 +140,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_role!('admin', Foo) - end.should change { @user.roles.count }.by(-1) + end.should change { @user.acl9_roles.count }.by(-1) @user.has_role?('admin', Foo).should be_false @user.has_role?('admin').should be_true # global role @@ -151,7 +151,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_roles_for! - end.should change { @user.roles.count }.by(-4) + end.should change { @user.acl9_roles.count }.by(-4) @user.has_role?('admin').should be_false @user.has_role?('3133t').should be_false @@ -164,7 +164,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_roles_for! @foo - end.should change { @user.roles.count }.by(-2) + end.should change { @user.acl9_roles.count }.by(-2) @user.has_role?('user', @foo).should be_false @user.has_role?('manager', @foo).should be_false @@ -175,7 +175,7 @@ class RolesTest < Test::Unit::TestCase lambda do @user.has_no_roles_for! Foo - end.should change { @user.roles.count }.by(-4) + end.should change { @user.acl9_roles.count }.by(-4) @user.has_role?('admin', Foo).should be_false @user.has_role?('manager', Foo).should be_false @@ -187,7 +187,7 @@ class RolesTest < Test::Unit::TestCase set_some_roles @user.has_no_roles! - @user.roles.count.should == 0 + @user.acl9_roles.count.should == 0 end it "should delete unused roles from table" do test/roles_test.rb 00f30940fa98fe138a68f8a793679f297fb0bd80 oleg dashevskii be9@be9.ru http://github.com/be9/acl9/commit/c295b54adf1d3ae23659cea932193ee157f65649 c295b54adf1d3ae23659cea932193ee157f65649 2009-07-08T12:06:28-07:00 2009-07-08T12:06:28-07:00 Auth. subject: rename roles association to role_objects b6f39564ccb7d21e4b8ba31c265a9a499773614a oleg dashevskii be9@be9.ru