rolify 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e51b0a50895b89514d5f41266e0eb5373d47158
-  data.tar.gz: d99233b97fd7e18a79b0958ef9d359d8266b58b3
+  metadata.gz: ecd709c2e7e50d751a0161d8f0ab5b02ee5fd1aa
+  data.tar.gz: f0454a8410eba30cf7aff44ee27ffc70ee999182
 SHA512:
-  metadata.gz: 0846e497eac805c2bcbd8227ae96efe949e337c4872f9b6295c1df4c32df2699702ebcd957f516204d7c28948aca8557391b2b17da9d9db4da1079d130d8f144
-  data.tar.gz: 5ca314c4b2c63b9897f60e948c28310dcd9ebb5623614831fb1b5368a290090987829e31bc388d297a7665ee753cd2dd6e045c2c28d6eda4910f902ab79e7740
+  metadata.gz: 350c0f03b4d1a7764fee723122aad166d38728dd0ebeed8b39b6cd1523f03bfeb3cc5ef40b813b8d37e84ab28a37088f59fabac7cf3271c34badc3910b77762b
+  data.tar.gz: dbfcaebac05d8b0dc0d5cdca10f847d84080e28ef08b2473c759cf7cc1eba4bcae80eea2bf77cc0cec3f180a3e43f04b029247b2d894fb68f34e2fed2f8dc3d2

data/.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 sudo: false
 
 rvm:
+  - 2.2.3
   - 2.2.2
   - 2.1.2
   - 2.0.0
-  
 
 before_install:
   - gem update --system
@@ -16,7 +16,9 @@ script: bundle exec rake
 
 env:
   - ADAPTER=active_record
-  - ADAPTER=mongoid
+  - ADAPTER=mongoid MONGOID_VERSION=3
+  - ADAPTER=mongoid MONGOID_VERSION=4
+  - ADAPTER=mongoid MONGOID_VERSION=5
 
 services: mongodb
 

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+= 5.0.0 (Nov 17, 2015)
+* Fix migration warning showing when it shouldn't
+* Add role lazy-loading
+* Add has_cached_role and has_cached_strict_role to project.
+  See: https://github.com/RolifyCommunity/rolify#cached-roles-to-avoid-n1-issue
+* Update specs to pass with all Mongoid version.
+
 = 4.1.1 (Aug 06, 2015)
 * Fix a regression in the dynamic method loader.
 

data/Gemfile

@@ -7,7 +7,14 @@ group :test do
     gem "sqlite3", :platform => "ruby"
     gem "activerecord", ">= 3.2.0", :require => "active_record"
   when "mongoid"
-    gem "mongoid", ">= 3.1"
+    case ENV["MONGOID_VERSION"]
+    when nil, '5'
+      gem "mongoid", "~> 5"
+    when '4'
+      gem "mongoid", "~> 4"
+    when '3'
+      gem "mongoid", "~> 3"
+    end
     gem "bson_ext", :platform => "ruby"
   else
     raise "Unknown model adapter: #{ENV["ADAPTER"]}"
@@ -17,6 +24,8 @@ group :test do
   gem 'its'
   gem 'byebug'
   gem 'pry-byebug'
+  gem 'test-unit' # Implicitly loaded by ammeter
+  gem 'database_cleaner'
   gem 'codeclimate-test-reporter', :require => nil
 end
 

data/README.md

@@ -1,4 +1,4 @@
-# rolify [![Gem Version](https://badge.fury.io/rb/rolify.svg)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/RolifyCommunity/rolify.png)](http://travis-ci.org/RolifyCommunity/rolify) [![Dependency Status](https://gemnasium.com/RolifyCommunity/rolify.svg)](https://gemnasium.com/RolifyCommunity/rolify) [![Code Climate](https://codeclimate.com/github/RolifyCommunity/rolify.png)](https://codeclimate.com/github/RolifyCommunity/rolify) [![Coverage Status](https://img.shields.io/coveralls/RolifyCommunity/rolify.svg)](https://coveralls.io/r/RolifyCommunity/rolify?branch=master)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.svg)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/RolifyCommunity/rolify.png)](http://travis-ci.org/RolifyCommunity/rolify) [![Dependency Status](https://gemnasium.com/RolifyCommunity/rolify.svg)](https://gemnasium.com/RolifyCommunity/rolify) [![Code Climate](https://codeclimate.com/github/RolifyCommunity/rolify.png)](https://codeclimate.com/github/RolifyCommunity/rolify) [![Coverage Status](https://coveralls.io/repos/RolifyCommunity/rolify/badge.svg?branch=master&service=github)](https://coveralls.io/github/RolifyCommunity/rolify?branch=master)
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
@@ -221,6 +221,20 @@ end
 ```
 I.e. you get true only on a role that you manually add.
 
+### Cached Roles (to avoid N+1 issue)
+
+```ruby
+@user.add_role :admin, Forum
+@user.add_role :member, Forum
+
+users = User.with_role(:admin, Forum).preload(:roles)
+users.each do |user|
+  user.has_cached_role?(:member, Forum) # no extra queries
+end
+```
+
+This method should be used with caution. If you don't preload the roles, the `has_cached_role?` might return `false`. In the above example, it would return `false` for `@user.has_cached_role?(:member, Forum)`, because `User.with_role(:admin, Forum)` will load only the `:admin` roles.
+
 ## Resources
 
 * [Wiki](https://github.com/RolifyCommunity/rolify/wiki)

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

@@ -18,6 +18,28 @@ module Rolify
         relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
       end
 
+      def find_cached(relation, args)
+        resource_id = (args[:resource].nil? || args[:resource].is_a?(Class) || args[:resource] == :any) ? nil : args[:resource].id
+        resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
+
+        return relation.find_all { |role| role.name == args[:name].to_s } if args[:resource] == :any
+
+        relation.find_all do |role|
+          (role.name == args[:name].to_s && role.resource_type == nil && role.resource_id == nil) ||
+          (role.name == args[:name].to_s && role.resource_type == resource_type && role.resource_id == nil) ||
+          (role.name == args[:name].to_s && role.resource_type == resource_type && role.resource_id == resource_id)
+        end
+      end
+
+      def find_cached_strict(relation, args)
+        resource_id = (args[:resource].nil? || args[:resource].is_a?(Class)) ? nil : args[:resource].id
+        resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
+
+        relation.find_all do |role|
+          role.resource_id == resource_id && role.resource_type == resource_type && role.name == args[:name].to_s
+        end
+      end
+
       def find_or_create_by(role_name, resource_type = nil, resource_id = nil)
         role_class.where(:name => role_name, :resource_type => resource_type, :resource_id => resource_id).first_or_create
       end

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

@@ -18,6 +18,28 @@ module Rolify
           relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
       end
 
+      def find_cached(relation, args)
+        resource_id = (args[:resource].nil? || args[:resource].is_a?(Class) || args[:resource] == :any) ? nil : args[:resource].id
+        resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
+
+        return relation.find_all { |role| role.name == args[:name].to_s } if args[:resource] == :any
+
+        relation.find_all do |role|
+          (role.name == args[:name].to_s && role.resource_type == nil && role.resource_id == nil) ||
+          (role.name == args[:name].to_s && role.resource_type == resource_type && role.resource_id == nil) ||
+          (role.name == args[:name].to_s && role.resource_type == resource_type && role.resource_id == resource_id)
+        end
+      end
+
+      def find_cached_strict(relation, args)
+        resource_id = (args[:resource].nil? || args[:resource].is_a?(Class)) ? nil : args[:resource].id
+        resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
+
+        relation.find_all do |role|
+          role.resource_id == resource_id && role.resource_type == resource_type && role.name == args[:name].to_s
+        end
+      end
+
       def find_or_create_by(role_name, resource_type = nil, resource_id = nil)
         self.role_class.find_or_create_by(:name => role_name,
                                           :resource_type => resource_type,

data/lib/rolify/configure.rb

@@ -52,9 +52,8 @@ module Rolify
     private
 
     def sanity_check(role_cnames)
-      return true if (ARGV[0] =~ /assets:/) == 0
+      return true if ARGV.reduce(nil) { |acc,arg| arg =~ /assets:/ if acc.nil? } == 0
 
-      role_cnames = [ "Role" ] if role_cnames.empty?
       role_cnames.each do |role_cname|
         role_class = role_cname.constantize
         if role_class.superclass.to_s == "ActiveRecord::Base" && role_table_missing?(role_class)
@@ -67,6 +66,9 @@ module Rolify
 
     def role_table_missing?(role_class)
       !role_class.table_exists?
+    rescue ActiveRecord::NoDatabaseError
+      true
     end
+
   end
 end

data/lib/rolify/dynamic.rb

@@ -5,7 +5,7 @@ module Rolify
     def load_dynamic_methods
       if ENV['ADAPTER'] == 'active_record'
         # supported Rails version >= 3.2 with AR should use find_each, since use of .all.each is deprecated
-        self.role_class.includes(:resource).find_each do |r|
+        self.role_class.group("name, resource_type").includes(:resource).find_each do |r|
           define_dynamic_method(r.name, r.resource)
         end
       else

data/lib/rolify/matchers.rb

@@ -5,11 +5,11 @@ RSpec::Matchers.define :have_role do |*args|
     resource.has_role?(*args)
   end
 
-  failure_message_for_should do |resource|
+  failure_message do |resource|
     "expected to have role #{args.map(&:inspect).join(" ")}"
   end
 
-  failure_message_for_should_not do |resource|
+  failure_message_when_negated do |resource|
     "expected not to have role #{args.map(&:inspect).join(" ")}"
   end
 end

data/lib/rolify/role.rb

@@ -44,6 +44,15 @@ module Rolify
       self.class.adapter.where_strict(self.roles, name: role_name, resource: resource).any?
     end
 
+    def has_cached_role?(role_name, resource = nil)
+      return has_strict_cached_role?(role_name, resource) if self.class.strict_rolify and resource and resource != :any
+      self.class.adapter.find_cached(self.roles, name: role_name, resource: resource).any?
+    end
+
+    def has_strict_cached_role?(role_name, resource = nil)
+      self.class.adapter.find_cached_strict(self.roles, name: role_name, resource: resource).any?
+    end
+
     def has_all_roles?(*args)
       args.each do |arg|
         if arg.is_a? Hash

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "4.1.1"
+  VERSION = "5.0.0"
 end

data/rolify.gemspec

@@ -13,16 +13,22 @@ Gem::Specification.new do |s|
 
   s.license     = 'MIT'
 
-  s.authors     = ['Florent Monbillard']
-  s.email       = ['f.monbillard@gmail.com']
+  s.authors     = [
+    'Florent Monbillard',
+    'Wellington Cordeiro'
+  ]
+  s.email       = [
+    'f.monbillard@gmail.com',
+    'wellington@wellingtoncordeiro.com'
+  ]
 
   s.files         = `git ls-files`.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']
 
-  s.add_development_dependency 'ammeter',     '~> 1.1.2' # Spec generator
-  s.add_development_dependency 'bundler',     '>= 1.7.12' # packaging feature
-  s.add_development_dependency 'rake',        '~> 10.4.2' # Tasks manager
-  s.add_development_dependency 'rspec-rails', '2.99.0'
+  s.add_development_dependency 'ammeter',     '~> 1.1' # Spec generator
+  s.add_development_dependency 'bundler',     '~> 1.10' # packaging feature
+  s.add_development_dependency 'rake',        '~> 10.4' # Tasks manager
+  s.add_development_dependency 'rspec-rails', '~> 3.4'
 end

data/spec/common_helper.rb

@@ -0,0 +1,16 @@
+require 'test-unit'
+
+begin
+  require 'pry'
+rescue LoadError
+end
+
+# `Test::Unit::AutoRunner.need_auto_run=` was introduced to the test-unit
+# gem in version 2.4.9. Previous to this version `Test::Unit.run=` was
+# used. The implementation of test-unit included with Ruby has neither
+# method.
+if defined? Test::Unit::AutoRunner
+  Test::Unit::AutoRunner.need_auto_run = false
+elsif defined?(Test::Unit)
+  Test::Unit.run = false
+end

data/spec/generators_helper.rb

@@ -1,21 +1,28 @@
 require 'rubygems'
 require "bundler/setup"
 
+require 'pry'
+
 require 'rolify'
 require 'rolify/matchers'
-require 'rails'
+require 'rails/all'
 require_relative 'support/stream_helpers'
 include StreamHelpers
 
 require 'coveralls'
 Coveralls.wear_merged!
 
+require 'common_helper'
+
 ENV['ADAPTER'] ||= 'active_record'
 
 if ENV['ADAPTER'] == 'active_record'
+  load File.dirname(__FILE__) + '/support/adapters/utils/active_record.rb'
   require 'active_record/railtie'
+  establish_connection
 else
-  require 'mongoid'
+  load File.dirname(__FILE__) + '/support/adapters/utils/mongoid.rb'
+  load_mongoid_config
 end
 
 module TestApp

data/spec/rolify/config_spec.rb

@@ -161,6 +161,8 @@ describe Rolify do
         config.orm = "mongoid"
       end
     end
+
+    subject { Rolify }
     
     its(:dynamic_shortcuts) { should be_truthy }
     its(:orm) { should eq("mongoid") }

data/spec/rolify/custom_spec.rb

@@ -17,4 +17,4 @@ describe "Using Rolify with custom User and Role class names" do
   it_behaves_like "Role.scopes"
   it_behaves_like Rolify::Dynamic
   it_behaves_like "Rolify.callbacks"
-end
+end

data/spec/rolify/resource_spec.rb

@@ -542,29 +542,35 @@ describe Rolify::Resource do
     context "strict user" do
       before(:all) do
         @strict_user = StrictUser.first
+        @strict_user.role_ids
         @strict_user.add_role(:forum, Forum.first)
         @strict_user.add_role(:forum, Forum)
       end
 
       it "should return only strict forum" do
         @strict_user.has_role?(:forum, Forum.first).should be true
+        @strict_user.has_cached_role?(:forum, Forum.first).should be true
       end
 
       it "should return false on strict another forum" do
         @strict_user.has_role?(:forum, Forum.last).should be false
+        @strict_user.has_cached_role?(:forum, Forum.last).should be false
       end
 
       it "should return true if user has role on Forum model" do
         @strict_user.has_role?(:forum, Forum).should be true
+        @strict_user.has_cached_role?(:forum, Forum).should be true
       end
 
       it "should return true if user has role any forum name" do
         @strict_user.has_role?(:forum, :any).should be true
+        @strict_user.has_cached_role?(:forum, :any).should be true
       end
 
       it "should return false when deleted role on Forum model" do
         @strict_user.remove_role(:forum, Forum)
         @strict_user.has_role?(:forum, Forum).should be false
+        @strict_user.has_cached_role?(:forum, Forum).should be false
       end
     end
   end

data/spec/rolify/shared_examples/shared_examples_for_has_role.rb

@@ -3,10 +3,16 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
     context "with a global role", :scope => :global do
       it { subject.has_role?("admin".send(param_method)).should be_truthy }
 
+      it { subject.has_cached_role?("admin".send(param_method)).should be_truthy }
+
       context "on resource request" do
         it { subject.has_role?("admin".send(param_method), Forum.first).should be_truthy }
         it { subject.has_role?("admin".send(param_method), Forum).should be_truthy }
         it { subject.has_role?("admin".send(param_method), :any).should be_truthy }
+
+        it { subject.has_cached_role?("admin".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("admin".send(param_method), Forum).should be_truthy }
+        it { subject.has_cached_role?("admin".send(param_method), :any).should be_truthy }
       end
 
       context "with another global role" do
@@ -14,19 +20,29 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
         it { subject.has_role?("global".send(param_method)).should be_falsey }
         it { subject.has_role?("global".send(param_method), :any).should be_falsey }
+
+        it { subject.has_cached_role?("global".send(param_method)).should be_falsey }
+        it { subject.has_cached_role?("global".send(param_method), :any).should be_falsey }
       end
 
       it "should not get an instance scoped role" do
         subject.has_role?("moderator".send(param_method), Group.first).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method), Group.first).should be_falsey
       end
 
       it "should not get a class scoped role" do
         subject.has_role?("manager".send(param_method), Forum).should be_falsey
+
+        subject.has_cached_role?("manager".send(param_method), Forum).should be_falsey
       end
 
       context "using inexisting role" do
         it { subject.has_role?("dummy".send(param_method)).should be_falsey }
         it { subject.has_role?("dumber".send(param_method), Forum.first).should be_falsey }
+
+        it { subject.has_cached_role?("dummy".send(param_method)).should be_falsey }
+        it { subject.has_cached_role?("dumber".send(param_method), Forum.first).should be_falsey }
       end
     end
 
@@ -35,15 +51,23 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
         it { subject.has_role?("manager".send(param_method), Forum).should be_truthy }
         it { subject.has_role?("manager".send(param_method), Forum.first).should be_truthy }
         it { subject.has_role?("manager".send(param_method), :any).should be_truthy }
+
+        it { subject.has_cached_role?("manager".send(param_method), Forum).should be_truthy }
+        it { subject.has_cached_role?("manager".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("manager".send(param_method), :any).should be_truthy }
       end
 
       it "should not get a scoped role when asking for a global" do
         subject.has_role?("manager".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("manager".send(param_method)).should be_falsey
       end
 
       it "should not get a global role" do
         role_class.create(:name => "admin")
         subject.has_role?("admin".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("admin".send(param_method)).should be_falsey
       end
 
       context "with another class scoped role" do
@@ -52,6 +76,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource with the same name" do
@@ -59,6 +86,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("manager".send(param_method), Group).should be_falsey }
           it { subject.has_role?("manager".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("manager".send(param_method), Group).should be_falsey }
+          it { subject.has_cached_role?("manager".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource with another name" do
@@ -66,12 +96,18 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("defenders".send(param_method), Group).should be_falsey }
           it { subject.has_role?("defenders".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("defenders".send(param_method), Group).should be_falsey }
+          it { subject.has_cached_role?("defenders".send(param_method), :any).should be_falsey }
         end
       end
 
       context "using inexisting role" do
         it { subject.has_role?("dummy".send(param_method), Forum).should be_falsey }
         it { subject.has_role?("dumber".send(param_method)).should be_falsey }
+
+        it { subject.has_cached_role?("dummy".send(param_method), Forum).should be_falsey }
+        it { subject.has_cached_role?("dumber".send(param_method)).should be_falsey }
       end
     end
 
@@ -84,19 +120,33 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
           m.add_role("moderator", Forum.first)
           m.has_role?("moderator".send(param_method), :any).should be_truthy
         }
+
+        it { subject.has_cached_role?("moderator".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
+        it {
+          m = subject.class.new
+          m.add_role("moderator", Forum.first)
+          m.has_cached_role?("moderator".send(param_method), :any).should be_truthy
+        }
       end
 
       it "should not get an instance scoped role when asking for a global" do
         subject.has_role?("moderator".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method)).should be_falsey
       end
 
       it "should not get an instance scoped role when asking for a class scoped" do 
         subject.has_role?("moderator".send(param_method), Forum).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method), Forum).should be_falsey
       end
 
       it "should not get a global role" do
         role_class.create(:name => "admin")
         subject.has_role?("admin".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("admin".send(param_method)).should be_falsey
       end
 
       context "with another instance scoped role" do
@@ -105,6 +155,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum.first).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum.first).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource of the same type but with the same role name" do
@@ -112,6 +165,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("moderator".send(param_method), Forum.last).should be_falsey }
           it { subject.has_role?("moderator".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("moderator".send(param_method), Forum.last).should be_falsey }
+          it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource of different type but with the same role name" do
@@ -119,6 +175,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("moderator".send(param_method), Group.last).should be_falsey }
           it { subject.has_role?("moderator".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("moderator".send(param_method), Group.last).should be_falsey }
+          it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource of the same type and with another role name" do
@@ -126,6 +185,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum.last).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum.last).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource of different type and with another role name" do
@@ -133,6 +195,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Group.first).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Group.first).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "codeclimate-test-reporter"
+
 CodeClimate::TestReporter.start
 
 require 'rubygems'
@@ -11,6 +12,8 @@ begin
   require 'its'
 rescue LoadError
 end
+require 'database_cleaner'
+
 require 'coveralls'
 Coveralls.wear_merged!
 
@@ -19,10 +22,7 @@ ENV['ADAPTER'] ||= 'active_record'
 load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"
 load File.dirname(__FILE__) + '/support/data.rb'
 
-begin
-  require 'pry'
-rescue LoadError
-end
+
 
 def reset_defaults
   Rolify.use_defaults
@@ -47,3 +47,17 @@ def silence_warnings(&block)
   $VERBOSE = warn_level
   result
 end
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.start
+  end
+
+  config.after(:suite) do |example|
+    DatabaseCleaner.clean
+  end
+
+end

data/spec/support/adapters/active_record.rb

@@ -1,7 +1,8 @@
-require 'active_record'
+load File.dirname(__FILE__) + '/utils/active_record.rb'
+
+extend_rspec_with_activerecord_specific_matchers
+establish_connection
 
-RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.extend Rolify
 
 load File.dirname(__FILE__) + '/../schema.rb'

data/spec/support/adapters/mongoid.rb

@@ -1,6 +1,11 @@
-require 'mongoid'
+load File.dirname(__FILE__) + '/utils/mongoid.rb'
 
-Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
+load_mongoid_config
+
+begin
+  Mongo::Logger.logger.level = ::Logger::FATAL
+rescue NameError
+end
 
 ::Mongoid::Document.module_eval do
   def self.included(base)
@@ -13,6 +18,8 @@ Rolify.use_mongoid
 # Standard user and role classes
 class User
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
+
   rolify
 
   field :login, :type => String
@@ -21,6 +28,7 @@ end
 # Standard user and role classes
 class StrictUser
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify strict: true
 
   field :login, :type => String
@@ -48,6 +56,7 @@ end
 # Resourcifed and rolifed at the same time
 class HumanResource
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   resourcify :resources
   rolify
 
@@ -74,6 +83,7 @@ end
 # Custom role and class names
 class Customer
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify :role_cname => "Privilege"
 
   field :login, :type => String
@@ -81,6 +91,7 @@ end
 
 class Privilege
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   has_and_belongs_to_many :customers
   belongs_to :resource, :polymorphic => true
   scopify
@@ -100,6 +111,7 @@ end
 module Admin
   class Moderator
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     rolify :role_cname => "Admin::Right"
 
     field :login, :type => String
@@ -107,6 +119,7 @@ module Admin
 
   class Right
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     has_and_belongs_to_many :moderators, :class_name => 'Admin::Moderator'
     belongs_to :resource, :polymorphic => true
     scopify
@@ -126,6 +139,7 @@ end
 # Resources classes
 class Forum
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
@@ -133,6 +147,7 @@ end
 
 class Group
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
@@ -145,6 +160,7 @@ end
 
 class Team
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :team_code, :type => Integer
@@ -153,6 +169,7 @@ end
 
 class Organization
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
 end
 
 class Company < Organization

data/spec/support/adapters/mongoid_4.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: godfather
+      hosts:
+        - localhost:27017

data/spec/support/adapters/mongoid_5.yml

@@ -0,0 +1,6 @@
+test:
+  clients:
+    default:
+      database: godfather
+      hosts:
+        - localhost:27017

data/spec/support/adapters/utils/active_record.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :database => ":memory:"
+  )
+end
+
+def extend_rspec_with_activerecord_specific_matchers
+  RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
+end

data/spec/support/adapters/utils/mongoid.rb

@@ -0,0 +1,13 @@
+require 'mongoid'
+
+def mongoid_major_version
+  Mongoid::VERSION.split('.').first.to_i
+end
+
+def mongoid_config
+  "spec/support/adapters/mongoid_#{mongoid_major_version}.yml"
+end
+
+def load_mongoid_config
+  Mongoid.load!(mongoid_config, :test)
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Florent Monbillard
+- Wellington Cordeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -16,61 +17,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '3.4'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
 email:
 - f.monbillard@gmail.com
+- wellington@wellingtoncordeiro.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -117,6 +119,7 @@ files:
 - lib/rolify/version.rb
 - rolify.gemspec
 - spec/README.rdoc
+- spec/common_helper.rb
 - spec/generators/rolify/rolify_activerecord_generator_spec.rb
 - spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
@@ -145,7 +148,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid.yml
+- spec/support/adapters/mongoid_3.yml
+- spec/support/adapters/mongoid_4.yml
+- spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/utils/active_record.rb
+- spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb
 - spec/support/schema.rb
 - spec/support/stream_helpers.rb
@@ -169,12 +176,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Roles library with resource scoping
 test_files:
 - spec/README.rdoc
+- spec/common_helper.rb
 - spec/generators/rolify/rolify_activerecord_generator_spec.rb
 - spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
@@ -203,7 +211,11 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid.yml
+- spec/support/adapters/mongoid_3.yml
+- spec/support/adapters/mongoid_4.yml
+- spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/utils/active_record.rb
+- spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb
 - spec/support/schema.rb
 - spec/support/stream_helpers.rb