rolify 3.2.0 → 3.3.0.rc1

data/spec/rolify/resourcifed_and_rolifed_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe "Resourcify and rolify on the same model" do
+  
+  before(:all) do
+    reset_defaults
+    Role.delete_all
+    HumanResource.delete_all
+  end
+  
+  let!(:user) { user = HumanResource.new login: 'Samer'; user.save; user }
+  
+  it "should add the role to the user" do
+    expect { user.add_role :admin }.to change { user.roles.count }.by(1)
+  end
+      
+  it "should create a role to the roles collection" do
+    expect { user.add_role :moderator }.to change { Role.count }.by(1)
+  end
+end

data/spec/rolify/shared_examples/shared_examples_for_dynamic.rb

@@ -3,8 +3,8 @@ shared_examples_for Rolify::Dynamic 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
+    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

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

@@ -13,8 +13,8 @@ shared_examples_for Rolify::Role do
     Rolify.dynamic_shortcuts = false
     user_class.rolify :role_cname => role_class.to_s
     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 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require "bundler/setup"
 
 require 'rolify'
+require 'rolify/matchers'
 require 'ammeter/init'
 
 ENV['ADAPTER'] ||= 'active_record'
@@ -23,4 +24,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,38 @@ 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"
+  end
+
+  class Right < ActiveRecord::Base
+    has_and_belongs_to_many :moderators, :class_name => "Admin::Moderator",:join_table => :admin_moderators_admin_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

data/spec/support/adapters/mongoid.rb

@@ -14,11 +14,11 @@ end
 
 Rolify.use_mongoid
 
-# Mongoid models
+# Standard user and role classes
 class User
   include Mongoid::Document
   rolify
-  
+
   field :login, :type => String
 end
 
@@ -26,9 +26,8 @@ class Role
   include Mongoid::Document
   has_and_belongs_to_many :users
   belongs_to :resource, :polymorphic => true
-  
+
   field :name, :type => String
-  index({ :name => 1 }, { :unique => true })
   index(
     {
       :name => 1,
@@ -37,28 +36,41 @@ class Role
     },
     { :unique => true }
   )
-  
+
   scopify
 end
 
-class Forum
+# Resourcifed and rolifed at the same time
+class HumanResource
   include Mongoid::Document
-  #resourcify done during specs setup to be able to use custom user classes
-  
-  field :name, :type => String
-end
+  resourcify :resources
+  rolify
 
-class Group
-  include Mongoid::Document
-  #resourcify done during specs setup to be able to use custom user classes
-  
-  field :name, :type => String
+  field :login, :type => String
 end
 
+#class Power
+#  include Mongoid::Document
+#  has_and_belongs_to_many :human_resources
+#  belongs_to :resource, :polymorphic => true
+#  scopify
+#
+#  field :name, :type => String
+#  index(
+#    {
+#      :name => 1,
+#      :resource_type => 1,
+#      :resource_id => 1
+#    },
+#    { :unique => true }
+#  )
+#end
+
+# Custom role and class names
 class Customer
   include Mongoid::Document
   rolify :role_cname => "Privilege"
-  
+
   field :login, :type => String
 end
 
@@ -66,9 +78,9 @@ class Privilege
   include Mongoid::Document
   has_and_belongs_to_many :customers
   belongs_to :resource, :polymorphic => true
-  
+  scopify
+
   field :name, :type => String
-  index({ :name => 1 }, { :unique => true })
   index(
     {
       :name => 1,
@@ -77,6 +89,51 @@ class Privilege
     },
     { :unique => true }
   )
-  
-  scopify
+end
+
+# Namespaced models
+module Admin
+  class Moderator
+    include Mongoid::Document
+    rolify :role_cname => "Admin::Right"
+
+    field :login, :type => String
+  end
+
+  class Right
+    include Mongoid::Document
+    has_and_belongs_to_many :moderators, :class_name => 'Admin::Moderator'
+    belongs_to :resource, :polymorphic => true
+    scopify
+
+    field :name, :type => String
+    index(
+      {
+        :name => 1,
+        :resource_type => 1,
+        :resource_id => 1
+      },
+      { :unique => true }
+    )
+  end
+end
+
+# Resources classes
+class Forum
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :name, :type => String
+end
+
+class Group
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :name, :type => String
+  field :parent_id, :type => Integer
+
+  def subgroups
+    Group.in(:parent_id => _id)
+  end
 end

data/spec/support/data.rb

@@ -1,20 +1,17 @@
-User.destroy_all
-Role.destroy_all
-Forum.destroy_all
-Group.destroy_all
-Privilege.destroy_all
-Customer.destroy_all
-
 # Users
-User.create(:login => "admin")
-User.create(:login => "moderator")
-User.create(:login => "god")
-User.create(:login => "zombie")
+[ User, Customer, Admin::Moderator ].each do |user|
+  user.destroy_all
+  
+  user.create(:login => "admin")
+  user.create(:login => "moderator")
+  user.create(:login => "god")
+  user.create(:login => "zombie")
+end
 
-Customer.create(:login => "admin")
-Customer.create(:login => "moderator")
-Customer.create(:login => "god")
-Customer.create(:login => "zombie")
+# Roles
+[ Role, Privilege, Admin::Right ].each do |role|
+  role.destroy_all
+end
 
 # Resources
 Forum.create(:name => "forum 1")