pundit 2.2.0 → 2.4.0

data/spec/pundit_spec.rb

@@ -57,26 +57,51 @@ RSpec.describe Pundit do
       expect { Pundit.authorize(user, article_tag, :destroy?) }.to raise_error(Pundit::NotAuthorizedError)
     end
 
-    it "raises an error with a query and action" do
+    it "raises an error with the policy, query and record" do
       # rubocop:disable Style/MultilineBlockChain
       expect do
         Pundit.authorize(user, post, :destroy?)
-      end.to raise_error(Pundit::NotAuthorizedError, "not allowed to destroy? this Post") do |error|
+      end.to raise_error(Pundit::NotAuthorizedError, "not allowed to PostPolicy#destroy? this Post") do |error|
         expect(error.query).to eq :destroy?
         expect(error.record).to eq post
-        expect(error.policy).to eq Pundit.policy(user, post)
+        expect(error.policy).to have_attributes(
+          user: user,
+          record: post
+        )
+        expect(error.policy).to be_a(PostPolicy)
       end
       # rubocop:enable Style/MultilineBlockChain
     end
 
-    it "raises an error with a the record, query and action when the record is namespaced" do
+    it "raises an error with the policy, query and record when the record is namespaced" do
       # rubocop:disable Style/MultilineBlockChain
       expect do
         Pundit.authorize(user, [:project, :admin, comment], :destroy?)
-      end.to raise_error(Pundit::NotAuthorizedError, "not allowed to destroy? this Comment") do |error|
+      end.to raise_error(Pundit::NotAuthorizedError,
+                         "not allowed to Project::Admin::CommentPolicy#destroy? this Comment") do |error|
         expect(error.query).to eq :destroy?
         expect(error.record).to eq comment
-        expect(error.policy).to eq Pundit.policy(user, [:project, :admin, comment])
+        expect(error.policy).to have_attributes(
+          user: user,
+          record: comment
+        )
+        expect(error.policy).to be_a(Project::Admin::CommentPolicy)
+      end
+      # rubocop:enable Style/MultilineBlockChain
+    end
+
+    it "raises an error with the policy, query and the class name when a Class is given" do
+      # rubocop:disable Style/MultilineBlockChain
+      expect do
+        Pundit.authorize(user, Post, :destroy?)
+      end.to raise_error(Pundit::NotAuthorizedError, "not allowed to PostPolicy#destroy? Post") do |error|
+        expect(error.query).to eq :destroy?
+        expect(error.record).to eq Post
+        expect(error.policy).to have_attributes(
+          user: user,
+          record: Post
+        )
+        expect(error.policy).to be_a(PostPolicy)
       end
       # rubocop:enable Style/MultilineBlockChain
     end
@@ -399,22 +424,18 @@ RSpec.describe Pundit do
     it "includes Authorization module" do
       klass = Class.new
 
-      ActiveSupport::Deprecation.silence do
+      expect do
         klass.include Pundit
-      end
+      end.to output.to_stderr
 
       expect(klass).to include Pundit::Authorization
     end
 
     it "warns about deprecation" do
       klass = Class.new
-      allow(ActiveSupport::Deprecation).to receive(:warn)
-
-      ActiveSupport::Deprecation.silence do
+      expect do
         klass.include Pundit
-      end
-
-      expect(ActiveSupport::Deprecation).to have_received(:warn).with start_with("'include Pundit' is deprecated")
+      end.to output(a_string_starting_with("'include Pundit' is deprecated")).to_stderr
     end
   end
 

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-require "simplecov"
-SimpleCov.start do
-  add_filter "/spec/"
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start do
+    add_filter "/spec/"
+  end
 end
 
 require "pundit"
@@ -16,13 +18,56 @@ require "active_support/core_ext"
 require "active_model/naming"
 require "action_controller/metal/strong_parameters"
 
-class PostPolicy < Struct.new(:user, :post)
-  class Scope < Struct.new(:user, :scope)
+module InstanceTracking
+  module ClassMethods
+    def instances
+      @instances || 0
+    end
+
+    attr_writer :instances
+  end
+
+  def self.prepended(other)
+    other.extend(ClassMethods)
+  end
+
+  def initialize(*args, **kwargs, &block)
+    self.class.instances += 1
+    super(*args, **kwargs, &block)
+  end
+end
+
+class BasePolicy
+  prepend InstanceTracking
+
+  class BaseScope
+    prepend InstanceTracking
+
+    def initialize(user, scope)
+      @user = user
+      @scope = scope
+    end
+
+    attr_reader :user, :scope
+  end
+
+  def initialize(user, record)
+    @user = user
+    @record = record
+  end
+
+  attr_reader :user, :record
+end
+
+class PostPolicy < BasePolicy
+  class Scope < BaseScope
     def resolve
       scope.published
     end
   end
 
+  alias post record
+
   def update?
     post.user == user
   end
@@ -48,7 +93,13 @@ class PostPolicy < Struct.new(:user, :post)
   end
 end
 
-class Post < Struct.new(:user)
+class Post
+  def initialize(user = nil)
+    @user = user
+  end
+
+  attr_reader :user
+
   def self.published
     :published
   end
@@ -67,7 +118,7 @@ class Post < Struct.new(:user)
 end
 
 module Customer
-  class Post < Post
+  class Post < ::Post
     def model_name
       OpenStruct.new(param_key: "customer_post")
     end
@@ -90,16 +141,18 @@ class CommentScope
   end
 end
 
-class CommentPolicy < Struct.new(:user, :comment)
-  class Scope < Struct.new(:user, :scope)
+class CommentPolicy < BasePolicy
+  class Scope < BaseScope
     def resolve
       CommentScope.new(scope)
     end
   end
+
+  alias comment record
 end
 
-class PublicationPolicy < Struct.new(:user, :publication)
-  class Scope < Struct.new(:user, :scope)
+class PublicationPolicy < BasePolicy
+  class Scope < BaseScope
     def resolve
       scope.published
     end
@@ -130,7 +183,9 @@ end
 
 class Article; end
 
-class BlogPolicy < Struct.new(:user, :blog); end
+class BlogPolicy < BasePolicy
+  alias blog record
+end
 
 class Blog; end
 
@@ -140,7 +195,7 @@ class ArtificialBlog < Blog
   end
 end
 
-class ArticleTagOtherNamePolicy < Struct.new(:user, :tag)
+class ArticleTagOtherNamePolicy < BasePolicy
   def show?
     true
   end
@@ -148,6 +203,8 @@ class ArticleTagOtherNamePolicy < Struct.new(:user, :tag)
   def destroy?
     false
   end
+
+  alias tag record
 end
 
 class ArticleTag
@@ -156,33 +213,41 @@ class ArticleTag
   end
 end
 
-class CriteriaPolicy < Struct.new(:user, :criteria); end
+class CriteriaPolicy < BasePolicy
+  alias criteria record
+end
 
 module Project
-  class CommentPolicy < Struct.new(:user, :comment)
-    def update?
-      true
-    end
-
-    class Scope < Struct.new(:user, :scope)
+  class CommentPolicy < BasePolicy
+    class Scope < BaseScope
       def resolve
         scope
       end
     end
+
+    def update?
+      true
+    end
+
+    alias comment record
   end
 
-  class CriteriaPolicy < Struct.new(:user, :criteria); end
+  class CriteriaPolicy < BasePolicy
+    alias criteria record
+  end
 
-  class PostPolicy < Struct.new(:user, :post)
-    class Scope < Struct.new(:user, :scope)
+  class PostPolicy < BasePolicy
+    class Scope < BaseScope
       def resolve
         scope.read
       end
     end
+
+    alias post record
   end
 
   module Admin
-    class CommentPolicy < Struct.new(:user, :comment)
+    class CommentPolicy < BasePolicy
       def update?
         true
       end
@@ -194,7 +259,7 @@ module Project
   end
 end
 
-class DenierPolicy < Struct.new(:user, :record)
+class DenierPolicy < BasePolicy
   def update?
     false
   end
@@ -216,7 +281,7 @@ class Controller
   end
 end
 
-class NilClassPolicy < Struct.new(:user, :record)
+class NilClassPolicy < BasePolicy
   class Scope
     def initialize(*)
       raise Pundit::NotDefinedError, "Cannot scope NilClass"
@@ -245,31 +310,43 @@ class Thread
   def self.all; end
 end
 
-class ThreadPolicy < Struct.new(:user, :thread)
-  class Scope < Struct.new(:user, :scope)
+class ThreadPolicy < BasePolicy
+  class Scope < BaseScope
     def resolve
-      # deliberate wrong useage of the method
+      # deliberate wrong usage of the method
       scope.all(:unvalid, :parameters)
     end
   end
 end
 
-class PostFourFiveSix < Struct.new(:user); end
+class PostFourFiveSix
+  def initialize(user)
+    @user = user
+  end
+
+  attr_reader(:user)
+end
 
 class CommentFourFiveSix; extend ActiveModel::Naming; end
 
 module ProjectOneTwoThree
-  class CommentFourFiveSixPolicy < Struct.new(:user, :post); end
+  class CommentFourFiveSixPolicy < BasePolicy; end
 
-  class CriteriaFourFiveSixPolicy < Struct.new(:user, :criteria); end
+  class CriteriaFourFiveSixPolicy < BasePolicy; end
 
-  class PostFourFiveSixPolicy < Struct.new(:user, :post); end
+  class PostFourFiveSixPolicy < BasePolicy; end
 
-  class TagFourFiveSix < Struct.new(:user); end
+  class TagFourFiveSix
+    def initialize(user)
+      @user = user
+    end
+
+    attr_reader(:user)
+  end
 
-  class TagFourFiveSixPolicy < Struct.new(:user, :tag); end
+  class TagFourFiveSixPolicy < BasePolicy; end
 
   class AvatarFourFiveSix; extend ActiveModel::Naming; end
 
-  class AvatarFourFiveSixPolicy < Struct.new(:user, :avatar); end
+  class AvatarFourFiveSixPolicy < BasePolicy; end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pundit
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jonas Nicklas
 - Varvet AB
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,16 +127,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,19 @@ dependencies:
 description: Object oriented authorization for Rails applications
 email:
 - jonas.nicklas@gmail.com
-- dev@elabs.se
+- info@varvet.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE/gem_release_template.md"
+- ".github/pull_request_template.md"
+- ".github/workflows/main.yml"
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -184,6 +189,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
+- config/rubocop-rspec.yml
 - lib/generators/pundit/install/USAGE
 - lib/generators/pundit/install/install_generator.rb
 - lib/generators/pundit/install/templates/application_policy.rb
@@ -196,11 +203,15 @@ files:
 - lib/generators/test_unit/templates/policy_test.rb
 - lib/pundit.rb
 - lib/pundit/authorization.rb
+- lib/pundit/cache_store/legacy_store.rb
+- lib/pundit/cache_store/null_store.rb
+- lib/pundit/context.rb
 - lib/pundit/policy_finder.rb
 - lib/pundit/rspec.rb
 - lib/pundit/version.rb
 - pundit.gemspec
 - spec/authorization_spec.rb
+- spec/dsl_spec.rb
 - spec/generators_spec.rb
 - spec/policies/post_policy_spec.rb
 - spec/policy_finder_spec.rb
@@ -209,8 +220,9 @@ files:
 homepage: https://github.com/varvet/pundit
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -225,12 +237,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.5.11
+signing_key: 
 specification_version: 4
 summary: OO authorization for Rails
 test_files:
 - spec/authorization_spec.rb
+- spec/dsl_spec.rb
 - spec/generators_spec.rb
 - spec/policies/post_policy_spec.rb
 - spec/policy_finder_spec.rb

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-dist: focal
-
-matrix:
-  include:
-    - name: "RuboCop lint on pre-installed Ruby version"
-      rvm: 2.7.1 # Pre-installed Ruby version
-      before_install:
-        - gem install bundler
-      script: bundle exec rake rubocop # ONLY lint once, first
-    - rvm: 2.6.7
-      before_script:
-        - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-        - chmod +x ./cc-test-reporter
-        - ./cc-test-reporter before-build
-      after_script:
-        - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-    - rvm: 2.7.3
-    - rvm: 3.0.1
-    - rvm: 3.1.0
-    - rvm: jruby-9.2.17.0
-      env:
-        - JRUBY_OPTS="--debug"
-    - rvm: truffleruby-head
-  allow_failures:
-    - rvm: truffleruby-head