rolify 3.3.0.rc3 → 3.3.0.rc4

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*
 tmp/*
 log*/*

data/.travis.yml

@@ -1,16 +1,23 @@
 rvm:
-    - 1.9.3
-    - ruby-head
-    - rbx-19mode
-    - jruby-19mode
+  - 1.9.3
+  - 2.0.0 
+  - rbx-19mode
+  - jruby-19mode
+
+gemfile:
+  - gemfiles/Gemfile.rails-3.2
+  - gemfiles/Gemfile.rails-4.0
 
 env:
-    - ADAPTER=active_record
-    - ADAPTER=mongoid
+  - ADAPTER=active_record
+  - ADAPTER=mongoid
 
-before_install:
-  - gem update --system
-  - gem --version
-  - ruby -v
-  
 services: mongodb
+
+before_script: rails --version
+
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+    - gemfile: gemfiles/Gemfile.rails-4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,21 @@
+= 3.3 (not released yet)
+* <b>DEPRECATION NOTICE:</b>Rails 3.1 support dropped: if you use Rails 3.1, please stick to rolify 3.2
+* code cleanup in finders methods
+* generators rewritten entirely. now using ActiveRecord/Mongoid model generator to create Role model
+* added rspec matchers for detailed spec error messages (thanks to @delwyn)
+* clean up specs (thanks to @delwyn), removed subject and let declarations in before(:all) block
+* roles query needs 1 DB hit instead of 1 up to 3 (thanks to @terraplane)
+* remove nil entries from ResourceAdapter#resources_find when using Mongoid adapter (thanks to @daviscabral)
+* fixed a bug regarding redundant index for Mongoid Role model (thanks to  @rschultheis)
+* added support for rolify and resourcify methods on the same model class (specs by @amer)
+* added support for namespaced models (thanks to @intrica)
+* fixed compatibility issue with squeel when using symbols as role parameters (hint by @f3ndot)
+* now raises a warning in the initializer if migration has not been run
+* add support for primary key different than 'id' for resource Model (thanks to @rafaeldl)
+* Rails 4 (thanks to @adammathys) and ruby 2.0 compliant
+* configured travis-ci to run the specs on Rails 3.2/4.0 and Rubies 1.9.3/2.0/rbx/jruby
+* added code climate to check for code smell
+
 = 3.2 (Aug 7, 2012)
 * <b>DEPRECATION NOTICE:</b> Ruby 1.8 support dropped ! Mongoid 3.0 only supports MRI 1.9.3, and HEAD, and JRuby 1.6.0+ in 1.9 mode
 * removed <tt>dynamic_shortcuts</tt> arguments from the generator

data/Gemfile

@@ -1,4 +1,17 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in rolify.gemspec
-gemspec
+case ENV["ADAPTER"]
+when nil, "active_record"
+  group :test do
+    gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+    gem "sqlite3", :platform => "ruby"
+  end
+  gem "activerecord", ">= 3.2.0", :require => "active_record"
+when "mongoid"
+  gem "mongoid", ">= 3.1"
+  gem "bson_ext", :platform => "ruby"
+else
+  raise "Unknown model adapter: #{ENV["ADAPTER"]}"
+end
+
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/EppO/rolify.png?branch=master)](http://travis-ci.org/EppO/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/EppO/rolify)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/EppO/rolify.png)](http://travis-ci.org/EppO/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify)
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
@@ -15,10 +15,10 @@ This library can be easily integrated with any authentication gem ([devise](http
 
 ## Requirements
 
-* Rails >= 3.1
-* ActiveRecord >= 3.1 <b>or</b> Mongoid >= 3.0
-* supports ruby 1.9, JRuby 1.6.0+ (in 1.9 mode) and Rubinius 2.0.0dev (in 1.9 mode)
-* support of ruby 1.8 has been dropped due to Mongoid 3.0 that only supports 1.9 new hash syntax
+* Rails >= 3.2
+* ActiveRecord >= 3.2 <b>or</b> Mongoid >= 3.1
+* supports ruby 2.0/1.9.3, JRuby 1.6.0+ (in 1.9 mode) and Rubinius 2.0.0dev (in 1.9 mode)
+* support of ruby 1.8 has been dropped due to Mongoid >=3.0 that only supports 1.9 new hash syntax
 
 ## Installation
 
@@ -28,12 +28,6 @@ In <b>Rails 3</b>, add this to your Gemfile and run the +bundle+ command.
   gem "rolify"
 ```
 
-Alternatively, you can install it as a plugin.
-
-```
-  rails plugin install git://github.com/EppO/rolify.git
-```
-
 ## Getting Started
 
 ### 1. Generate Role Model
@@ -41,13 +35,13 @@ Alternatively, you can install it as a plugin.
 First, create your Role model and migration file using this generator:
 
 ```
-  rails g rolify:role Role User
+  rails g rolify Role User
 ```
 
 Role and User classes are the default. You can specify any Role class name you want. This is completly a new file so any name can do the job.
 For the User class name, you would probably use the one provided by your authentication solution. rolify just adds some class methods in an existing User class.
 
-If you want to use Mongoid instead of ActiveRecord, follow these [instructions](https://github.com/EppO/rolify/wiki/Configuration), and skip to step #3
+If you want to use Mongoid instead of ActiveRecord, just add `--orm=mongoid` argument, and skip to step #3
 
 ### 2. Run the migration (only required when using ActiveRecord)
 
@@ -59,26 +53,26 @@ Let's migrate !
 
 ### 3.1 Configure your user model
 
-This gem adds the `rolify` method to your User class. You can also specify optional callbacks* on the user for when roles are added or removed:
+This gem adds the `rolify` method to your User class. You can also specify optional callbacks on the User class for when roles are added or removed:
 
 ```ruby
   class User < ActiveRecord::Base
     rolify :before_add => :before_add_method
 
-    def :before_add_method(role)
+    def before_add_method(role)
       # do something before it gets added
     end
   end
 ```
 
-The `rolify` method accepts the following callback* options:
+The `rolify` method accepts the following callback options:
 
 - `before_add`
 - `after_add`
 - `before_remove`
 - `after_remove`
 
-*PLEASE NOTE: callbacks are currently only supported using ActiveRecord ORM. Mongoid will support association callbacks in its 3.1 release (Mongoid current version is 3.0.x)
+Mongoid callbacks are also supported and works the same way.
 
 ### 3.2 Configure your resource models
 
@@ -201,6 +195,12 @@ Starting from rolify 3.0, you can search roles on instance level or class level
   * [Using rolify with Devise and Authority](https://github.com/EppO/rolify/wiki/Using-rolify-with-Devise-and-Authority)
   * [Step-by-step tutorial](http://railsapps.github.com/tutorial-rails-bootstrap-devise-cancan.html) provided by [RailsApps](http://railsapps.github.com/)
 
+## Upgrade from previous versions
+
+Please read the [upgrade instructions](UPGRADE.rdoc).
+
 ## Questions or Problems?
 
 If you have any issue or feature request with/for rolify, please add an [issue on GitHub](https://github.com/EppO/rolify/issues) or fork the project and send a pull request.
+
+To get the specs running you should call `bundle` and then `rake`. See the spec/README for more information.

data/Rakefile

@@ -1,6 +1,16 @@
 require 'bundler'
+require 'rspec/core/rake_task'
+
 Bundler::GemHelper.install_tasks
 
+RSpec::Core::RakeTask.new(:generators) do |task|
+  task.pattern = "spec/generators/**/*_spec.rb"
+end
+
+RSpec::Core::RakeTask.new(:rolify) do |task|
+  task.pattern = "spec/rolify/**/*_spec.rb"
+end
+
 task :default => :spec
 
 desc "Run all specs"
@@ -12,10 +22,10 @@ task "spec" do
   fail if return_code1 != 0 || return_code2 != 0
 end
 
-task "generators" do
-  system "bundle exec rspec spec/generators"
-end
-
-task "rolify" do
-  system "bundle exec rspec spec/rolify"
-end
+desc "Run specs for all adapters"
+task :spec_all do
+  %w[active_record mongoid].each do |model_adapter|
+    puts "ADAPTER = #{model_adapter}"
+    system "ADAPTER=#{model_adapter} rake"
+  end
+end

data/UPGRADE.rdoc

@@ -20,3 +20,25 @@ If you use <i>dynamic methods</i> (<tt>user.is_admin?</tt> like methods), you sh
       c.use_dynamic_shortcuts
    end
 The old fashion way still works though, but won't work anymore if the setter method name is changed in a possible future. You've been warned :-)
+
+== From a rolify installation 3.x
+
+=== Dependencies: 
+
+Starting from 3.3 release, rolify supports Rails 3.2 and newer.
+
+Mongoid callbacks are supported if Mongoid 3.1 and newer is installed.
+
+=== Rails Generators
+
+Role model template when using Mongoid has been changed, you should re-run the generator.
+
+Rails generator has been renamed to: <tt>rails g rolify</tt> and arguments have been changed: 
+* Role class name is now mandatory, User class name remains optional and its default is still <tt>User</tt>
+* ORM optional argument is now <tt>-o</tt> or <tt>--orm=</tt>
+For instance, here is a new rolify generator command example: <tt>rails g rolify Role</tt>
+You can use <tt>rails g rolify --help</tt> to see all available options.
+
+=== Testing
+
+Starting from rolify 3.3, to run the specs you should run: <tt>rake spec</tt> or simply <tt>rake</tt>.

data/gemfiles/Gemfile.rails-3.2

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+case ENV["ADAPTER"]
+when nil, "active_record"
+  group :test do
+    gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+    gem "sqlite3", :platform => "ruby"
+  end
+  gem "activerecord", "~> 3.2.0", :require => "active_record"
+when "mongoid"
+  gem "mongoid", "~> 3.1"
+  gem "bson_ext", :platform => "ruby"
+else
+  raise "Unknown model adapter: #{ENV["ADAPTER"]}"
+end
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails-4.0

@@ -0,0 +1,26 @@
+source "https://rubygems.org"
+
+case ENV["ADAPTER"]
+when nil, "active_record"
+  gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
+when "mongoid"
+  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
+  gem "bson_ext", :platform => "ruby"
+else
+  raise "Unknown model adapter: #{ENV["ADAPTER"]}"
+end
+
+group :test do
+  gem "rails", "~> 4.0.0.beta1"
+  gem "ammeter"
+  gem "rake"
+  gem "rspec"
+  gem "rspec-rails"
+  gem "fuubar"
+  gem "bundler"
+  
+  gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", "~> 4.0.0.beta1", :require => "active_record"
+  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
+end

data/lib/rolify.rb

@@ -22,7 +22,7 @@ module Rolify
     join_table = "#{self.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
     rolify_options = { :class_name => options[:role_cname].camelize }
     rolify_options.merge!({ :join_table => join_table }) if Rolify.orm == "active_record"
-    rolify_options.merge!(options.reject{ |k,v| ![:before_add, :after_add, :before_remove, :after_remove].include? k.to_sym }) if Rolify.orm == "active_record"
+    rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove ].include? k.to_sym })
 
     has_and_belongs_to_many :roles, rolify_options
 

data/lib/rolify/adapters/active_record/resource_adapter.rb

@@ -1,25 +1,25 @@
 require 'rolify/adapters/base'
 
 module Rolify
-  module Adapter   
+  module Adapter
     class ResourceAdapter < ResourceAdapterBase
       def resources_find(roles_table, relation, role_name)
-        resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type = '#{relation.to_s}' AND 
-                                    (#{quote(roles_table)}.resource_id IS NULL OR #{quote(roles_table)}.resource_id = #{quote(relation.table_name)}.id)")
+        resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type = '#{relation.to_s}' AND
+                                    (#{quote(roles_table)}.resource_id IS NULL OR #{quote(roles_table)}.resource_id = #{quote(relation.table_name)}.#{relation.primary_key})")
         resources = resources.where("#{quote(roles_table)}.name IN (?) AND #{quote(roles_table)}.resource_type = ?", Array(role_name), relation.to_s)
         resources
       end
 
       def in(relation, user, role_names)
         roles = user.roles.where(:name => role_names)
-        relation.where("#{quote(role_class.table_name)}.id IN (?) AND ((resource_id = #{quote(relation.table_name)}.id) OR (resource_id IS NULL))", roles)
+        relation.where("#{quote(role_class.table_name)}.#{role_class.primary_key} IN (?) AND ((resource_id = #{quote(relation.table_name)}.#{relation.primary_key}) OR (resource_id IS NULL))", roles)
       end
-      
+
       private
-      
+
       def quote(column)
          ActiveRecord::Base.connection.quote_column_name column
       end
     end
   end
-end
+end

data/lib/rolify/adapters/active_record/role_adapter.rb

@@ -1,7 +1,7 @@
 require 'rolify/adapters/base'
 
 module Rolify
-  module Adapter   
+  module Adapter
     class RoleAdapter < RoleAdapterBase
       def where(relation, *args)
         conditions, values = build_conditions(relation, args)
@@ -9,7 +9,7 @@ module Rolify
       end
 
       def find_or_create_by(role_name, resource_type = nil, resource_id = nil)
-        role_class.find_or_create_by_name_and_resource_type_and_resource_id(role_name, resource_type, resource_id)
+        role_class.where(:name => role_name, :resource_type => resource_type, :resource_id => resource_id).first_or_create
       end
 
       def add(relation, role)
@@ -23,8 +23,8 @@ module Rolify
         roles = relation.roles.where(cond)
         if roles
           relation.roles.delete(roles)
-          roles.each do |role| 
-            role.destroy if role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).empty? 
+          roles.each do |role|
+            role.destroy if role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).empty?
           end
         end
         roles
@@ -33,7 +33,7 @@ module Rolify
       def exists?(relation, column)
         relation.where("#{column} IS NOT NULL")
       end
-      
+
       def scope(relation, conditions)
         query = relation.scoped
         query = query.joins(:roles)
@@ -67,10 +67,10 @@ module Rolify
         values = [ role ]
         if resource
           query.insert(0, "(")
-          query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id IS NULL))" 
+          query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id IS NULL))"
           values << role << (resource.is_a?(Class) ? resource.to_s : resource.class.name)
           if !resource.is_a? Class
-            query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id = ?))" 
+            query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id = ?))"
             values << role << resource.class.name << resource.id
           end
           query += ")"
@@ -79,4 +79,4 @@ module Rolify
       end
     end
   end
-end
+end

data/lib/rolify/configure.rb

@@ -45,7 +45,7 @@ module Rolify
       role_cnames = [ "Role" ] if role_cnames.empty?
       role_cnames.each do |role_cname|
         role_class = role_cname.constantize
-        if role_class.superclass == ActiveRecord && !role_class.table_exists?
+        if role_class.superclass.to_s == "ActiveRecord" && !role_class.table_exists?
           warn "[WARN] table '#{role_cname}' doesn't exist. Did you run the migration ? Ignoring rolify config."
           return false
         end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.3.0.rc3"
+  VERSION = "3.3.0.rc4"
 end

data/rolify.gemspec

@@ -15,23 +15,16 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-    s.add_development_dependency "activerecord-jdbcsqlite3-adapter"
-  else
-    s.add_development_dependency "sqlite3"
-    s.add_development_dependency "bson_ext" if RUBY_VERSION < "2.0.0"
-  end
-  s.add_development_dependency "activerecord", ">= 3.1.0"
-  s.add_development_dependency "mongoid", ">= 3.0"
   s.add_development_dependency "ammeter"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", ">= 2.0"
   s.add_development_dependency "rspec-rails", ">= 2.0"
-  s.add_development_dependency "mongoid-rspec", ">= 1.5"
-  s.add_development_dependency "bundler" 
-  s.add_development_dependency "fuubar"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "fuubar" 
+  s.add_development_dependency "activerecord", ">= 3.2.0"
+  s.add_development_dependency "mongoid", ">= 3.1"
 end

data/spec/README.rdoc

@@ -0,0 +1,24 @@
+= Rolify Specs
+
+== Running the specs
+
+To run the specs first run the +bundle+ command to install the necessary gems and the +rake+ command to run the specs.
+
+  bundle
+  rake
+
+== Model Adapters
+
+Rolify currently supports 2 different ORMs: ActiveRecord and Mongoid. By default it will use Active Record but you can change this by setting the +ADAPTER+ environment variable before running the specs. You can run the +bundle+ command with this as well to ensure you have all the required gems.
+
+  ADAPTER=mongoid bundle
+  ADAPTER=mongoid rake
+
+The different model adapters you can specify are:
+
+* active_record (default)
+* mongoid
+
+You can also run the +spec_all+ rake task to run specs for each adapter.
+
+  rake spec_all

data/spec/rolify/custom_spec.rb

@@ -5,23 +5,16 @@ require "rolify/shared_examples/shared_examples_for_scopes"
 require "rolify/shared_examples/shared_examples_for_callbacks"
 
 describe "Using Rolify with custom User and Role class names" do
-  it_behaves_like Rolify::Role do
-    let(:user_class) { Customer }
-    let(:role_class) { Privilege }
+  def user_class
+    Customer
   end
 
-  it_behaves_like "Role.scopes" do
-    let(:user_class) { Customer } 
-    let(:role_class) { Privilege }
-  end
-
-  it_behaves_like Rolify::Dynamic do
-    let(:user_class) { Customer } 
-    let(:role_class) { Privilege }
-  end
-
-  it_behaves_like "Rolify.callbacks" do
-    let(:user_class) { Customer }
-    let(:role_class) { Privilege }
+  def role_class
+    Privilege
   end
+  
+  it_behaves_like Rolify::Role
+  it_behaves_like "Role.scopes"
+  it_behaves_like Rolify::Dynamic
+  it_behaves_like "Rolify.callbacks"
 end

data/spec/rolify/namespace_spec.rb

@@ -5,23 +5,16 @@ require "rolify/shared_examples/shared_examples_for_scopes"
 require "rolify/shared_examples/shared_examples_for_callbacks"
 
 describe "Rolify.namespace" do
-  it_behaves_like Rolify::Role do
-    let(:user_class) { Admin::Moderator } 
-    let(:role_class) { Admin::Right }
+  def user_class
+    Admin::Moderator
   end
 
-  it_behaves_like "Role.scopes" do
-    let(:user_class) { Admin::Moderator } 
-    let(:role_class) { Admin::Right }
-  end
-
-  it_behaves_like Rolify::Dynamic do
-    let(:user_class) { Admin::Moderator } 
-    let(:role_class) { Admin::Right }
-  end
-
-  it_behaves_like "Rolify.callbacks" do
-    let(:user_class) { Admin::Moderator } 
-    let(:role_class) { Admin::Right }
+  def role_class
+    Admin::Right
   end
+  
+  it_behaves_like Rolify::Role
+  it_behaves_like "Role.scopes"
+  it_behaves_like Rolify::Dynamic
+  it_behaves_like "Rolify.callbacks"
 end

data/spec/rolify/resource_spec.rb

@@ -6,12 +6,14 @@ describe Rolify::Resource do
     User.rolify
     Forum.resourcify
     Group.resourcify
+    Team.resourcify
     Role.destroy_all
   end
 
   # Users
   let(:admin)   { User.first }
   let(:tourist) { User.last }
+  let(:captain) { User.where(:login => "god").first }
 
   # roles
   let!(:forum_role)      { admin.add_role(:forum, Forum.first) }
@@ -20,6 +22,8 @@ describe Rolify::Resource do
   let!(:grouper_role)    { admin.add_role(:grouper, Group.first) }
   let!(:tourist_role)    { tourist.add_role(:forum, Forum.last) }
   let!(:sneaky_role)     { tourist.add_role(:group, Forum.first) }
+  let!(:captain_role)    { captain.add_role(:captain, Team.first) }
+  let!(:player_role)     { captain.add_role(:player, Team.last) }
 
   describe ".with_roles" do
     subject { Group }
@@ -127,7 +131,14 @@ describe Rolify::Resource do
 
       end
     end
-
+    
+    context "with a model not having ID column" do
+      subject { Team }
+      
+      it "should find Team instance using team_code column" do
+        subject.with_roles([:captain, :player], captain).should =~ [ Team.first, Team.last ]
+      end
+    end
   end
 
   describe ".find_role" do
@@ -327,7 +338,7 @@ describe Rolify::Resource do
 
     context "on a Forum instance" do
       its(:roles) { should eq([ forum_role, sneaky_role ]) }
-      its(:roles) { subject.should_not include(group_role, godfather_role, tourist_role) }
+      its(:roles) { should_not include(group_role, godfather_role, tourist_role) }
     end
 
     context "on a Group instance" do

data/spec/rolify/resourcifed_and_rolifed_spec.rb

@@ -8,7 +8,11 @@ describe "Resourcify and rolify on the same model" do
     HumanResource.delete_all
   end
   
-  let!(:user) { user = HumanResource.new login: 'Samer'; user.save; user }
+  let!(:user) do
+    user = HumanResource.new login: 'Samer' 
+    user.save
+    user
+  end
   
   it "should add the role to the user" do
     expect { user.add_role :admin }.to change { user.roles.count }.by(1)

data/spec/rolify/role_spec.rb

@@ -5,23 +5,16 @@ require "rolify/shared_examples/shared_examples_for_scopes"
 require "rolify/shared_examples/shared_examples_for_callbacks"
 
 describe Rolify do
-  it_behaves_like Rolify::Role do
-    let(:user_class) { User } 
-    let(:role_class) { Role }
+  def user_class
+    User
   end
 
-  it_behaves_like "Role.scopes" do
-    let(:user_class) { User } 
-    let(:role_class) { Role }
-  end
-
-  it_behaves_like Rolify::Dynamic do
-    let(:user_class) { User } 
-    let(:role_class) { Role }
-  end
-
-  it_behaves_like "Rolify.callbacks" do
-    let(:user_class) { User }
-    let(:role_class) { Role }
+  def role_class
+    Role
   end
+  
+  it_behaves_like Rolify::Role
+  it_behaves_like "Role.scopes"
+  it_behaves_like Rolify::Dynamic
+  it_behaves_like "Rolify.callbacks"
 end

data/spec/rolify/shared_contexts.rb

@@ -1,7 +1,9 @@
 shared_context "global role", :scope => :global do
   subject { admin }
   
-  let(:admin) { user_class.first }
+  def admin
+    user_class.first
+  end
   
   before(:all) do
     load_roles
@@ -29,7 +31,9 @@ shared_context "class scoped role", :scope => :class do
     create_other_roles
   end
   
-  let(:manager) { user_class.where(:login => "moderator").first }
+  def manager
+    user_class.where(:login => "moderator").first
+  end
   
   def load_roles
     role_class.destroy_all
@@ -51,7 +55,9 @@ shared_context "instance scoped role", :scope => :instance do
     create_other_roles
   end
   
-  let(:moderator) { user_class.where(:login => "god").first }
+  def moderator
+    user_class.where(:login => "god").first
+  end
   
   def load_roles
     role_class.destroy_all

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_dynamic.rb

@@ -1,4 +1,4 @@
-shared_examples_for Rolify::Dynamic do 
+shared_examples_for Rolify::Dynamic do
   before(:all) do
     Rolify.dynamic_shortcuts = true
     role_class.destroy_all

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_roles.rb

@@ -82,7 +82,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(:each) 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.all.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.all.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/support/adapters/active_record.rb

@@ -66,4 +66,11 @@ class Group < ActiveRecord::Base
   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

data/spec/support/adapters/mongoid.rb

@@ -2,10 +2,6 @@ require 'mongoid'
 
 Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
 
-RSpec.configure do |config|
-  config.include Mongoid::Matchers
-end
-
 ::Mongoid::Document.module_eval do
   def self.included(base)
     base.extend Rolify
@@ -137,3 +133,11 @@ class Group
     Group.in(:parent_id => _id)
   end
 end
+
+class Team
+  include Mongoid::Document
+  #resourcify done during specs setup to be able to use custom user classes
+
+  field :team_code, :type => Integer
+  field :name, :type => String
+end

data/spec/support/data.rb

@@ -20,3 +20,6 @@ Forum.create(:name => "forum 3")
 
 Group.create(:name => "group 1")
 Group.create(:name => "group 2")
+
+Team.create(:team_code => "1", :name => "PSG")
+Team.create(:team_code => "2", :name => "MU")

data/spec/support/schema.rb

@@ -44,4 +44,9 @@ ActiveRecord::Schema.define do
     t.integer :parent_id
     t.string :name
   end
+  
+  create_table(:teams, :id => false) do |t|
+    t.primary_key :team_code
+    t.string :name
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc3
+  version: 3.3.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +74,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: fuubar
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,61 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: mongoid-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,15 +122,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: fuubar
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
@@ -204,6 +156,8 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.rdoc
+- gemfiles/Gemfile.rails-3.2
+- gemfiles/Gemfile.rails-4.0
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
@@ -233,6 +187,7 @@ files:
 - lib/rolify/utils.rb
 - lib/rolify/version.rb
 - rolify.gemspec
+- spec/README.rdoc
 - spec/generators/rolify/rolify_generator_spec.rb
 - spec/generators_helper.rb
 - spec/rolify/config_spec.rb
@@ -285,6 +240,7 @@ signing_key:
 specification_version: 3
 summary: Roles library with resource scoping
 test_files:
+- spec/README.rdoc
 - spec/generators/rolify/rolify_generator_spec.rb
 - spec/generators_helper.rb
 - spec/rolify/config_spec.rb