rolify 1.2.0 → 2.0.0

data/.gitignore

@@ -2,3 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
+tmp/*
+logs/*
+.rbx/*

data/.travis.yml

@@ -1,9 +1,8 @@
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3
   - ruby-head
-  - rbx-19mode
+  - rbx
   - jruby
-
-env:
-  - JRUBY_OPTS="--1.9"
+  - ree

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+= 2.0 (Nov 10, 2011)
+* improved performance of <tt>has_all_roles?</tt> method using one single DB query instead of doing one DB lookup per argument
+  * significant speed-up when requesting with many arguments
+  * database choice can mitigate the results
+* clean up the initializer code
+  * using a DSL to configure the library
+  * setting defaults for User and Role classes
+  * dynamic shortcuts feature is now <b>disabled</b> by default. To turn it on:
+    * set it to true in the initializer file
+    * uncomment the <tt>extend Rolify::Dynamic</tt> line in the User class
+  * detecting if it's loaded by Rails::Server or Rails::Console
+* now also running on Rubinius, JRuby, REE and Ruby 1.8. all specs pass successfully, yeah !
+
 = 1.2 (Nov 4, 2011)
 * fixed a strange bug, probably rails related (thanks to @scottkf)
   * when using rails in development mode, the <tt>config.cache_classes = false</tt> makes the role class to be loaded at every call and can lead to a <tt>AssociationTypeMismatch</tt>

data/README.rdoc

@@ -1,4 +1,5 @@
 = rolify {<img src="https://secure.travis-ci.org/EppO/rolify.png?branch=master">}[http://travis-ci.org/EppO/rolify]
+
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
 Let's see an example:  
@@ -12,7 +13,7 @@ This library was intended to be used with CanCan[https://github.com/ryanb/cancan
 
 * >= Rails 3.1
 * ActiveRecord ORM
-* ruby 1.9 (JRuby and Rubinius support on going)
+* supports ruby 1.8/1.9, REE, JRuby and Rubinius
 
 == Installation
 

data/benchmarks/performance.rb

@@ -0,0 +1,51 @@
+require 'bundler/setup'
+
+Bundler.require(:default, :test)
+require 'rolify'
+require 'benchmark'
+
+require './spec/spec_helper'
+
+def seed_roles(n, resources)
+  resource = resources[rand(resources.count)]
+  resource_type = resource.is_a?(Class) ? resource.to_s : resource.class.to_s if resource
+  resource_id = resource.is_a?(Class) ? nil : resource.id if resource
+  n.times { Role.create(:name => "role_#{rand(9999999)}", :resource_type => resource_type, :resource_id => resource_id) }
+end
+
+def bench_it(user, n, roles)
+  Benchmark.bmbm do |x| 
+    requested_roles = []
+    2.times { requested_roles += roles  }
+    puts "requesting ##{requested_roles.count} roles in #{Role.count} total roles"
+    x.report("v1.x") { 
+      n.times { user.has_all_roles? *requested_roles } 
+    }
+    x.report("v2.0") { 
+      n.times { user.has_all_roles_v2? *requested_roles } 
+    }
+  end
+end
+
+n = 1000
+user = User.first
+user.has_role "admin"
+user.has_role "moderator", Forum.first
+user.has_role "manager", Group
+resources = [ nil, Forum, Forum.first, Forum.last, Group, Group.first, Group.last, nil ]
+roles = [ "admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Group } ]
+
+seed_roles(2, resources)
+bench_it(user, n, roles)
+
+seed_roles(15, resources)
+bench_it(user, n, roles)
+
+seed_roles(80, resources)
+bench_it(user, n, roles)
+
+seed_roles(900, resources)
+bench_it(user, n, roles)
+
+seed_roles(9000, resources)
+bench_it(user, n, roles)

data/lib/generators/rolify/role/role_generator.rb

@@ -8,7 +8,7 @@ module Rolify
       source_root File.expand_path('../templates', __FILE__)
       argument :role_cname, :type => :string, :default => "Role"
       argument :user_cname, :type => :string, :default => "User"
-      class_option :dynamic_shortcuts, :type => :boolean, :default => true
+      class_option :dynamic_shortcuts, :type => :boolean, :default => false
 
       desc "Generates a model with the given NAME and a migration file."
 
@@ -16,7 +16,7 @@ module Rolify
         template "role.rb", "app/models/#{role_cname.downcase}.rb"
         inject_into_class(model_path, user_cname.camelize) do
           "  include Rolify::Roles\n" + 
-          "#{"  extend Rolify::Reloaded\n" if options[:dynamic_shortcuts]}" + 
+          "  #{'# ' if !options[:dynamic_shortcuts]}extend Rolify::Dynamic\n" + 
           "  has_and_belongs_to_many :roles#{", :class_name => \"" + role_cname.camelize + "\"" if role_cname != "Role"}, :join_table => :#{user_cname.tableize + "_" + role_cname.tableize}\n"
         end
       end

data/lib/generators/rolify/role/templates/initializer.rb

@@ -1,3 +1,8 @@
-Rolify.user_cname = <%= user_cname.camelize %>
-Rolify.role_cname = <%= role_cname.camelize %>
-Rolify.dynamic_shortcuts = <%= options[:dynamic_shortcuts].to_s %> if ARGV[0] != "db:migrate"
+Rolify.configure do |c|
+  # User class to put the roles association. Default is: "User"
+  <%= "# " if user_cname == "User" %>c.user_cname = "<%= user_cname %>"
+  # Role class provided by Rolify. Default is: "Role"
+  <%= "# " if role_cname == "Role" %>c.role_cname = "<%= role_cname %>"
+  # Dynamic shortcuts for Role class (user.is_admin? like methods). Default is: false
+  <%= "# " if !options[:dynamic_shortcuts] %>c.dynamic_shortcuts = <%= options[:dynamic_shortcuts] == true ? true : false %> if defined?(Rails::Server) == true || defined?(Rails::Console) == true
+end

data/lib/rolify/role.rb

@@ -1,19 +1,26 @@
 module Rolify
+  @@role_cname = "Role"
+  @@user_cname = "User"
+  @@dynamic_shortcuts = false
+  
+  def self.configure
+    yield self if block_given?
+  end
 
   def self.role_cname
-    @@role_cname
+    @@role_cname.constantize
   end
 
   def self.role_cname=(role_cname)
-    @@role_cname = role_cname
+    @@role_cname = role_cname.camelize
   end
 
   def self.user_cname
-    @@user_cname
+    @@user_cname.constantize
   end
 
   def self.user_cname=(user_cname)
-    @@user_cname = user_cname
+    @@user_cname = user_cname.camelize
   end
 
   def self.dynamic_shortcuts
@@ -22,7 +29,7 @@ module Rolify
 
   def self.dynamic_shortcuts=(is_dynamic)
     @@dynamic_shortcuts = is_dynamic
-    Rolify.user_cname.load_dynamic_methods if is_dynamic
+    self.user_cname.load_dynamic_methods if is_dynamic
   end
 
   module Roles
@@ -39,20 +46,12 @@ module Rolify
   
     def has_role?(role_name, resource = nil)
       query, values = build_query(role_name, resource)
-      self.roles.where(*query, *values).size > 0
+      self.roles.where(query, *values).size > 0
     end
 
     def has_all_roles?(*args)
-      args.each do |arg|
-        if arg.is_a? Hash
-          return false if !self.has_role?(arg[:name], arg[:resource])
-        elsif arg.is_a? String
-          return false if !self.has_role?(arg)
-        else
-          raise ArgumentError, "Invalid argument type: only hash or string allowed"
-        end
-      end
-      true
+      conditions, values, count = sql_conditions(args, true)
+      self.roles.where([ conditions.join(' OR '), *values ]).where(count.join(') AND (')).size > 0
     end
 
     def has_any_role?(*args)
@@ -61,7 +60,7 @@ module Rolify
     end
   
     def has_no_role(role_name, resource = nil)
-      role = self.roles.where( :name => role_name)
+      role = self.roles.where(:name => role_name)
       role = role.where(:resource_type => (resource.is_a?(Class) ? resource.to_s : resource.class.name)) if resource
       role = role.where(:resource_id => resource.id) if resource && !resource.is_a?(Class)
       self.roles.delete(role) if role
@@ -84,8 +83,9 @@ module Rolify
  
     private
  
-    def sql_conditions(args)
+    def sql_conditions(args, count = false)
       conditions = []
+      count_conditions = [] if count
       values = []
       args.each do |arg|
         if arg.is_a? Hash
@@ -96,13 +96,14 @@ module Rolify
           raise ArgumentError, "Invalid argument type: only hash or string allowed"
         end
         conditions << a
+        count_conditions << self.roles.where(a, *v).select("COUNT(id)").to_sql + " > 0" if count
         values += v
       end
-      [ conditions, values ]
+      count ? [ conditions, values, count_conditions ] : [ conditions, values ]
     end
 
     def build_query(role, resource = nil)
-      return [ "name = ?", role] if resource == :any
+      return [ "name = ?", [ role ] ] if resource == :any
       query = "((name = ?) AND (resource_type IS NULL) AND (resource_id IS NULL))"
       values = [ role ]
       if resource
@@ -115,12 +116,12 @@ module Rolify
         end
         query += ")"
       end
-      [ [ query ], values]
+      [ query, values ]
     end
 
   end
 
-  module Reloaded
+  module Dynamic
  
     def load_dynamic_methods
       Rolify.role_cname.all.each do |r|
@@ -128,12 +129,11 @@ module Rolify
       end
     end
 
-
     def define_dynamic_method(role_name, resource)
       class_eval do 
         define_method("is_#{role_name}?".to_sym) do
         has_role?("#{role_name}")
-        end if !method_defined? "is_#{role_name}?".to_sym
+        end if !method_defined?("is_#{role_name}?".to_sym)
   
         define_method("is_#{role_name}_of?".to_sym) do |arg|
           has_role?("#{role_name}", arg)

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/rolify.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   
   s.add_dependency "activerecord", ">= 3.1.0"
   
-  if RUBY_ENGINE == "jruby"
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
   else
     s.add_development_dependency "sqlite3"

data/spec/generators/rolify/role/role_generator_spec.rb

@@ -25,15 +25,15 @@ describe Rolify::Generators::RoleGenerator do
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
       it { should exist }
-      it { should contain "Rolify.user_cname = User" }
-      it { should contain "Rolify.role_cname = Role" }
-      it { should contain "Rolify.dynamic_shortcuts = true" }
+      it { should contain "c.user_cname = \"User\"" }
+      it { should contain "c.role_cname = \"Role\"" }
+      it { should contain "c.dynamic_shortcuts = false" }
     end
     
     describe 'app/models/user.rb' do
       subject { file('app/models/user.rb') }
       it { should contain "include Rolify::Roles" }
-      it { should contain "extend Rolify::Reloaded" }
+      it { should contain "# extend Rolify::Dynamic" }
       it { should contain "has_and_belongs_to_many :roles, :join_table => :users_roles" }
     end
     
@@ -60,15 +60,15 @@ describe Rolify::Generators::RoleGenerator do
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
       it { should exist }
-      it { should contain "Rolify.user_cname = Client" }
-      it { should contain "Rolify.role_cname = Rank" }
-      it { should contain "Rolify.dynamic_shortcuts = true" }
+      it { should contain "c.user_cname = \"Client\"" }
+      it { should contain "c.role_cname = \"Rank\"" }
+      it { should contain "c.dynamic_shortcuts = false" }
     end
     
     describe 'app/models/client.rb' do
       subject { file('app/models/client.rb') }
       it { should contain "include Rolify::Roles" }
-      it { should contain "extend Rolify::Reloaded" }
+      it { should contain "# extend Rolify::Dynamic" }
       it { should contain "has_and_belongs_to_many :roles, :class_name => \"Rank\", :join_table => :clients_ranks" }
     end
     
@@ -81,8 +81,8 @@ describe Rolify::Generators::RoleGenerator do
     end
   end
   
-  describe 'specifying no dynamic shortcuts' do
-    before(:all) { arguments [ "Role", "User", "--no-dynamic_shortcuts" ] }
+  describe 'specifying dynamic shortcuts' do
+    before(:all) { arguments [ "Role", "User", "--dynamic_shortcuts" ] }
     
     before { 
       capture(:stdout) {
@@ -96,13 +96,13 @@ describe Rolify::Generators::RoleGenerator do
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
       it { should exist }
-      it { should contain "Rolify.dynamic_shortcuts = false" }
+      it { should contain "c.dynamic_shortcuts = true" }
     end
     
     describe 'app/models/user.rb' do
       subject { file('app/models/user.rb') }
       it { should contain "include Rolify::Roles" }
-      it { should_not contain "extend Rolify::Reloaded" }
+      it { should contain "extend Rolify::Dynamic" }
       it { should contain "has_and_belongs_to_many :roles, :join_table => :users_roles" }
     end
     

data/spec/rolify/role_spec.rb

@@ -50,9 +50,10 @@ shared_examples_for "Rolify module" do |dynamic|
     end
 
     it "should create a new dynamic method if role exists in database", :if => dynamic do 
-      Rolify.role_cname.create(:name => "superman")
+      other_guy = Rolify.user_cname.last
+      other_guy.has_role "superman"
       @admin.should respond_to(:is_superman?).with(0).arguments
-      Rolify.role_cname.create(:name => "batman", :resource => Forum.first)
+      other_guy.has_role("batman", Forum.first)
       @admin.should respond_to(:is_batman_of?).with(1).arguments
       @admin.should respond_to(:is_batman?).with(0).arguments
     end
@@ -91,7 +92,6 @@ shared_examples_for "Rolify module" do |dynamic|
 
     it "should be able to use dynamic shortcut", :if => dynamic do
       @admin.is_admin?.should be(true)
-      @admin.is_evil?.should be(false)
     end
 
     it "should get any resource request" do
@@ -124,6 +124,12 @@ shared_examples_for "Rolify module" do |dynamic|
       @admin.has_all_roles?("admin", "staff").should be(true)
       @admin.has_all_roles?("admin", "dummy").should be(false)
       @admin.has_all_roles?("dummy", "dumber").should be(false)
+      @admin.has_all_roles?({ :name => "admin", :resource => Forum }, { :name => "admin", :resource => Group }).should be(true)
+      @admin.has_all_roles?({ :name => "admin", :resource => :any }, { :name => "admin", :resource => Group }).should be(true)
+      @admin.has_all_roles?({ :name => "admin", :resource => Forum }, { :name => "staff", :resource => Group.last }).should be(true)
+      @admin.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "admin", :resource => Forum.last }).should be(true)
+      @admin.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "dummy", :resource => Forum.last }).should be(false)
+      @admin.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "dummy", :resource => :any }).should be(false)
     end
 
     it "should check if user has any of a global roles set" do
@@ -131,6 +137,12 @@ shared_examples_for "Rolify module" do |dynamic|
       @admin.has_any_role?("admin", "staff").should be(true)
       @admin.has_any_role?("admin", "moderator").should be(true)
       @admin.has_any_role?("dummy", "dumber").should be(false)
+      @admin.has_any_role?({ :name => "admin", :resource => Forum }, { :name => "admin", :resource => Group }).should be(true)
+      @admin.has_any_role?({ :name => "admin", :resource => :any }, { :name => "admin", :resource => Group }).should be(true)
+      @admin.has_any_role?({ :name => "admin", :resource => Forum }, { :name => "staff", :resource => Group.last }).should be(true)
+      @admin.has_any_role?({ :name => "admin", :resource => Forum.first }, { :name => "admin", :resource => Forum.last }).should be(true)
+      @admin.has_any_role?({ :name => "admin", :resource => Forum.first }, { :name => "dummy", :resource => Forum.last }).should be(true)
+      @admin.has_any_role?({ :name => "admin", :resource => Forum.first }, { :name => "dummy", :resource => :any }).should be(true)
     end
 
     it "should remove a global role of a user" do 
@@ -166,6 +178,7 @@ shared_examples_for "Rolify module" do |dynamic|
       @moderator = Rolify.user_cname.find(2)
       @moderator.has_role "moderator", Forum.first
       @moderator.has_role "soldier"
+      ActiveRecord::Base.logger = nil
     end
 
     it "should set an instance scoped role" do
@@ -224,23 +237,28 @@ shared_examples_for "Rolify module" do |dynamic|
     end
 
     it "should check if user has all of a scoped roles set" do
+      @moderator.has_role "visitor", Forum.last
       @moderator.has_all_roles?({ :name => "visitor", :resource => Forum.last }).should be(true)
-      @moderator.has_all_roles?({ :name => "moderator", :resource => Forum.first }, 
-      { :name => "visitor", :resource => Forum.last }).should be(true)
-      @moderator.has_all_roles?({ :name => "moderator", :resource => Forum.first }, 
-      { :name => "dummy", :resource => Forum.last }).should be(false)
-      @moderator.has_all_roles?({ :name => "dummy", :resource => Forum.first }, 
-      { :name => "dumber", :resource => Forum.last }).should be(false)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => Forum.last }).should be(true)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => :any }).should be(true)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => :any }).should be(true)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => Forum }).should be(false)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => Forum.first }, { :name => "visitor", :resource => Forum.last }).should be(true)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => Forum.first }, { :name => "moderator", :resource => Forum.last }).should be(false)
+      @moderator.has_all_roles?({ :name => "moderator", :resource => Forum.first }, { :name => "dummy", :resource => Forum.last }).should be(false)
+      @moderator.has_all_roles?({ :name => "dummy", :resource => Forum.first }, { :name => "dumber", :resource => Forum.last }).should be(false)
     end
 
     it "should check if user has any of a scoped roles set" do
-      @moderator.has_any_role?( { :name => "visitor", :resource => Forum.last }).should be(true)
-      @moderator.has_any_role?( { :name => "moderator", :resource => Forum.first }, 
-      { :name => "visitor", :resource => Forum.last }).should be(true)
-      @moderator.has_any_role?( { :name => "moderator", :resource => Forum.first }, 
-      { :name => "dummy", :resource => Forum.last }).should be(true)
-      @moderator.has_any_role?( { :name => "dummy", :resource => Forum.first }, 
-      { :name => "dumber", :resource => Forum.last }).should be(false)
+      @moderator.has_role "visitor", Forum.last
+      @moderator.has_any_role?({ :name => "visitor", :resource => Forum.last }).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => Forum.first }, { :name => "visitor", :resource => Forum.last }).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => Forum.last }).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => :any }, { :name => "visitor", :resource => :any}).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => Forum }, { :name => "visitor", :resource => :any }).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => Forum.first }, { :name => "moderator", :resource => Forum.last }).should be(true)
+      @moderator.has_any_role?({ :name => "moderator", :resource => Forum.first }, { :name => "dummy", :resource => Forum.last }).should be(true)
+      @moderator.has_any_role?({ :name => "dummy", :resource => Forum.first }, { :name => "dumber", :resource => Forum.last }).should be(false)
     end
 
     it "should not remove a global role of a user" do 
@@ -321,23 +339,32 @@ shared_examples_for "Rolify module" do |dynamic|
     end
 
     it "should check if user has all of a scoped roles set" do
+      @manager.has_role "player", Forum
       @manager.has_all_roles?({ :name => "player", :resource => Forum }).should be(true)
-      @manager.has_all_roles?({ :name => "manager", :resource => Forum }, 
-      { :name => "player", :resource => Forum }).should be(true)
-      @manager.has_all_roles?({ :name => "manager", :resource => Forum }, 
-      { :name => "dummy", :resource => Forum }).should be(false)
-      @manager.has_all_roles?({ :name => "dummy", :resource => Forum }, 
-      { :name => "dumber", :resource => Group }).should be(false)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum }, { :name => "player", :resource => Forum }).should be(true)
+      @manager.has_all_roles?({ :name => "manager", :resource => :any }, { :name => "player", :resource => Forum }).should be(true)
+      @manager.has_all_roles?({ :name => "manager", :resource => :any }, { :name => "player", :resource => :any }).should be(true)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum }, { :name => "dummy", :resource => Forum }).should be(false)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum }, { :name => "dummy", :resource => :any }).should be(false)
+      @manager.has_all_roles?({ :name => "dummy", :resource => Forum }, { :name => "dumber", :resource => Group }).should be(false)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum.first }, { :name => "manager", :resource => Forum.last }).should be(true)
+      @manager.has_all_roles?({ :name => "manager", :resource => Group }, { :name => "moderator", :resource => Forum.first }).should be(false)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum.first }, { :name => "moderator", :resource => Forum }).should be(false)
+      @manager.has_all_roles?({ :name => "manager", :resource => Forum.last }, { :name => "warrior", :resource => Forum.last }).should be(true)
     end
 
     it "should check if user has any of a scoped roles set" do
-      @manager.has_any_role?( { :name => "player", :resource => Forum }).should be(true)
-      @manager.has_any_role?( { :name => "manager", :resource => Forum }, 
-      { :name => "player", :resource => Forum }).should be(true)
-      @manager.has_any_role?( { :name => "manager", :resource => Forum }, 
-      { :name => "dummy", :resource => Forum }).should be(true)
-      @manager.has_any_role?( { :name => "dummy", :resource => Forum }, 
-      { :name => "dumber", :resource => Group }).should be(false)
+      @manager.has_any_role?({ :name => "player", :resource => Forum }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum }, { :name => "player", :resource => Forum }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum }, { :name => "player", :resource => :any }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => :any }, { :name => "player", :resource => :any }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum }, { :name => "dummy", :resource => Forum }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum }, { :name => "dummy", :resource => :any }).should be(true)
+      @manager.has_any_role?({ :name => "dummy", :resource => Forum }, { :name => "dumber", :resource => Group }).should be(false)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum.first }, { :name => "manager", :resource => Forum.last }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Group }, { :name => "moderator", :resource => Forum.first }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum.first }, { :name => "moderator", :resource => Forum }).should be(true)
+      @manager.has_any_role?({ :name => "manager", :resource => Forum.last }, { :name => "warrior", :resource => Forum.last }).should be(true)
     end
 
     it "should not remove a global role of a user" do 
@@ -374,6 +401,9 @@ shared_examples_for "Rolify module" do |dynamic|
       @user.has_role "visitor", Forum.last
       @user.has_role "manager", Forum
       @user.has_role "leader", Group
+      Rolify.role_cname.create :name => "manager", :resource => Forum.find(1)
+      Rolify.role_cname.create :name => "manager", :resource => Forum.find(2)
+      Rolify.role_cname.create :name => "manager", :resource => Forum.find(3)
     end
 
     it "should get a global role" do
@@ -394,16 +424,26 @@ shared_examples_for "Rolify module" do |dynamic|
     it "should check if user has all of a mix of global and scoped roles set" do
       @user.has_all_roles?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum }).should be(true)
       @user.has_all_roles?("admin", { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Forum }).should be(false)
+      @user.has_all_roles?("admin", { :name => "moderator", :resource => :any }, { :name => "manager", :resource => Forum }).should be(true)
+      @user.has_all_roles?("admin", { :name => "moderator", :resource => :any }, { :name => "manager", :resource => :any }).should be(true)
       @user.has_all_roles?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Group }).should be(false)
       @user.has_all_roles?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Group.first }).should be(false)
       @user.has_all_roles?({ :name => "admin", :resource => Forum }, { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum }).should be(true)
       @user.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum }).should be(true)
       @user.has_all_roles?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum.first }).should be(true)
       @user.has_all_roles?("dummy", { :name => "dumber", :resource => Forum.last }, { :name => "dumberer", :resource => Forum }).should be(false)
+      @user.has_all_roles?("admin", "dummy", { :name => "dumber", :resource => Forum.last }, { :name => "dumberer", :resource => Forum }).should be(false)
+      @user.has_all_roles?({ :name => "manager", :resource => Forum.last }, "dummy", { :name => "dumber", :resource => Forum.last }, { :name => "dumberer", :resource => Forum }).should be(false)
+      @user.has_all_roles?("admin", { :name => "dumber", :resource => Forum.last }, { :name => "manager", :resource => Forum.last }).should be(false)
+      @user.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum.last }).should be(true)
+      @user.has_all_roles?({ :name => "admin", :resource => Forum.first }, { :name => "moderator", :resource => :any }, { :name => "manager", :resource => Forum.last }).should be(true)
     end
 
     it "should check if user has any of a mix of global and scoped roles set" do
       @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => Forum }).should be(true)
+      @user.has_any_role?("admin", { :name => "moderator", :resource => :any }, { :name => "manager", :resource => Forum }).should be(true)
+      @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.first }, { :name => "manager", :resource => :any }).should be(true)
+      @user.has_any_role?("admin", { :name => "moderator", :resource => :any }, { :name => "manager", :resource => :any }).should be(true)
       @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Forum }).should be(true)
       @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Group }).should be(true)
       @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Group.first }).should be(true)
@@ -411,6 +451,7 @@ shared_examples_for "Rolify module" do |dynamic|
       @user.has_any_role?({ :name => "admin", :resource => Forum.first }, { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Forum }).should be(true)
       @user.has_any_role?("admin", { :name => "moderator", :resource => Forum.last }, { :name => "manager", :resource => Forum.first }).should be(true)
       @user.has_any_role?("dummy", { :name => "dumber", :resource => Forum.last }, { :name => "dumberer", :resource => Forum }).should be(false)
+      @user.has_any_role?({ :name => "manager", :resource => Forum.last }, "dummy", { :name => "dumber", :resource => Forum.last }, { :name => "dumberer", :resource => Forum }).should be(true)
     end
   end
 
@@ -419,32 +460,32 @@ end
 describe Rolify do
   context "using default Role and User class names with dynamic shortcuts", true do 
     it_behaves_like "Rolify module" do
-      let(:user_cname) { User } 
-      let(:role_cname) { Role }
+      let(:user_cname) { "User" } 
+      let(:role_cname) { "Role" }
       let(:dynamic_shortcuts) { true }
     end
   end
 
   context "using default Role and User class names without dynamic shortcuts", false do 
     it_behaves_like "Rolify module" do
-      let(:user_cname) { User } 
-      let(:role_cname) { Role }
+      let(:user_cname) { "User" } 
+      let(:role_cname) { "Role" }
       let(:dynamic_shortcuts) { false }
     end
   end
-
+  
   context "using custom User and Role class names with dynamic shortcuts", true do 
     it_behaves_like "Rolify module" do
-      let(:user_cname) { Customer }
-      let(:role_cname) { Privilege }
+      let(:user_cname) { "Customer" }
+      let(:role_cname) { "Privilege" }
       let(:dynamic_shortcuts) { true }
     end
   end
-
+  
   context "using custom User and Role class names without dynamic shortcuts", false do 
     it_behaves_like "Rolify module" do
-      let(:user_cname) { Customer }
-      let(:role_cname) { Privilege }
+      let(:user_cname) { "Customer" }
+      let(:role_cname) { "Privilege" }
       let(:dynamic_shortcuts) { false }
     end
   end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'rolify'
 require 'ammeter/init'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-ActiveRecord::Base.logger = Logger.new(File.open('logs/database.log', 'a'))
 
 load File.dirname(__FILE__) + '/support/schema.rb'
 load File.dirname(__FILE__) + '/support/models.rb'

data/spec/support/models.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   has_and_belongs_to_many :roles, :join_table => :users_roles
   include Rolify::Roles
-  extend Rolify::Reloaded
+  extend Rolify::Dynamic
 end
 
 class Role < ActiveRecord::Base
@@ -18,7 +18,7 @@ end
 class Customer < ActiveRecord::Base
   has_and_belongs_to_many :roles, :join_table => :customers_privileges, :class_name => "Privilege"
   include Rolify::Roles
-  extend Rolify::Reloaded
+  extend Rolify::Dynamic
 end
 
 class Privilege < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70283269093580 !ruby/object:Gem::Requirement
+  requirement: &70300130621700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70283269093580
+  version_requirements: *70300130621700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70283269093060 !ruby/object:Gem::Requirement
+  requirement: &70300130621240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283269093060
+  version_requirements: *70300130621240
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70283269092560 !ruby/object:Gem::Requirement
+  requirement: &70300130620780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283269092560
+  version_requirements: *70300130620780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70283269092080 !ruby/object:Gem::Requirement
+  requirement: &70300130620360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283269092080
+  version_requirements: *70300130620360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70283269091560 !ruby/object:Gem::Requirement
+  requirement: &70300130619940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283269091560
+  version_requirements: *70300130619940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70283269091120 !ruby/object:Gem::Requirement
+  requirement: &70300130619520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70283269091120
+  version_requirements: *70300130619520
 description: ! 'Very simple Roles library without any authorization enforcement (built
   to use with cancan) supporting scope on resource: user.is_moderator?(Forum.first)
   => # return false if user is moderator of another Forum '
@@ -93,6 +93,7 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
+- benchmarks/performance.rb
 - lib/generators/rolify/role/role_generator.rb
 - lib/generators/rolify/role/templates/initializer.rb
 - lib/generators/rolify/role/templates/migration.rb