Merge pull request #870 from varvet/kbs/ruby-4.0

JRuby 9.3 is EOL, so we move to 9.4

Author: Burgestrand

.github/workflows/main.yml

@@ -9,14 +9,6 @@ on:
 permissions:
   contents: read
 
-env:
-  # `github.ref` points to the *merge commit* when running tests on a pull request, which will be a commit
-  # that doesn't exists in our code base. Since this workflow triggers from a PR, we use the HEAD SHA instead.
-  #
-  # NOTE: These both used to be used by Code Climate (cc-test-reporter), superseded by qlty.sh
-  GIT_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-  GIT_BRANCH: ${{ github.head_ref }}
-
 jobs:
   matrix-test:
     runs-on: ubuntu-latest
@@ -29,7 +21,7 @@ jobs:
           - "3.3"
           - "3.4"
           - "4.0"
-          - "jruby-9.3.15"
+          - "jruby-9.4"
           - "jruby"
         include: # HEAD-versions
           - ruby-version: "head"
@@ -72,46 +64,7 @@ jobs:
           path: coverage
           retention-days: 1
 
-  coverage-upload:
-    permissions:
-      id-token: write # Required for OIDC
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download coverage results
-        uses: actions/download-artifact@v4
-        with:
-          name: coverage-results
-          path: coverage
-      - name: Upload code coverage to qlty.sh
-        uses: qltysh/qlty-action/coverage@v2
-        with:
-          oidc: true
-          format: simplecov
-          files: coverage/.resultset.json
-
-  coverage-check:
-    permissions:
-      contents: read
-      checks: write
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download coverage results
-        uses: actions/download-artifact@v4
-        with:
-          name: coverage-results
-          path: coverage
-      - uses: joshmfrankel/simplecov-check-action@be89e11889202cc59efb14aab2a7091622fa9aad
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          minimum_suite_coverage: 100
-          minimum_file_coverage: 100
-          coverage_json_path: coverage/simplecov-check-action.json
-
-  rubocop:
+  linting:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -122,8 +75,8 @@ jobs:
           ruby-version: "ruby"
           bundler-cache: false
       - run: bundle install
-      - name: Run RuboCop
-        run: bundle exec rubocop
+      - name: Run standard
+        run: bundle exec standardrb
 
   docs:
     runs-on: ubuntu-latest
@@ -145,7 +98,7 @@ jobs:
       - test
       - matrix-test
       - docs
-      - rubocop
+      - linting
     steps:
       - name: failure
         if: ${{ failure() || contains(needs.*.result, 'failure') }}

.rubocop.yml

@@ -0,0 +1,5 @@
+parallel: true
+ruby_version: 3.2
+
+extend_config:
+  - .rubocop_ignore_git.yml

.standard.yml

@@ -16,9 +16,7 @@ gem "simplecov", ">= 0.17.0"
 # Development tools
 gem "bundler"
 gem "rake"
-gem "rubocop"
-gem "rubocop-performance"
-gem "rubocop-rspec"
+gem "standard"
 gem "yard"
 gem "zeitwerk"
 

Gemfile

@@ -1,7 +1,6 @@
 # Pundit
 
 [![Main](https://github.com/varvet/pundit/actions/workflows/main.yml/badge.svg)](https://github.com/varvet/pundit/actions/workflows/main.yml)
-[![Maintainability](https://qlty.sh/gh/varvet/projects/pundit/maintainability.svg)](https://qlty.sh/gh/varvet/projects/pundit)
 [![Inline docs](https://inch-ci.org/github/varvet/pundit.svg?branch=main)](https://inch-ci.org/github/varvet/pundit)
 [![Gem Version](https://badge.fury.io/rb/pundit.svg)](https://badge.fury.io/rb/pundit)
 

README.md

@@ -11,7 +11,10 @@
 require "pundit/cache_store"
 require "pundit/cache_store/null_store"
 require "pundit/cache_store/legacy_store"
+
+# :nocov:
 require "pundit/railtie" if defined?(Rails)
+# :nocov:
 
 # Hello? Yes, this is Pundit.
 #

lib/pundit.rb

@@ -37,7 +37,7 @@ def initialize(options = {})
       if options.is_a? String
         message = options
       else
-        @query  = options[:query]
+        @query = options[:query]
         @record = options[:record]
         @policy = options[:policy]
 

lib/pundit/error.rb

@@ -129,7 +129,7 @@ module DSL
       # @param list [Symbol, Array<Symbol>] a permission to describe
       # @return [void]
       def permissions(*list, &block)
-        metadata = { permissions: list, caller: caller }
+        metadata = {permissions: list, caller: caller}
 
         if list.last == :focus
           list.pop

lib/pundit/rspec.rb

@@ -3,14 +3,14 @@
 require_relative "lib/pundit/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = "pundit"
-  gem.version       = Pundit::VERSION
-  gem.authors       = ["Jonas Nicklas", "Varvet AB"]
-  gem.email         = ["jonas.nicklas@gmail.com", "info@varvet.com"]
-  gem.description   = "Object oriented authorization for Rails applications"
-  gem.summary       = "OO authorization for Rails"
-  gem.homepage      = "https://github.com/varvet/pundit"
-  gem.license       = "MIT"
+  gem.name = "pundit"
+  gem.version = Pundit::VERSION
+  gem.authors = ["Jonas Nicklas", "Varvet AB"]
+  gem.email = ["jonas.nicklas@gmail.com", "info@varvet.com"]
+  gem.description = "Object oriented authorization for Rails applications"
+  gem.summary = "OO authorization for Rails"
+  gem.homepage = "https://github.com/varvet/pundit"
+  gem.license = "MIT"
 
   Dir.chdir(__dir__) do
     gem.files = `git ls-files -z`.split("\x0").select do |f|

pundit.gemspec

@@ -231,7 +231,7 @@ def to_params(*args, **kwargs, &block)
     end
 
     it "goes through the policy cache" do
-      params = to_params(post: { title: "Hello" })
+      params = to_params(post: {title: "Hello"})
       user = double
       post = Post.new(user)
       controller = Controller.new(user, "update", params)