Merge branch 'master' into master

.travis.yml

@@ -11,60 +11,34 @@ script: bundle exec rake
 after_success:
   - bundle exec codeclimate-test-reporter
 
-matrix:
-  include:
-    - rvm: 2.5.1
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.4.4
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.3.7
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.10
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
+rvm:
+  - 2.6.1
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+
+gemfile:
+  - gemfiles/activerecord_4.gemfile
+  - gemfiles/activerecord_5.gemfile
+  - gemfiles/mongoid_6.gemfile
+  - gemfiles/mongoid_7.gemfile
+
+env: 
+  - ADAPTER=active_record
+  - ADAPTER=mongoid
 
-    - rvm: 2.5.1
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.4.4
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.3.7
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.10
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-
-    - rvm: 2.5.1
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.4.4
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.3.7
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.2.10
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-
-    - rvm: 2.5.1
-      gemfile: gemfiles/mongoid_5.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.4.4
-      gemfile: gemfiles/mongoid_5.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.3.7
-      gemfile: gemfiles/mongoid_5.gemfile
+matrix:
+  exclude:
+    - gemfile: gemfiles/activerecord_4.gemfile
       env: ADAPTER=mongoid
-    - rvm: 2.2.10
-      gemfile: gemfiles/mongoid_5.gemfile
+    - gemfile: gemfiles/activerecord_5.gemfile
       env: ADAPTER=mongoid
-
+    - gemfile: gemfiles/mongoid_6.gemfile
+      env: ADAPTER=active_record
+    - gemfile: gemfiles/mongoid_7.gemfile
+      env: ADAPTER=active_record
+  allow_failures:
+    - env: ADAPTER=mongoid
 
 services: mongodb
 

Appraisals

@@ -1,20 +1,20 @@
-appraise 'mongoid-4' do
-  gem "mongoid", "~> 4"
+appraise 'mongoid-6' do
+  gem "mongoid", "~> 6"
   gem "bson_ext", :platform => "ruby"
 end
 
-appraise 'mongoid-5' do
-  gem "mongoid", "~> 5"
+appraise 'mongoid-7' do
+  gem "mongoid", "~> 7"
   gem "bson_ext", :platform => "ruby"
 end
 
 appraise 'activerecord-4' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 4.2.5", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6", :platform => "ruby"
+  gem "activerecord", "~> 4.2.11", :require => "active_record"
 end
 
 appraise 'activerecord-5' do
-  gem "sqlite3", :platform => "ruby"
+  gem "sqlite3", "~> 1.3.6", :platform => "ruby"
   gem "activerecord", ">= 5.2.0", :require => "active_record"
 
   # Ammeter dependencies:

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://coveralls.io/repos/RolifyCommunity/rolify/badge.svg?branch=master&service=github)](https://coveralls.io/github/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) [![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.
 
@@ -181,6 +181,17 @@ user.has_role? :moderator, Forum.last
 => true
 ```
 
+To check if a user has the exact role scoped to a resource class:
+
+```ruby
+user = User.find(5)
+user.add_role :moderator # sets a global role
+user.has_role? :moderator, Forum.first
+=> true
+user.has_strict_role? :moderator, Forum.last
+=> false
+```
+
 ### 6. Resource roles querying
 
 Starting from rolify 3.0, you can search roles on instance level or class level resources.

gemfiles/activerecord_4.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
-gem "activerecord", "~> 4.2.5", require: "active_record"
+gem "sqlite3", "~> 1.3.6", platform: "ruby"
+gem "activerecord", "~> 4.2.11", require: "active_record"
 
 group :test do
   gem "appraisal"

gemfiles/activerecord_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
+gem "sqlite3", "~> 1.3.6", platform: "ruby"
 gem "activerecord", ">= 5.2.0", require: "active_record"
 gem "actionpack", ">= 5.2.0"
 gem "activemodel", ">= 5.2.0"

gemfiles/mongoid_5.gemfile → gemfiles/mongoid_6.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 5"
+gem "mongoid", "~> 6"
 gem "bson_ext", platform: "ruby"
 
 group :test do

gemfiles/mongoid_4.gemfile → gemfiles/mongoid_7.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4"
+gem "mongoid", "~> 7"
 gem "bson_ext", platform: "ruby"
 
 group :test do

lib/rolify/adapters/active_record/resource_adapter.rb

@@ -40,7 +40,7 @@ def applied_roles(relation, children)
 
       def all_except(resource, excluded_obj)
         prime_key = resource.primary_key.to_sym
-        resource.where(prime_key => (resource.all - excluded_obj).map(&prime_key))
+        resource.where.not(prime_key => excluded_obj.pluck(prime_key))
       end
 
       private

lib/rolify/adapters/active_record/role_adapter.rb

@@ -68,19 +68,13 @@ def exists?(relation, column)
       end
 
       def scope(relation, conditions)
-        if Rails.version < "4.0"
-          query = relation.scoped
-        else
-          query = relation.all
-        end
-        query = query.joins(:roles)
+        query = relation.joins(:roles)
         query = where(query, conditions)
         query
       end
 
       def all_except(user, excluded_obj)
-        prime_key = user.primary_key.to_sym
-        user.where(prime_key => (user.all - excluded_obj).map(&prime_key))
+        user.where.not(user.primary_key => excluded_obj)
       end
 
       private

lib/rolify/role.rb

@@ -86,7 +86,7 @@ def remove_role(role_name, resource = nil)
     deprecate :has_no_role, :remove_role
 
     def roles_name
-      self.roles.select(:name).map { |r| r.name }
+      self.roles.pluck(:name)
     end
 
     def method_missing(method, *args, &block)

rolify.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_development_dependency 'ammeter',     '~> 1.1' # Spec generator
-  s.add_development_dependency 'bundler',     '~> 1.13' # packaging feature
-  s.add_development_dependency 'rake',        '~> 11.3' # Tasks manager
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'bundler',     '~> 2.0' # packaging feature
+  s.add_development_dependency 'rake',        '~> 12.3' # Tasks manager
+  s.add_development_dependency 'rspec-rails', '~> 3.8'
 end

spec/support/adapters/mongoid_3.yml → spec/support/adapters/mongoid_7.yml

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