rolify 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39183b0e66a9dfdbe636059ec28145106f14347129676c334598ff4f330edfc0
-  data.tar.gz: 686c5b98efcc79e84b104cca586053b920032cbc0bf7978baa0b1caa04e021bb
+  metadata.gz: 548e7372a5619722f724ddf29ced05a3a23f1d13ffc25ee3395121be3b0848f9
+  data.tar.gz: 9841e7f855554d8ab8e8027048d338acf36041a3ed96648f3b523a4b99b3ee0a
 SHA512:
-  metadata.gz: a24f0ef337c8c5d1b9381e30020ba18c790193f4b00085cbd2581f25d6322d5ffeee099a22a43b4b4c86de66a2774364f799426ae71ed331027d5e565a06be72
-  data.tar.gz: b1d55761a7a5df75a9c1f462ca04232c44e81adcc180ece7232386f0c6f4dff0441cc463e674075c5906fc3c3ddcc71922dd20cf2129eecff099fa604db56b94
+  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

@@ -1,5 +1,5 @@
 name: activerecord
-on: [push]
+on: [push, pull_request]
 jobs:
   ubuntu:
     runs-on: ubuntu-latest
@@ -7,21 +7,27 @@ jobs:
     strategy:
       matrix:
         gemfile: [activerecord_4, activerecord_5, activerecord_6]
-        ruby: [2.5.7, 2.6.5, 2.7.2]
+        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@v2
+      - 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 }}
-      - run: sudo apt-get install -y libsqlite3-dev
-      - run: gem update --system
-      - run: gem install bundler
-      - run: gem --version
-      - run: bundle install
+          bundler-cache: true
       - name: Run Tests
         run: |
           bundle exec rake

data/.github/workflows/mongoid.yml

@@ -1,5 +1,5 @@
 name: mongoid
-on: [push]
+on: [push, pull_request]
 jobs:
   ubuntu:
     runs-on: ubuntu-latest
@@ -12,21 +12,18 @@ jobs:
     strategy:
       matrix:
         gemfile: [mongoid_5]
-        ruby: [2.5.7, 2.6.5, 2.7.2]
+        ruby: [2.5.9, 2.6.10, 2.7.7]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       ADAPTER: mongoid
     steps:
-      - uses: actions/checkout@v2
+      - 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 }}
-      - run: sudo apt-get install -y libsqlite3-dev
-      - run: gem update --system
-      - run: gem install bundler
-      - run: gem --version
-      - run: bundle install
+          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

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 6.0.1
+
+* Fix with_role with :any resource
+
 = 6.0.0 (April 2, 2021)
 
 Breaking changes:

data/gemfiles/activerecord_6.gemfile

@@ -3,10 +3,10 @@
 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 "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 "codeclimate-test-reporter", require: nil

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,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 5"
+gem "mongo", "< 2.17"
 gem "bson_ext", "1.5.1"
 gem "bigdecimal", "1.4.2"
 

data/lib/rolify/finders.rb

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

data/lib/rolify/version.rb

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

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

@@ -63,6 +63,11 @@ shared_examples_for :finders do |param_name, param_method|
             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 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
@@ -115,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) }
@@ -146,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Florent Monbillard
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -91,6 +91,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/activerecord.yml"
 - ".github/workflows/mongoid.yml"
 - ".gitignore"
@@ -106,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
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Roles library with resource scoping