rolify 3.2.0 → 3.3.0

data/spec/rolify/shared_examples/shared_examples_for_add_role.rb

@@ -50,7 +50,7 @@ shared_examples_for "#add_role_examples" do |param_name, param_method|
       context "should not create another role" do
         it "if the role was already assigned to the user" do
           subject.add_role "warrior".send(param_method), Forum
-          expect { subject.add_role "warrior".send(param_method), Forum }.not_to change { subject.roles.size }
+          expect { subject.add_role "warrior".send(param_method), Forum }.not_to change { subject.roles.count }
         end
 
         it "if already existing in the database" do
@@ -62,7 +62,7 @@ shared_examples_for "#add_role_examples" do |param_name, param_method|
 
     context "with an instance scoped role", :scope => :instance do
       it "should add the role to the user" do
-        expect { subject.add_role "visitor".send(param_method), Forum.last }.to change { subject.roles.size }.by(1)
+        expect { subject.add_role "visitor".send(param_method), Forum.last }.to change { subject.roles.count }.by(1)
       end
 
       it "should create a role in the roles table" do

data/spec/rolify/shared_examples/shared_examples_for_callbacks.rb

@@ -12,7 +12,9 @@ shared_examples_for "Rolify.callbacks" do
   describe "rolify association callbacks", :if => (Rolify.orm == "active_record") do
     describe "before_add" do
       it "should receive callback" do
-        user_class.rolify :before_add => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :before_add => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.stub(:role_callback)
         @user.should_receive(:role_callback)
@@ -22,7 +24,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "after_add" do
       it "should receive callback" do
-        user_class.rolify :after_add => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :after_add => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.stub(:role_callback)
         @user.should_receive(:role_callback)
@@ -32,7 +36,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "before_remove" do
       it "should receive callback" do
-        user_class.rolify :before_remove => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :before_remove => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.add_role :admin
         @user.stub(:role_callback)
@@ -44,7 +50,9 @@ shared_examples_for "Rolify.callbacks" do
 
     describe "after_remove" do
       it "should receive callback" do
-        user_class.rolify :after_remove => :role_callback, :role_cname => role_class.to_s
+        rolify_options = { :role_cname => role_class.to_s, :after_remove => :role_callback }
+        rolify_options[:role_join_table_name] = join_table if defined? join_table
+        user_class.rolify rolify_options
         @user = user_class.first
         @user.add_role :admin
         @user.stub(:role_callback)

data/spec/rolify/shared_examples/shared_examples_for_dynamic.rb

@@ -1,10 +1,12 @@
-shared_examples_for Rolify::Dynamic do 
+shared_examples_for Rolify::Dynamic do
   before(:all) do
     Rolify.dynamic_shortcuts = true
     role_class.destroy_all
-    user_class.rolify :role_cname => role_class.to_s
-    Forum.resourcify :role_cname => role_class.to_s
-    Group.resourcify :role_cname => role_class.to_s
+    rolify_options = { :role_cname => role_class.to_s }
+    rolify_options[:role_join_table_name] = join_table if defined? join_table
+    user_class.rolify rolify_options
+    Forum.resourcify :roles, :role_cname => role_class.to_s
+    Group.resourcify :roles, :role_cname => role_class.to_s
   end
   
   context "using a global role" do
@@ -12,6 +14,7 @@ shared_examples_for Rolify::Dynamic do
       admin = user_class.first
       admin.add_role :admin
       admin.add_role :moderator, Forum.first
+      admin.add_role :solo
       admin
     end
 
@@ -22,12 +25,22 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_admin?.should be(true) }
     it { subject.is_admin?.should be(true) }
     it { subject.is_admin?.should be(true) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :solo
+      end
+      
+      it { should_not respond_to(:is_solo?) }
+      it { subject.is_solo?.should be(false) }
+    end
   end
   
   context "using a resource scoped role" do
     subject do 
       moderator = user_class.where(:login => "moderator").first
       moderator.add_role :moderator, Forum.first
+      moderator.add_role :sole_mio, Forum.last
       moderator
     end
     
@@ -44,12 +57,22 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_moderator_of?(Group).should be(false) }
     it { subject.is_moderator_of?(Group.first).should be(false) }
     it { subject.is_moderator_of?(Group.last).should be(false) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :sole_mio, Forum.last
+      end
+      
+      it { should_not respond_to(:is_sole_mio?) }
+      it { subject.is_sole_mio?.should be(false) }
+    end
   end
   
   context "using a class scoped role" do
     subject do 
       manager = user_class.where(:login => "god").first
       manager.add_role :manager, Forum
+      manager.add_role :only_me, Forum
       manager
     end
     
@@ -68,6 +91,15 @@ shared_examples_for Rolify::Dynamic do
     it { subject.is_manager_of?(Group).should be(false) }
     it { subject.is_manager_of?(Group.first).should be(false) }
     it { subject.is_manager_of?(Group.last).should be(false) }
+    
+    context "removing the role on the last user having it" do
+      before do
+        subject.remove_role :only_me, Forum
+      end
+      
+      it { should_not respond_to(:is_only_me?) }
+      it { subject.is_only_me?.should be(false) }
+    end
   end
   
   context "if the role doesn't exist in the database" do
@@ -85,6 +117,7 @@ shared_examples_for Rolify::Dynamic do
       it { should_not respond_to(:is_god?) }
       
       it { subject.is_superman?.should be(false) }
+      it { subject.is_god?.should be(false) }
     end
     
     context "using a resource scope role" do
@@ -105,6 +138,14 @@ shared_examples_for Rolify::Dynamic do
       it { subject.is_batman_of?(Group).should be(false) }
       it { subject.is_batman_of?(Group.first).should be(false) }
       it { subject.is_batman_of?(Group.last).should be(false) }
+      
+      it { subject.is_god?.should be(false) }
+      it { subject.is_god_of?(Forum).should be(false) }
+      it { subject.is_god_of?(Forum.first).should be(false) }
+      it { subject.is_god_of?(Forum.last).should be(false) }
+      it { subject.is_god_of?(Group).should be(false) }
+      it { subject.is_god_of?(Group.first).should be(false) }
+      it { subject.is_god_of?(Group.last).should be(false) }
     end
   end
 end

data/spec/rolify/shared_examples/shared_examples_for_has_any_role.rb

@@ -1,7 +1,7 @@
 shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
   context "using #{param_name} as parameter" do
     context "with a global role", :scope => :global do
-      before(:all) do
+      before do
         subject.add_role "staff".send(param_method)
       end
       
@@ -20,7 +20,7 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     end
     
     context "with a class scoped role", :scope => :class do
-      before(:all) do
+      before do
         subject.add_role "player".send(param_method), Forum
         subject.add_role "superhero".send(param_method)
       end
@@ -40,7 +40,7 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     end
     
     context "with a instance scoped role", :scope => :instance do
-      before(:all) do
+      before do
         subject.add_role "visitor".send(param_method), Forum.last
         subject.add_role "leader", Group
         subject.add_role "warrior"

data/spec/rolify/shared_examples/shared_examples_for_only_has_role.rb

@@ -36,7 +36,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
       
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_global_roles".send(param_method) }
+        before { subject.add_role "multiple_global_roles".send(param_method) }
         
         it { subject.only_has_role?("global_role".send(param_method)).should be_false }
       end
@@ -93,7 +93,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
       
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_class_roles".send(param_method) }
+        before { subject.add_role "multiple_class_roles".send(param_method) }
         
         it { subject.only_has_role?("class_role".send(param_method), Forum).should be_false }
         it { subject.only_has_role?("class_role".send(param_method), Forum.first).should be_false }
@@ -164,7 +164,7 @@ shared_examples_for "#only_has_role?_examples" do |param_name, param_method|
       end
     
       context "with multiple roles" do
-        before(:all) { subject.add_role "multiple_instance_roles".send(param_method), Forum.first }
+        before { subject.add_role "multiple_instance_roles".send(param_method), Forum.first }
         
         it { subject.only_has_role?("instance_role".send(param_method), Forum.first).should be_false }
         it { subject.only_has_role?("instance_role".send(param_method), :any).should be_false }

data/spec/rolify/shared_examples/shared_examples_for_remove_role.rb

@@ -3,55 +3,55 @@ shared_examples_for "#remove_role_examples" do |param_name, param_method|
     context "removing a global role", :scope => :global do
       context "being a global role of the user" do
         it { expect { subject.remove_role("admin".send(param_method)) }.to change { subject.roles.size }.by(-1) }
-        
-        it { subject.has_role?("admin".send(param_method)).should be_false }
-        it { subject.has_role?("staff".send(param_method)).should be_true }
-        it { subject.has_role?("manager".send(param_method), Group).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_true }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should_not have_role("admin".send(param_method)) }
+        it { should     have_role("staff".send(param_method)) }
+        it { should     have_role("manager".send(param_method), Group) }
+        it { should     have_role("moderator".send(param_method), Forum.last) }
+        it { should     have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
-      
+
       context "being a class scoped role to the user" do
         it { expect { subject.remove_role("manager".send(param_method)) }.to change { subject.roles.size }.by(-1) }
-        
-        it { subject.has_role?("admin".send(param_method)).should be_false }
-        it { subject.has_role?("staff".send(param_method)).should be_true }
-        it { subject.has_role?("manager".send(param_method), Group).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_true }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should_not have_role("admin".send(param_method)) }
+        it { should     have_role("staff".send(param_method)) }
+        it { should_not have_role("manager".send(param_method), Group) }
+        it { should     have_role("moderator".send(param_method), Forum.last) }
+        it { should     have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
-      
+
       context "being instance scoped roles to the user" do
         it { expect { subject.remove_role("moderator".send(param_method)) }.to change { subject.roles.size }.by(-2) }
-        
-        it { subject.has_role?("admin".send(param_method)).should be_false }
-        it { subject.has_role?("staff".send(param_method)).should be_true }
-        it { subject.has_role?("manager".send(param_method), Group).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_false }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should_not have_role("admin".send(param_method)) }
+        it { should     have_role("staff".send(param_method)) }
+        it { should_not have_role("manager".send(param_method), Group) }
+        it { should_not have_role("moderator".send(param_method), Forum.last) }
+        it { should_not have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
-      
+
       context "not being a role of the user" do
         it { expect { subject.remove_role("superhero".send(param_method)) }.not_to change { subject.roles.size } }
       end
-      
+
       context "used by another user" do
         before do
           user = user_class.last
           user.add_role "staff".send(param_method)
         end
-        
+
         it { expect { subject.remove_role("staff".send(param_method)) }.not_to change { role_class.count } }
-        
-        it { subject.has_role?("admin".send(param_method)).should be_false }
-        it { subject.has_role?("staff".send(param_method)).should be_false }
-        it { subject.has_role?("manager".send(param_method), Group).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_false }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should_not have_role("admin".send(param_method)) }
+        it { should_not have_role("staff".send(param_method)) }
+        it { should_not have_role("manager".send(param_method), Group) }
+        it { should_not have_role("moderator".send(param_method), Forum.last) }
+        it { should_not have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
 
       context "not used by anyone else" do
@@ -67,29 +67,29 @@ shared_examples_for "#remove_role_examples" do |param_name, param_method|
       context "being a global role of the user" do
         it { expect { subject.remove_role("warrior".send(param_method), Forum) }.not_to change{ subject.roles.size } }
       end
-      
+
       context "being a class scoped role to the user" do
         it { expect { subject.remove_role("manager".send(param_method), Forum) }.to change{ subject.roles.size }.by(-1) }
-        
-        it { subject.has_role?("warrior").should be_true }
-        it { subject.has_role?("manager", Forum).should be_false }
-        it { subject.has_role?("player", Forum).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_true }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should     have_role("warrior") }
+        it { should_not have_role("manager", Forum) }
+        it { should     have_role("player", Forum) }
+        it { should     have_role("moderator".send(param_method), Forum.last) }
+        it { should     have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
-      
+
       context "being instance scoped role to the user" do
         it { expect { subject.remove_role("moderator".send(param_method), Forum) }.to change { subject.roles.size }.by(-1) }
-        
-        it { subject.has_role?("warrior").should be_true }
-        it { subject.has_role?("manager", Forum).should be_false }
-        it { subject.has_role?("player", Forum).should be_true }
-        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_false }
-        it { subject.has_role?("moderator".send(param_method), Group.last).should be_true }
-        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+
+        it { should     have_role("warrior") }
+        it { should_not have_role("manager", Forum) }
+        it { should     have_role("player", Forum) }
+        it { should_not have_role("moderator".send(param_method), Forum.last) }
+        it { should     have_role("moderator".send(param_method), Group.last) }
+        it { should     have_role("anonymous".send(param_method), Forum.first) }
       end
-      
+
       context "not being a role of the user" do
         it { expect { subject.remove_role("manager".send(param_method), Group) }.not_to change { subject.roles.size } }
       end
@@ -99,23 +99,23 @@ shared_examples_for "#remove_role_examples" do |param_name, param_method|
       context "being a global role of the user" do
         it { expect { subject.remove_role("soldier".send(param_method), Group.first) }.not_to change { subject.roles.size } }
       end
-      
+
       context "being a class scoped role to the user" do
         it { expect { subject.remove_role("visitor".send(param_method), Forum.first) }.not_to change { subject.roles.size } }
       end
-      
+
       context "being instance scoped role to the user" do
         it { expect { subject.remove_role("moderator".send(param_method), Forum.first) }.to change { subject.roles.size }.by(-1) }
-        
-        it { subject.has_role?("soldier").should be_true }
-        it { subject.has_role?("visitor", Forum).should be_true }
-        it { subject.has_role?("moderator", Forum.first).should be_false }
-        it { subject.has_role?("anonymous", Forum.last).should be_true }
+
+        it { should     have_role("soldier") }
+        it { should     have_role("visitor", Forum) }
+        it { should_not have_role("moderator", Forum.first) }
+        it { should     have_role("anonymous", Forum.last) }
       end
-      
+
       context "not being a role of the user" do
         it { expect { subject.remove_role("anonymous".send(param_method), Forum.first) }.not_to change { subject.roles.size } }
       end
     end
   end
-end
+end

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -11,13 +11,15 @@ shared_examples_for Rolify::Role do
   before(:all) do
     reset_defaults
     Rolify.dynamic_shortcuts = false
-    user_class.rolify :role_cname => role_class.to_s
+    rolify_options = { :role_cname => role_class.to_s }
+    rolify_options[:role_join_table_name] = join_table if defined? join_table
+    user_class.rolify rolify_options
     role_class.destroy_all
-    Forum.resourcify :role_cname => role_class.to_s
-    Group.resourcify :role_cname => role_class.to_s
+    Forum.resourcify :roles, :role_cname => role_class.to_s
+    Group.resourcify :roles, :role_cname => role_class.to_s
   end
 
-  context "in the Instance level " do 
+  context "in the Instance level" do 
     before(:all) do
       admin = user_class.first
       admin.add_role :admin
@@ -82,7 +84,7 @@ shared_examples_for Rolify::Role do
   context "with a new instance" do
     let(:user) { user_class.new }
 
-    before(:all) do
+    before do
       user.add_role :admin
       user.add_role :moderator, Forum.first
     end

data/spec/rolify/shared_examples/shared_examples_for_scopes.rb

@@ -1,7 +1,7 @@
 require "rolify/shared_contexts"
 
-shared_examples_for "Role.scopes" do |param_name, param_method|
-  before(:all) do
+shared_examples_for "Role.scopes" do
+  before do
     role_class.destroy_all
   end
   
@@ -18,9 +18,9 @@ shared_examples_for "Role.scopes" do |param_name, param_method|
     let!(:manager_role) { subject.add_role :manager, Group }
     let!(:moderator_role) { subject.add_role :moderator, Forum }
     
-    it { subject.roles.class_scoped.should == [ manager_role, moderator_role ] }
-    it { subject.roles.class_scoped(Group).should == [ manager_role ] }
-    it { subject.roles.class_scoped(Forum).should == [ moderator_role ] }
+    it { subject.roles.class_scoped.should =~ [ manager_role, moderator_role ] }
+    it { subject.roles.class_scoped(Group).should =~ [ manager_role ] }
+    it { subject.roles.class_scoped(Forum).should =~ [ moderator_role ] }
   end
   
   describe ".instance_scoped" do
@@ -28,11 +28,11 @@ shared_examples_for "Role.scopes" do |param_name, param_method|
     let!(:zombie_role) { subject.add_role :visitor, Forum.last }
     let!(:anonymous_role) { subject.add_role :anonymous, Group.last }
     
-    it { subject.roles.instance_scoped.should == [ visitor_role, zombie_role, anonymous_role ] }
-    it { subject.roles.instance_scoped(Forum).should == [ visitor_role, zombie_role ] }
-    it { subject.roles.instance_scoped(Forum.first).should == [ visitor_role ] }
-    it { subject.roles.instance_scoped(Forum.last).should == [ zombie_role ] }
-    it { subject.roles.instance_scoped(Group.last).should == [ anonymous_role ] }
+    it { subject.roles.instance_scoped.to_a.entries.should =~ [ visitor_role, zombie_role, anonymous_role ] }
+    it { subject.roles.instance_scoped(Forum).should =~ [ visitor_role, zombie_role ] }
+    it { subject.roles.instance_scoped(Forum.first).should =~ [ visitor_role ] }
+    it { subject.roles.instance_scoped(Forum.last).should =~ [ zombie_role ] }
+    it { subject.roles.instance_scoped(Group.last).should =~ [ anonymous_role ] }
     it { subject.roles.instance_scoped(Group.first).should be_empty }
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,11 @@ require 'rubygems'
 require "bundler/setup"
 
 require 'rolify'
-require 'ammeter/init'
+require 'rolify/matchers'
+require 'rails/all'
+
+require 'coveralls'
+Coveralls.wear_merged!
 
 ENV['ADAPTER'] ||= 'active_record'
 
@@ -23,4 +27,4 @@ def provision_user(user, roles)
     end
   end
   user
-end
+end

data/spec/support/adapters/active_record.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.extend Rolify
 
 load File.dirname(__FILE__) + '/../schema.rb'
 
-# ActiveRecord models
+# Standard user and role classes
 class User < ActiveRecord::Base
   rolify
 end
@@ -14,18 +14,17 @@ end
 class Role < ActiveRecord::Base
   has_and_belongs_to_many :users, :join_table => :users_roles
   belongs_to :resource, :polymorphic => true
-  
-  extend Rolify::Adapter::Scopes
-end
 
-class Forum < ActiveRecord::Base
-  #resourcify done during specs setup to be able to use custom user classes
+  extend Rolify::Adapter::Scopes
 end
 
-class Group < ActiveRecord::Base
-  #resourcify done during specs setup to be able to use custom user classes
+# Resourcifed and rolifed at the same time
+class HumanResource < ActiveRecord::Base
+  resourcify :resources
+  rolify
 end
 
+# Custom role and class names
 class Customer < ActiveRecord::Base
   rolify :role_cname => "Privilege"
 end
@@ -33,6 +32,45 @@ end
 class Privilege < ActiveRecord::Base
   has_and_belongs_to_many :customers, :join_table => :customers_privileges
   belongs_to :resource, :polymorphic => true
-  
+
   extend Rolify::Adapter::Scopes
+end
+
+# Namespaced models
+module Admin
+  def self.table_name_prefix
+    'admin_'
+  end
+  
+  class Moderator < ActiveRecord::Base
+    rolify :role_cname => "Admin::Right", :role_join_table_name => "moderators_rights"
+  end
+
+  class Right < ActiveRecord::Base
+    has_and_belongs_to_many :moderators, :class_name => "Admin::Moderator", :join_table => "moderators_rights"
+    belongs_to :resource, :polymorphic => true
+
+    extend Rolify::Adapter::Scopes
+  end  
+end
+
+
+# Resources classes
+class Forum < ActiveRecord::Base
+  #resourcify done during specs setup to be able to use custom user classes
+end
+
+class Group < ActiveRecord::Base
+  #resourcify done during specs setup to be able to use custom user classes
+
+  def subgroups
+    Group.where(:parent_id => id)
+  end
+end
+
+class Team < ActiveRecord::Base
+  #resourcify done during specs setup to be able to use custom user classes
+  self.primary_key = "team_code"
+  
+  default_scope { order(:team_code) }
 end