rolify 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd31510680fda8c2bbb43eb49688f9d169d99780
-  data.tar.gz: bc4fd8fd415cc8c45b333c116f75c83a074c77e0
+SHA256:
+  metadata.gz: 63187a09a4130c5a7f1066f306783ac5c2fba4e54d5f7130e4b60bdc921b7834
+  data.tar.gz: f66383e7b30ead36d1f2dac277cb473dc41479db4656a4bea0ac85f6c6253f69
 SHA512:
-  metadata.gz: ca50a30cd8d60796b6be7d21b26d8bfc6841627623592899f778e56e144c75ff607d7b2263e691452e2613d3fe6f8cf950841fb52b6cf132feb033ad4dce8f71
-  data.tar.gz: 2d914c23c63900d12eded794a0b1ced812d0815987b42c31c9d83c784f4f7fcfbcb992efad429f533b2b2dc31e2da5d6bb39ba7d8063fc8e5170fd6f759ca6a8
+  metadata.gz: 6e212c338c8f11662d4bf7f267ae4ecf7e9a4206667cf051053cbaf55b72bd9ba08f7022aed3f85737e29919c3b045129bdec8dfb2922dcb1544232583ce6fcd
+  data.tar.gz: e0d2c815832045141b1be4ff76a419704785d57e7195b9c18cafa35885267a4cecd3cf9b11ce7952192317d47ae57115d4831860694227aceb072ac56e5ed9ad

data/.hakiri.yml

@@ -0,0 +1 @@
+dependency_source: gemspec_file

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-sudo: false
 
 before_install:
   - gem update --system
@@ -11,80 +10,46 @@ script: bundle exec rake
 after_success:
   - bundle exec codeclimate-test-reporter
 
-matrix:
-  include:
-    - rvm: 2.3.0
-      gemfile: gemfiles/activerecord_3.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.4
-      gemfile: gemfiles/activerecord_3.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.1.8
-      gemfile: gemfiles/activerecord_3.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.0.0
-      gemfile: gemfiles/activerecord_3.gemfile
-      env: ADAPTER=active_record
+rvm:
+  - 2.7.0
+  - 2.6.3
+  - 2.5.5
+  - 2.4.6
+  - 2.3.8
+
+gemfile:
+  - gemfiles/activerecord_4.gemfile
+  - gemfiles/activerecord_5.gemfile
+  - gemfiles/activerecord_6.gemfile
+  - gemfiles/mongoid_5.gemfile
+  - gemfiles/mongoid_6.gemfile
+  - gemfiles/mongoid_7.gemfile
+
+env:
+  - ADAPTER=active_record
+  - ADAPTER=mongoid
 
-    - rvm: 2.3.0
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.4
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.1.8
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.0.0
-      gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=active_record
-
-    - rvm: 2.3.0
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-    - rvm: 2.2.4
-      gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=active_record
-
-    - rvm: 2.3.0
-      gemfile: gemfiles/mongoid_3.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.2.4
-      gemfile: gemfiles/mongoid_3.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.1.8
-      gemfile: gemfiles/mongoid_3.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.0.0
-      gemfile: gemfiles/mongoid_3.gemfile
-      env: ADAPTER=mongoid
-
-    - rvm: 2.3.0
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.2.4
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.1.8
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.0.0
-      gemfile: gemfiles/mongoid_4.gemfile
-      env: ADAPTER=mongoid
-
-    - rvm: 2.3.0
-      gemfile: gemfiles/mongoid_5.gemfile
-      env: ADAPTER=mongoid
-    - rvm: 2.2.4
-      gemfile: gemfiles/mongoid_5.gemfile
+matrix:
+  exclude:
+    - gemfile: gemfiles/activerecord_4.gemfile
       env: ADAPTER=mongoid
-    - rvm: 2.1.8
-      gemfile: gemfiles/mongoid_5.gemfile
+    - gemfile: gemfiles/activerecord_5.gemfile
       env: ADAPTER=mongoid
-    - rvm: 2.0.0
-      gemfile: gemfiles/mongoid_5.gemfile
+    - gemfile: gemfiles/activerecord_6.gemfile
       env: ADAPTER=mongoid
-
+    - gemfile: gemfiles/activerecord_6.gemfile
+      rvm: 2.4.6
+    - gemfile: gemfiles/activerecord_6.gemfile
+      rvm: 2.3.8
+    - gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=active_record
+    - gemfile: gemfiles/mongoid_6.gemfile
+      env: ADAPTER=active_record
+    - gemfile: gemfiles/mongoid_7.gemfile
+      env: ADAPTER=active_record
+  allow_failures:
+    - gemfile: gemfiles/mongoid_6.gemfile
+    - gemfile: gemfiles/mongoid_7.gemfile
 
 services: mongodb
 

data/Appraisals

@@ -1,41 +1,54 @@
-appraise 'mongoid-3' do
-  gem "mongoid", "~> 3"
-  gem "bson_ext", :platform => "ruby"
-end
-
-appraise 'mongoid-4' do
-  gem "mongoid", "~> 4"
-  gem "bson_ext", :platform => "ruby"
-end
-
 appraise 'mongoid-5' do
   gem "mongoid", "~> 5"
-  gem "bson_ext", :platform => "ruby"
+  gem "bson_ext", "1.5.1"
+  gem 'bigdecimal', '1.4.2'
 end
 
-appraise 'activerecord-3' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 3.2.0", :require => "active_record"
+appraise 'mongoid-6' do
+  gem "mongoid", "~> 6"
+  gem "bson_ext", "1.5.1"
+end
+
+appraise 'mongoid-7' do
+  gem "mongoid", "~> 7"
+  gem "bson_ext", "1.5.1"
+  gem "railties", "5.2.4.1"
 end
 
 appraise 'activerecord-4' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 4.2.5", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6"
+  gem "activerecord", "~> 4.2.11", :require => "active_record"
+  gem 'bigdecimal', '1.4.2'
 end
 
 appraise 'activerecord-5' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6"
+  gem "activerecord", "~> 5.2.4", :require => "active_record"
 
   # Ammeter dependencies:
-  gem "actionpack", ">= 5.0.0.beta2"
-  gem "activemodel", ">= 5.0.0.beta2"
-  gem "railties", ">= 5.0.0.beta2"
+  gem "actionpack", "~> 5.2.4"
+  gem "activemodel", "~> 5.2.4"
+  gem "railties", "~> 5.2.4"
 
   gem 'rspec-rails'       , github: 'rspec/rspec-rails'
   gem 'rspec-core'        , github: 'rspec/rspec-core'
   gem 'rspec-expectations', github: 'rspec/rspec-expectations'
   gem 'rspec-mocks'       , github: 'rspec/rspec-mocks'
   gem 'rspec-support'     , github: 'rspec/rspec-support'
+end
+
+appraise 'activerecord-6' do
+  gem "sqlite3", "~> 1.4", :platform => "ruby"
+  gem "activerecord", ">= 6.0.0", :require => "active_record"
 
+  # Ammeter dependencies:
+  gem "actionpack", ">= 6.0.0"
+  gem "activemodel", ">= 6.0.0"
+  gem "railties", ">= 6.0.0"
+
+  gem 'rspec-rails'       , github: 'rspec/rspec-rails'
+  gem 'rspec-core'        , github: 'rspec/rspec-core'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
+  gem 'rspec-mocks'       , github: 'rspec/rspec-mocks'
+  gem 'rspec-support'     , github: 'rspec/rspec-support'
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= 5.3.0 (June 1, 2020)
+
+5.3.0 will be the last version to support Ruby < 2.5 and Rails < 5.2. Support for these will be dropped in the next major release.
+
+* Fix deprecation warning in Ruby 2.7
+* Add Rails 6 support to migration generator
+* Significant ActiveRecord performance improvements to <tt>add_role</tt> and <tt>without_role</tt>
+* Mongoid fix and performance improvement and to <tt>roles_name</tt>
+* Make it safe to call <tt>Thing.with_role(:admin, user)</tt> with new record
+
 = 5.2.0 (Dec 14, 2017)
 * Fix regression in generator around belongs_to options compatibility
 * Update version of database_cleaner
@@ -126,7 +136,7 @@
 * fixed a backward incompatible change introduced in Rails 3.2 release (<tt>find_or_create_by_* generated methods</tt>)
 
 = 2.2 (Jan 18, 2012)
-* fixed a bug in the initializer file regarding dynamic shortcuts 
+* fixed a bug in the initializer file regarding dynamic shortcuts
 
 = 2.1 (Nov 30, 2011)
 * added syntactic sugar: <tt>grant</tt> and <tt>revoke</tt> are aliases for <tt>has_role</tt> and <tt>has_no_role</tt>
@@ -167,8 +177,8 @@
 
 = 1.0 (Aug 25, 2011)
 * added a new parameter to disable dynamic shortcut methods due to potential incompatibility with other gems using method_missing with the same pattern
-  * add <tt>Rolify.dynamic_shortcuts = false</tt> in the initializer file or 
-  * use the generator command with a third parameter: 
+  * add <tt>Rolify.dynamic_shortcuts = false</tt> in the initializer file or
+  * use the generator command with a third parameter:
     * <tt>rails g rolify:role Role User false</tt>
 * removed the railtie as it created more problems than it solved
 * code refactoring to do some speed improvements and code clean up
@@ -177,16 +187,16 @@
 * rolify is now on travis-ci to monitor build status
 
 = 0.7 (June 20, 2011)
-* added a method_missing to catch newly created role outside the current ruby process (i.e. dynamic shortcut methods are not defined within this process) 
-  * dynamic shortcut is created on the fly in the method_missing to avoid extra method_missing for the same dynamic shortcut 
-  * check if the role actually exists in the database before defining the new method 
+* added a method_missing to catch newly created role outside the current ruby process (i.e. dynamic shortcut methods are not defined within this process)
+  * dynamic shortcut is created on the fly in the method_missing to avoid extra method_missing for the same dynamic shortcut
+  * check if the role actually exists in the database before defining the new method
   * first call is slower due to method_missing but next calls are fast
   * avoid strange bugs when spawning many ruby processes as the dynamic shortcut methods were only defined in the process that used the <tt>has_role</tt> command
 
 = 0.6 (June 19, 2011)
 * custom User and Role class names support
   * can now use other class names for Role and User classes
-  * fixed generators and templates 
+  * fixed generators and templates
   * join table is explicitly set to avoid alphabetical order issue
 * created a new railtie to load the dynamic shortcuts at startup
 
@@ -208,7 +218,7 @@
   * Trying to remove a role scoped to a resource whereas the user has a global role won't remove it
 
 = v0.3 (June 06, 2011)
-* multiple roles check: 
+* multiple roles check:
   * <tt>has_all_roles?</tt> returns true if the user has ALL the roles in arguments
   * <tt>has_any_role?</tt> returns true if the user has ANY the roles in arguments
 

data/Gemfile

@@ -4,8 +4,9 @@ group :test do
   gem 'appraisal'
   gem 'coveralls', :require => false
   gem 'its'
+  gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3
   gem 'byebug'
-  gem 'pry-byebug'
+  gem 'pry-byebug', '< 3.8.0'
   gem 'test-unit' # Implicitly loaded by ammeter
   gem 'database_cleaner', '~> 1.6.2'
   gem 'codeclimate-test-reporter', :require => nil

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://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://travis-ci.org/RolifyCommunity/rolify.svg)](http://travis-ci.org/RolifyCommunity/rolify) [![Code Climate](https://codeclimate.com/github/RolifyCommunity/rolify.svg)](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.
 
@@ -15,9 +15,9 @@ This library can be easily integrated with any authentication gem ([devise](http
 
 ## Requirements
 
-* 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)
+* Rails >= 4.2
+* ActiveRecord >= 4.2 <b>or</b> Mongoid >= 4.0
+* supports ruby 2.2+, 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
@@ -46,7 +46,7 @@ rails g rolify Role User
 rails g rolify:role Role User
 ```
 
-The generator will create your Role model, add a migration file, and update your User class with new class methods. 
+The generator will create your Role model, add a migration file, and update your User class with new class methods.
 
 ### 2. Run the migration (only required when using ActiveRecord)
 
@@ -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.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
+require 'appraisal'
 
 Bundler::GemHelper.install_tasks
 

data/gemfiles/activerecord_4.gemfile

@@ -2,15 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
-gem "activerecord", "~> 4.2.5", require: "active_record"
+gem "sqlite3", "~> 1.3.6"
+gem "activerecord", "~> 4.2.11", require: "active_record"
+gem "bigdecimal", "1.4.2"
 
 group :test do
   gem "appraisal"
   gem "coveralls", require: false
   gem "its"
+  gem "pry", "< 0.13.0"
   gem "byebug"
-  gem "pry-byebug"
+  gem "pry-byebug", "< 3.8.0"
   gem "test-unit"
   gem "database_cleaner", "~> 1.6.2"
   gem "codeclimate-test-reporter", require: nil

data/gemfiles/activerecord_5.gemfile

@@ -2,11 +2,11 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", platform: "ruby"
-gem "activerecord", ">= 5.0.0.beta", require: "active_record"
-gem "actionpack", ">= 5.0.0.beta2"
-gem "activemodel", ">= 5.0.0.beta2"
-gem "railties", ">= 5.0.0.beta2"
+gem "sqlite3", "~> 1.3.6"
+gem "activerecord", "~> 5.2.4", require: "active_record"
+gem "actionpack", "~> 5.2.4"
+gem "activemodel", "~> 5.2.4"
+gem "railties", "~> 5.2.4"
 gem "rspec-rails", github: "rspec/rspec-rails"
 gem "rspec-core", github: "rspec/rspec-core"
 gem "rspec-expectations", github: "rspec/rspec-expectations"
@@ -17,8 +17,9 @@ group :test do
   gem "appraisal"
   gem "coveralls", require: false
   gem "its"
+  gem "pry", "< 0.13.0"
   gem "byebug"
-  gem "pry-byebug"
+  gem "pry-byebug", "< 3.8.0"
   gem "test-unit"
   gem "database_cleaner", "~> 1.6.2"
   gem "codeclimate-test-reporter", require: nil

data/gemfiles/activerecord_6.gemfile

@@ -0,0 +1,28 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.4", platform: "ruby"
+gem "activerecord", ">= 6.0.0", require: "active_record"
+gem "actionpack", ">= 6.0.0"
+gem "activemodel", ">= 6.0.0"
+gem "railties", ">= 6.0.0"
+gem "rspec-rails", github: "rspec/rspec-rails"
+gem "rspec-core", github: "rspec/rspec-core"
+gem "rspec-expectations", github: "rspec/rspec-expectations"
+gem "rspec-mocks", github: "rspec/rspec-mocks"
+gem "rspec-support", github: "rspec/rspec-support"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", require: false
+  gem "its"
+  gem "pry", "< 0.13.0"
+  gem "byebug"
+  gem "pry-byebug", "< 3.8.0"
+  gem "test-unit"
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
+end
+
+gemspec path: "../"

data/gemfiles/mongoid_5.gemfile

@@ -3,14 +3,16 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 5"
-gem "bson_ext", platform: "ruby"
+gem "bson_ext", "1.5.1"
+gem "bigdecimal", "1.4.2"
 
 group :test do
   gem "appraisal"
   gem "coveralls", require: false
   gem "its"
+  gem "pry", "< 0.13.0"
   gem "byebug"
-  gem "pry-byebug"
+  gem "pry-byebug", "< 3.8.0"
   gem "test-unit"
   gem "database_cleaner", "~> 1.6.2"
   gem "codeclimate-test-reporter", require: nil

data/gemfiles/{mongoid_3.gemfile → mongoid_6.gemfile}

@@ -2,15 +2,16 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 3"
-gem "bson_ext", platform: "ruby"
+gem "mongoid", "~> 6"
+gem "bson_ext", "1.5.1"
 
 group :test do
   gem "appraisal"
   gem "coveralls", require: false
   gem "its"
+  gem "pry", "< 0.13.0"
   gem "byebug"
-  gem "pry-byebug"
+  gem "pry-byebug", "< 3.8.0"
   gem "test-unit"
   gem "database_cleaner", "~> 1.6.2"
   gem "codeclimate-test-reporter", require: nil

data/gemfiles/{mongoid_4.gemfile → mongoid_7.gemfile}

@@ -2,15 +2,17 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4"
-gem "bson_ext", platform: "ruby"
+gem "mongoid", "~> 7"
+gem "bson_ext", "1.5.1"
+gem "railties", "5.2.4.1"
 
 group :test do
   gem "appraisal"
   gem "coveralls", require: false
   gem "its"
+  gem "pry", "< 0.13.0"
   gem "byebug"
-  gem "pry-byebug"
+  gem "pry-byebug", "< 3.8.0"
   gem "test-unit"
   gem "database_cleaner", "~> 1.6.2"
   gem "codeclimate-test-reporter", require: nil

data/lib/generators/active_record/rolify_generator.rb

@@ -82,12 +82,12 @@ Please ensure that this model exists and is not mis-spelled and re-run the gener
 MSG
       end
 
-      def rails5?
-        Rails.version.start_with? '5'
+      def versioned_migrations?
+        Rails::VERSION::MAJOR >= 5
       end
 
       def migration_version
-        if rails5?
+        if versioned_migrations?
           "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
         end
       end

data/lib/generators/active_record/templates/model.rb

@@ -1,16 +1,15 @@
-has_and_belongs_to_many :<%= user_class.table_name %>, :join_table => :<%= join_table %>
+  has_and_belongs_to_many :<%= user_class.table_name %>, :join_table => :<%= join_table %>
+  <% if Rails::VERSION::MAJOR < 5 %>
+  belongs_to :resource,
+             :polymorphic => true
+  <% else %>
+  belongs_to :resource,
+             :polymorphic => true,
+             :optional => true
+  <% end %>
 
-<% if Rails::VERSION::MAJOR < 5 %>
-belongs_to :resource,
-           :polymorphic => true
-<% else %>
-belongs_to :resource,
-           :polymorphic => true,
-           :optional => true
-<% end %>
+  validates :resource_type,
+            :inclusion => { :in => Rolify.resource_types },
+            :allow_nil => true
 
-validates :resource_type,
-          :inclusion => { :in => Rolify.resource_types },
-          :allow_nil => true
-
-scopify
+  scopify

data/lib/rolify.rb

@@ -27,7 +27,7 @@ module Rolify
     rolify_options.merge!({ :join_table => self.role_join_table_name }) if Rolify.orm == "active_record"
     rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove, :inverse_of ].include? k.to_sym })
 
-    has_and_belongs_to_many :roles, rolify_options
+    has_and_belongs_to_many :roles, **rolify_options
 
     self.adapter = Rolify::Adapter::Base.create("role_adapter", self.role_cname, self.name)
 
@@ -48,7 +48,7 @@ module Rolify
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
-    has_many association_name, resourcify_options
+    has_many association_name, **resourcify_options
 
     self.resource_adapter = Rolify::Adapter::Base.create("resource_adapter", self.role_cname, self.name)
     @@resource_types << self.name

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

@@ -26,7 +26,7 @@ module Rolify
       end
 
       def in(relation, user, role_names)
-        roles = user.roles.where(:name => role_names).select("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)}")
+        roles = user.roles.where(:name => role_names).select("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)}").to_a
         relation.where("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)} IN (?) AND ((#{quote_table(role_class.table_name)}.resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)}) OR (#{quote_table(role_class.table_name)}.resource_id IS NULL))", roles)
       end
 
@@ -40,7 +40,7 @@ module Rolify
 
       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

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

@@ -46,7 +46,7 @@ module Rolify
       end
 
       def add(relation, role)
-        relation.role_ids |= [role.id]
+        relation.roles << role unless relation.roles.include?(role)
       end
 
       def remove(relation, role_name, resource = nil)
@@ -68,19 +68,13 @@ module Rolify
       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

data/lib/rolify/role.rb

@@ -86,7 +86,7 @@ module Rolify
     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)

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "5.2.0"
+  VERSION = "5.3.0"
 end

data/rolify.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.version     = Rolify::VERSION
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'https://github.com/RolifyCommunity/rolify'
-  s.rubyforge_project = s.name
 
   s.license     = 'MIT'
 
@@ -27,8 +26,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.3'
+
   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'
+  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

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -71,6 +71,7 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should contain "validates :resource_type,\n"
                           "          :inclusion => { :in => Rolify.resource_types },\n"
                           "          :allow_nil => true" }
+      it { should contain "scopify" }
     end
 
     describe 'app/models/user.rb' do
@@ -240,6 +241,13 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should be_a_migration }
       it { should contain "create_table(:admin_roles)" }
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "< ActiveRecord::Migration"
+        else
+          should contain "< ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
 
       context 'mysql2' do
         let(:adapter) { 'Mysql2Adapter' }

data/spec/rolify/utils_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Rolify::Utils do
+  class Harness
+    extend Rolify::Utils
+    define_method(:new_method) { |*_args| true }
+    deprecate :old_method, :new_method
+  end
+
+  let(:harness) { Harness.new }
+
+  context '#deprecate' do
+    it 'calls new method with same arguments' do
+      expect(harness).to receive(:warn).once
+      expect(harness).to receive(:new_method).once.with(1, 2, 3)
+      harness.old_method(1, 2, 3)
+    end
+  end
+end

data/spec/support/adapters/{mongoid_3.yml → mongoid_6.yml}

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

data/spec/support/adapters/{mongoid_4.yml → mongoid_7.yml}

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Florent Monbillard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -31,42 +31,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
@@ -78,6 +78,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hakiri.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.rdoc
@@ -87,15 +88,12 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.rdoc
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-4.0
-- gemfiles/Gemfile.rails-4.1
-- gemfiles/activerecord_3.gemfile
 - gemfiles/activerecord_4.gemfile
 - gemfiles/activerecord_5.gemfile
-- gemfiles/mongoid_3.gemfile
-- gemfiles/mongoid_4.gemfile
+- gemfiles/activerecord_6.gemfile
 - gemfiles/mongoid_5.gemfile
+- gemfiles/mongoid_6.gemfile
+- gemfiles/mongoid_7.gemfile
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
@@ -153,12 +151,13 @@ files:
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_scopes.rb
+- spec/rolify/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid_3.yml
-- spec/support/adapters/mongoid_4.yml
 - spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/mongoid_6.yml
+- spec/support/adapters/mongoid_7.yml
 - spec/support/adapters/utils/active_record.rb
 - spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb
@@ -176,15 +175,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rolify
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Roles library with resource scoping
@@ -216,12 +214,13 @@ test_files:
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_scopes.rb
+- spec/rolify/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid_3.yml
-- spec/support/adapters/mongoid_4.yml
 - spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/mongoid_6.yml
+- spec/support/adapters/mongoid_7.yml
 - spec/support/adapters/utils/active_record.rb
 - spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb

data/gemfiles/Gemfile.rails-3.2

@@ -1,27 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'railties', '~> 3.2', '< 4.0'
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-    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
-
-  gem 'coveralls', :require => false
-end
-
-gemspec :path => '../'

data/gemfiles/Gemfile.rails-4.0

@@ -1,33 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'railties', '~> 4.0.1', '< 4.1'
-  gem 'ammeter'
-  gem 'rake'
-  gem 'rspec'
-  gem 'its'
-  gem 'rspec-rails'
-  gem 'fuubar'
-  gem 'bundler'
-
-  gem 'coveralls', :require => false
-
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord', '~> 4.0.1', :require => 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.5', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-  when 'mongoid'
-    gem 'mongoid', github: 'mongoid/mongoid'
-    gem 'bson_ext', :platform => 'ruby'
-  else
-    raise "Unknown model adapter: #{ENV['ADAPTER']}"
-  end
-end

data/gemfiles/Gemfile.rails-4.1

@@ -1,37 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'rails', github: 'rails/rails', branch: '4-1-stable'
-  # There is currently an active record bug in Rails 4.1.0, this is a workaround until 4.1.1 is released
-  # See https://github.com/rails/rails/issues/13648
-  # Without this patch, Resource.with_role(:role, User.first).count throws an SQL syntax exception
-  #gem 'railties', '~> 4.1.0'
-  gem 'ammeter'
-  gem 'rake'
-  gem 'rspec'
-  gem 'its'
-  gem 'rspec-rails'
-  gem 'fuubar'
-  gem 'bundler'
-
-  gem 'coveralls', :require => false
-
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord', '~> 4.1.0', :require => 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.5', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-  when 'mongoid'
-    gem 'mongoid', github: 'mongoid/mongoid'
-    gem 'bson_ext', :platform => 'ruby'
-  else
-    raise "Unknown model adapter: #{ENV['ADAPTER']}"
-  end
-end

data/gemfiles/activerecord_3.gemfile

@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sqlite3", platform: "ruby"
-gem "activerecord", "~> 3.2.0", require: "active_record"
-
-group :test do
-  gem "appraisal"
-  gem "coveralls", require: false
-  gem "its"
-  gem "byebug"
-  gem "pry-byebug"
-  gem "test-unit"
-  gem "database_cleaner", "~> 1.6.2"
-  gem "codeclimate-test-reporter", require: nil
-end
-
-gemspec path: "../"