rolify 5.3.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63187a09a4130c5a7f1066f306783ac5c2fba4e54d5f7130e4b60bdc921b7834
-  data.tar.gz: f66383e7b30ead36d1f2dac277cb473dc41479db4656a4bea0ac85f6c6253f69
+  metadata.gz: 548e7372a5619722f724ddf29ced05a3a23f1d13ffc25ee3395121be3b0848f9
+  data.tar.gz: 9841e7f855554d8ab8e8027048d338acf36041a3ed96648f3b523a4b99b3ee0a
 SHA512:
-  metadata.gz: 6e212c338c8f11662d4bf7f267ae4ecf7e9a4206667cf051053cbaf55b72bd9ba08f7022aed3f85737e29919c3b045129bdec8dfb2922dcb1544232583ce6fcd
-  data.tar.gz: e0d2c815832045141b1be4ff76a419704785d57e7195b9c18cafa35885267a4cecd3cf9b11ce7952192317d47ae57115d4831860694227aceb072ac56e5ed9ad
+  metadata.gz: b6b084f10550cea5c75b07a41cc54ccf37d05b879b6e81a7a1ed979e6ce59198728adb5208ff9ab97c62ddee02692d73707a3a2fc0ad99b48d306500986fdfa4
+  data.tar.gz: b99ae9811babb9d719e857704f8491fca157e1fc9949a0be783314938ed0a6e229b4b3f2043060a407ae75251594f0553d9836232459d3d2e0ba2fb70afce6ac

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/activerecord.yml

@@ -0,0 +1,33 @@
+name: activerecord
+on: [push, pull_request]
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        gemfile: [activerecord_4, activerecord_5, activerecord_6]
+        ruby: [2.5.9, 2.6.10, 2.7.7]
+        include:
+          - gemfile: activerecord_7
+            ruby: '3.2'
+          - gemfile: activerecord_7
+            ruby: '3.1'
+          - gemfile: activerecord_7
+            ruby: '3.0'
+          - gemfile: activerecord_6
+            ruby: '3.0'
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      ADAPTER: active_record
+    steps:
+      - uses: actions/checkout@v3
+      - run: sudo apt-get install -y libsqlite3-dev
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run Tests
+        run: |
+          bundle exec rake

data/.github/workflows/mongoid.yml

@@ -0,0 +1,29 @@
+name: mongoid
+on: [push, pull_request]
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    services:
+      mongodb:
+        image: mongo:3.4.23
+        ports:
+          - 27017:27017
+    strategy:
+      matrix:
+        gemfile: [mongoid_5]
+        ruby: [2.5.9, 2.6.10, 2.7.7]
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      ADAPTER: mongoid
+    steps:
+      - uses: actions/checkout@v3
+      - run: sudo apt-get install -y libsqlite3-dev
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run Tests
+        run: |
+          bundle exec rake

data/Appraisals

@@ -1,5 +1,6 @@
 appraise 'mongoid-5' do
   gem "mongoid", "~> 5"
+  gem "mongo", "< 2.17"
   gem "bson_ext", "1.5.1"
   gem 'bigdecimal', '1.4.2'
 end
@@ -29,12 +30,6 @@ appraise 'activerecord-5' do
   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
@@ -45,10 +40,4 @@ appraise 'activerecord-6' do
   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,18 @@
+== 6.0.1
+
+* Fix with_role with :any resource
+
+= 6.0.0 (April 2, 2021)
+
+Breaking changes:
+
+* Support strict <tt>with_role</tt> queries. Note this changes behaviour of with_role when running in strict mode to behave as previously documented. #543 describes the behaviour change.
+* Dropped support for Ruby 2.3 and 2.4
+
+Improvements:
+
+* Updated ActiveRecord adapters implementation of <tt>in</tt> to utilise a subquery instead of two queries
+
 = 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.

data/Gemfile

@@ -1,15 +1,15 @@
 source "https://rubygems.org"
 
 group :test do
-  gem 'appraisal'
-  gem 'coveralls', :require => false
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'coveralls', require: false
+  gem 'database_cleaner', '~> 1.6.2'
   gem 'its'
-  gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3
-  gem '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
+
+  gem 'byebug'
+  gem 'pry'
+  gem 'pry-byebug'
 end
 
 gemspec

data/Rakefile

@@ -15,7 +15,7 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = 'spec/rolify/**/*_spec.rb'
 end
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["CI"]
   task :default => :appraisal
 else
   task :default => [ :spec, 'coveralls:push' ]

data/gemfiles/activerecord_4.gemfile

@@ -7,15 +7,14 @@ gem "activerecord", "~> 4.2.11", require: "active_record"
 gem "bigdecimal", "1.4.2"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/activerecord_5.gemfile

@@ -7,22 +7,16 @@ 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"
-gem "rspec-mocks", github: "rspec/rspec-mocks"
-gem "rspec-support", github: "rspec/rspec-support"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/activerecord_6.gemfile

@@ -3,26 +3,20 @@
 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"
+gem "activerecord", "~> 6.1.0", require: "active_record"
+gem "actionpack", "~> 6.1.0"
+gem "activemodel", "~> 6.1.0"
+gem "railties", "~> 6.1.0"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/activerecord_7.gemfile

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

data/gemfiles/mongoid_5.gemfile

@@ -3,19 +3,19 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 5"
+gem "mongo", "< 2.17"
 gem "bson_ext", "1.5.1"
 gem "bigdecimal", "1.4.2"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/mongoid_6.gemfile

@@ -6,15 +6,14 @@ gem "mongoid", "~> 6"
 gem "bson_ext", "1.5.1"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

data/gemfiles/mongoid_7.gemfile

@@ -7,15 +7,14 @@ gem "bson_ext", "1.5.1"
 gem "railties", "5.2.4.1"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   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
+  gem "byebug"
+  gem "pry"
+  gem "pry-byebug"
 end
 
 gemspec path: "../"

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)}").to_a
+        roles = user.roles.where(:name => role_names).select("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)}")
         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
 

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

@@ -9,14 +9,20 @@ module Rolify
       end
 
       def where_strict(relation, args)
-        return relation.where(:name => args[:name]) if args[:resource].blank?
-        resource = if args[:resource].is_a?(Class)
-                     {class: args[:resource].to_s, id: nil}
-                   else
-                     {class: args[:resource].class.name, id: args[:resource].id}
-                   end
-
-        relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
+        wrap_conditions = relation.name != role_class.name
+
+        conditions = if args[:resource].is_a?(Class)
+                       {:resource_type => args[:resource].to_s, :resource_id => nil }
+                     elsif args[:resource].present?
+                       {:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
+                     else
+                       {}
+                     end
+
+        conditions.merge!(:name => args[:name])
+        conditions = wrap_conditions ? { role_table => conditions } : conditions
+
+        relation.where(conditions)
       end
 
       def find_cached(relation, args)
@@ -67,9 +73,9 @@ module Rolify
         relation.where("#{column} IS NOT NULL")
       end
 
-      def scope(relation, conditions)
+      def scope(relation, conditions, strict)
         query = relation.joins(:roles)
-        query = where(query, conditions)
+        query = strict ? where_strict(query, conditions) : where(query, conditions)
         query
       end
 

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

@@ -9,14 +9,20 @@ module Rolify
       end
 
       def where_strict(relation, args)
-        return relation.where(:name => args[:name]) if args[:resource].blank?
-        resource = if args[:resource].is_a?(Class)
-                     {class: args[:resource].to_s, id: nil}
-                   else
-                     {class: args[:resource].class.name, id: args[:resource].id}
-                   end
-
-        relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
+        wrap_conditions = relation.name != role_class.name
+
+        conditions = if args[:resource].is_a?(Class)
+                       {:resource_type => args[:resource].to_s, :resource_id => nil }
+                     elsif args[:resource].present?
+                       {:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
+                     else
+                       {}
+                     end
+
+        conditions.merge!(:name => args[:name])
+        conditions = wrap_conditions ? { role_table => conditions } : conditions
+
+        relation.where(conditions)
       end
 
       def find_cached(relation, args)
@@ -84,8 +90,9 @@ module Rolify
         relation.where(column.to_sym.ne => nil)
       end
 
-      def scope(relation, conditions)
-        roles = where(role_class, conditions).map { |role| role.id }
+      def scope(relation, conditions, strict)
+        query = strict ? where_strict(role_class, conditions) : where(role_class, conditions)
+        roles = query.map { |role| role.id }
         return [] if roles.size.zero?
         query = relation.any_in(:role_ids => roles)
         query

data/lib/rolify/finders.rb

@@ -1,7 +1,12 @@
 module Rolify
   module Finders
     def with_role(role_name, resource = nil)
-      self.adapter.scope(self, :name => role_name, :resource => resource)
+      strict = self.strict_rolify && resource && resource != :any
+      self.adapter.scope(
+        self,
+        { :name => role_name, :resource => resource },
+        strict
+      )
     end
 
     def without_role(role_name, resource = nil)
@@ -41,4 +46,4 @@ module Rolify
       block.call(users_to_add)
     end
   end
-end
+end

data/lib/rolify/resource.rb

@@ -11,7 +11,7 @@ module Rolify
 
       def with_role(role_name, user = nil)
         if role_name.is_a? Array
-          role_name.map!(&:to_s)
+          role_name = role_name.map(&:to_s)
         else
           role_name = role_name.to_s
         end

data/lib/rolify/version.rb

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

data/rolify.gemspec

@@ -26,9 +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.required_ruby_version = '>= 2.5'
 
   s.add_development_dependency 'ammeter',     '~> 1.1' # Spec generator
+  s.add_development_dependency 'appraisal',   '~> 2.0'
   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'

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -32,7 +32,11 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
         end
       }
       require File.join(destination_root, "app/models/user.rb")
-      run_generator
+      if Rails::VERSION::MAJOR >= 7
+        run_generator %w(--skip-collision-check)
+      else
+        run_generator
+      end
     }
 
     describe 'config/initializers/rolify.rb' do

data/spec/rolify/shared_examples/shared_examples_for_finders.rb

@@ -4,47 +4,70 @@ shared_examples_for :finders do |param_name, param_method|
       it { should respond_to(:with_role).with(1).argument }
       it { should respond_to(:with_role).with(2).arguments }
 
-      context "with a global role" do
-        it { subject.with_role("admin".send(param_method)).should eq([ root ]) }
-        it { subject.with_role("moderator".send(param_method)).should be_empty }
-        it { subject.with_role("visitor".send(param_method)).should be_empty }
-      end
+      context "when resource setting: strict is set to false" do
+        context "with a global role" do
+          it { subject.with_role("admin".send(param_method)).should eq([ root ]) }
+          it { subject.with_role("moderator".send(param_method)).should be_empty }
+          it { subject.with_role("visitor".send(param_method)).should be_empty }
+        end
 
-      context "with a class scoped role" do
-        context "on Forum class" do
-          it { subject.with_role("admin".send(param_method), Forum).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum).should be_empty }
+        context "with a class scoped role" do
+          context "on Forum class" do
+            it { subject.with_role("admin".send(param_method), Forum).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum).should be_empty }
+          end
+
+          context "on Group class" do
+            it { subject.with_role("admin".send(param_method), Group).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Group).should eq([ root ]) }
+            it { subject.with_role("visitor".send(param_method), Group).should be_empty }
+          end
         end
 
-        context "on Group class" do
-          it { subject.with_role("admin".send(param_method), Group).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Group).should eq([ root ]) }
-          it { subject.with_role("visitor".send(param_method), Group).should be_empty }
+        context "with an instance scoped role" do
+          context "on Forum.first instance" do
+            it { subject.with_role("admin".send(param_method), Forum.first).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum.first).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum.first).should be_empty }
+          end
+
+          context "on Forum.last instance" do
+            it { subject.with_role("admin".send(param_method), Forum.last).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum.last).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum.last).should include(root, visitor) } # =~ doesn't pass using mongoid, don't know why...
+          end
+
+          context "on Group.first instance" do
+            it { subject.with_role("admin".send(param_method), Group.first).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Group.first).should eq([ root ]) }
+            it { subject.with_role("visitor".send(param_method), Group.first).should eq([ modo ]) }
+          end
+
+          context "on Company.first_instance" do
+            it { subject.with_role("owner".send(param_method), Company.first).should eq([ owner ]) }
+          end
         end
       end
 
-      context "with an instance scoped role" do
-        context "on Forum.first instance" do
-          it { subject.with_role("admin".send(param_method), Forum.first).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum.first).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum.first).should be_empty }
+      context "when resource setting: strict is set to true" do
+        before(:context) do
+          user_class.strict_rolify = true
         end
-
-        context "on Forum.last instance" do
-          it { subject.with_role("admin".send(param_method), Forum.last).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum.last).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum.last).should include(root, visitor) } # =~ doesn't pass using mongoid, don't know why...
+        after(:context) do
+          user_class.strict_rolify = false
         end
 
-        context "on Group.first instance" do
-          it { subject.with_role("admin".send(param_method), Group.first).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Group.first).should eq([ root ]) }
-          it { subject.with_role("visitor".send(param_method), Group.first).should eq([ modo ]) }
-        end
+        context "with an instance scoped role" do
+          context "on Forum.first instance" do
+            it { subject.with_role("admin".send(param_method), Forum.first).should be_empty }
+            it { subject.with_role("moderator".send(param_method), Forum.first).should be_empty }
+          end
 
-        context "on Company.first_instance" do
-          it { subject.with_role("owner".send(param_method), Company.first).should eq([ owner ]) }
+          context "on any resource" do
+            it { subject.with_role("admin".send(param_method), :any).should_not be_empty }
+            it { subject.with_role("moderator".send(param_method), :any).should_not be_empty }
+          end
         end
       end
     end
@@ -97,7 +120,7 @@ shared_examples_for :finders do |param_name, param_method|
         end
       end
     end
-    
+
 
     describe ".with_all_roles" do
       it { should respond_to(:with_all_roles) }
@@ -128,4 +151,4 @@ shared_examples_for :finders do |param_name, param_method|
       it { subject.with_any_role({ :name => "visitor".send(param_method), :resource => :any }, { :name => "moderator".send(param_method), :resource => :any }).should =~ [ root, modo, visitor ] }
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require "simplecov"
-SimpleCov.start
+require 'coveralls'
+Coveralls.wear_merged!
 
 require 'rubygems'
 require "bundler/setup"
@@ -13,9 +13,6 @@ rescue LoadError
 end
 require 'database_cleaner'
 
-require 'coveralls'
-Coveralls.wear_merged!
-
 ENV['ADAPTER'] ||= 'active_record'
 
 load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Florent Monbillard
 - Wellington Cordeiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,9 +91,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/activerecord.yml"
+- ".github/workflows/mongoid.yml"
 - ".gitignore"
 - ".hakiri.yml"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTORS
@@ -91,6 +107,7 @@ files:
 - gemfiles/activerecord_4.gemfile
 - gemfiles/activerecord_5.gemfile
 - gemfiles/activerecord_6.gemfile
+- gemfiles/activerecord_7.gemfile
 - gemfiles/mongoid_5.gemfile
 - gemfiles/mongoid_6.gemfile
 - gemfiles/mongoid_7.gemfile
@@ -167,7 +184,7 @@ homepage: https://github.com/RolifyCommunity/rolify
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -175,15 +192,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Roles library with resource scoping
 test_files:

data/.travis.yml

@@ -1,58 +0,0 @@
-language: ruby
-
-before_install:
-  - gem update --system
-  - gem install bundler
-  - gem --version
-
-script: bundle exec rake
-
-after_success:
-  - bundle exec codeclimate-test-reporter
-
-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
-
-matrix:
-  exclude:
-    - gemfile: gemfiles/activerecord_4.gemfile
-      env: ADAPTER=mongoid
-    - gemfile: gemfiles/activerecord_5.gemfile
-      env: ADAPTER=mongoid
-    - 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
-
-addons:
-  code_climate:
-    repo_token: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee