pundit-matchers 1.7.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0da80bb866c35b8ab6548d017a9bc022831e3da0c5493b99aac0ba5c8c79cad
-  data.tar.gz: 24bfacd140e3976e30c88204db5e33566c42dbd5e45d568c8d857a7a4205951d
+  metadata.gz: '013960778421a77229a9e50388f5cb7073cae3c60024b482f48c39431de063af'
+  data.tar.gz: 12a70d9a7ffdf1df5a2e584e555f3f934d36a971852605afa611c033a07c14dc
 SHA512:
-  metadata.gz: 5c1fbddf259fce9fa65c6f0613ec5d46e271ab0c7212380bc86cb5fef6fb85a2f74b6c20a4fb6b4c0e1dacc6b8ad11e1c963f8827c997e88bb319cce157d305b
-  data.tar.gz: a2363786904df0631c54b8d84094179b61607e300a16ba53cd6406b02272e51f1e21060832f5b64a3eeaaba1ff6dba7c8462d3308732f335dc363df666058120
+  metadata.gz: 4c00b1be800433a24203f2d964a810eaa7445ed98934598726e568b727db2ad6333886d1d7dffe56196a1bb445a982c6d17ea96cda737cca5a5ca7e801445ada
+  data.tar.gz: 0fb59915496d8b6807b01b84ce6f70c2c350e5dd6db00851c1e013211fb6ab41c6a1cc2f21c11f0a10107f116dadd666ff71228bcf06eee1ed706a90b56d9550

data/lib/pundit/matchers/utils/all_actions/actions_matcher.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Parent class for specific all_action matcher. Should not be used directly.
+        #
+        # Expects methods in child class:
+        # * actual_actions - list of actions which actually matches expected type.
+        class ActionsMatcher
+          attr_reader :policy_info
+
+          def initialize(policy)
+            @policy_info = PolicyInfo.new(policy)
+          end
+
+          def match?
+            missed_expected_actions.empty?
+          end
+
+          def missed_expected_actions
+            @missed_expected_actions ||= expected_actions - actual_actions
+          end
+
+          def policy
+            policy_info.policy
+          end
+
+          private
+
+          def expected_actions
+            policy_info.actions
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/all_actions/error_message_formatter.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Adds #message method which generates failed assertion message
+        # for *_all_actions matchers.
+        #
+        # Expects methods to be defined:
+        # * matcher - instance which has `AllActions::ActionsMatcher` as a parent class
+        # * expected_kind - string with expected actions type (can be "forbidden" or "permitted")
+        # * opposite_kind - string with oposite then expected actions type (can be "permitted" or "forbidden")
+        module ErrorMessageFormatter
+          def message
+            "#{policy_name} expected to have all actions #{expected_kind}, " \
+              "but #{mismatches_are(missed_expected_actions)} #{opposite_kind}"
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+
+          def policy
+            matcher.policy
+          end
+
+          def missed_expected_actions
+            matcher.missed_expected_actions
+          end
+
+          def policy_name
+            policy.class.name
+          end
+
+          def mismatches_are(mismatches)
+            if mismatches.count == 1
+              "#{mismatches} is"
+            else
+              "#{mismatches} are"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/all_actions/forbidden_actions_error_formatter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'error_message_formatter'
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Error message formatter for `forbid_all_actions` matcher.
+        class ForbiddenActionsErrorFormatter
+          include AllActions::ErrorMessageFormatter
+
+          def initialize(matcher)
+            @expected_kind = 'forbidden'
+            @opposite_kind = 'permitted'
+            @matcher = matcher
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/all_actions/forbidden_actions_matcher.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'actions_matcher'
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Handles all the checks in `forbid_all_actions` matcher.
+        class ForbiddenActionsMatcher < AllActions::ActionsMatcher
+          private
+
+          def actual_actions
+            policy_info.forbidden_actions
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/all_actions/permitted_actions_error_formatter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'error_message_formatter'
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Error message formatter for `permit_all_actions` matcher.
+        class PermittedActionsErrorFormatter
+          include AllActions::ErrorMessageFormatter
+
+          def initialize(matcher)
+            @expected_kind = 'permitted'
+            @opposite_kind = 'forbidden'
+            @matcher = matcher
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/all_actions/permitted_actions_matcher.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'actions_matcher'
+
+module Pundit
+  module Matchers
+    module Utils
+      module AllActions
+        # Handles all the checks in `permit_all_actions` matcher.
+        class PermittedActionsMatcher < AllActions::ActionsMatcher
+          private
+
+          def actual_actions
+            policy_info.permitted_actions
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/actions_matcher.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Parent class for specific only_action matcher. Should not be used directly.
+        #
+        # Expects methods in child class:
+        # * actual_actions - list of actions which actually matches expected type.
+        class ActionsMatcher
+          attr_reader :policy_info, :expected_actions
+
+          def initialize(policy, expected_actions)
+            @policy_info = PolicyInfo.new(policy)
+            @expected_actions = expected_actions
+          end
+
+          def match?
+            missed_expected_actions.empty? &&
+              actual_actions.sort == expected_actions.sort
+          end
+
+          def unexpected_actions
+            @unexpected_actions ||= actual_actions - expected_actions
+          end
+
+          def missed_expected_actions
+            @missed_expected_actions ||= expected_actions - actual_actions
+          end
+
+          def policy
+            policy_info.policy
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/error_message_formatter.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Adds #message method which generates failed assertion message
+        # for *_only_actions matchers.
+        #
+        # Expects methods to be defined:
+        # * matcher - instance which has `OnlyActions::ActionsMatcher` as a parent class
+        # * expected_kind - string with expected actions type (can be "forbidden" or "permitted")
+        # * opposite_kind - string with oposite then expected actions type (can be "permitted" or "forbidden")
+        module ErrorMessageFormatter
+          def message
+            "#{policy_name} expected to have only actions #{matcher.expected_actions} #{expected_kind}, but " \
+              "#{unless missed_expected_actions.empty?
+                   "#{mismatches_are(missed_expected_actions)} #{opposite_kind} and "
+                 end}" \
+              "#{mismatches_are(unexpected_actions)} #{expected_kind} too"
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+
+          def policy
+            matcher.policy
+          end
+
+          def unexpected_actions
+            matcher.unexpected_actions
+          end
+
+          def missed_expected_actions
+            matcher.missed_expected_actions
+          end
+
+          def policy_name
+            policy.class.name
+          end
+
+          def mismatches_are(mismatches)
+            if mismatches.count == 1
+              "#{mismatches} is"
+            else
+              "#{mismatches} are"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/forbidden_actions_error_formatter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'error_message_formatter'
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Error message formatter for `forbid_only_actions` matcher.
+        class ForbiddenActionsErrorFormatter
+          include OnlyActions::ErrorMessageFormatter
+
+          def initialize(matcher)
+            @expected_kind = 'forbidden'
+            @opposite_kind = 'permitted'
+            @matcher = matcher
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/forbidden_actions_matcher.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'actions_matcher'
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Handles all the checks in `forbid_only_actions` matcher.
+        class ForbiddenActionsMatcher < OnlyActions::ActionsMatcher
+          private
+
+          def actual_actions
+            policy_info.forbidden_actions
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/permitted_actions_error_formatter.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'error_message_formatter'
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Error message formatter for `permit_only_actions` matcher.
+        class PermittedActionsErrorFormatter
+          include OnlyActions::ErrorMessageFormatter
+
+          def initialize(matcher)
+            @expected_kind = 'permitted'
+            @opposite_kind = 'forbidden'
+            @matcher = matcher
+          end
+
+          private
+
+          attr_reader :matcher, :expected_kind, :opposite_kind
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/only_actions/permitted_actions_matcher.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'actions_matcher'
+
+module Pundit
+  module Matchers
+    module Utils
+      module OnlyActions
+        # Handles all the checks in `permit_only_actions` matcher.
+        class PermittedActionsMatcher < OnlyActions::ActionsMatcher
+          private
+
+          def actual_actions
+            policy_info.permitted_actions
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers/utils/policy_info.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Pundit
+  module Matchers
+    module Utils
+      # Collects all details about given policy class.
+      class PolicyInfo
+        attr_reader :policy
+
+        def initialize(policy)
+          @policy = policy
+        end
+
+        def actions
+          @actions ||= begin
+            policy_methods = @policy.public_methods - Object.instance_methods
+            policy_methods.grep(/\?$/).sort.map { |policy_method| policy_method.to_s.delete_suffix('?').to_sym }
+          end
+        end
+
+        def permitted_actions
+          @permitted_actions ||= actions.select { |action| policy.public_send("#{action}?") }
+        end
+
+        def forbidden_actions
+          actions - permitted_actions
+        end
+      end
+    end
+  end
+end

data/lib/pundit/matchers.rb

@@ -1,7 +1,20 @@
+# frozen_string_literal: true
+
 require 'rspec/core'
 
 module Pundit
   module Matchers
+    require_relative 'matchers/utils/policy_info'
+    require_relative 'matchers/utils/all_actions/forbidden_actions_error_formatter'
+    require_relative 'matchers/utils/all_actions/forbidden_actions_matcher'
+    require_relative 'matchers/utils/all_actions/permitted_actions_error_formatter'
+    require_relative 'matchers/utils/all_actions/permitted_actions_matcher'
+
+    require_relative 'matchers/utils/only_actions/forbidden_actions_error_formatter'
+    require_relative 'matchers/utils/only_actions/forbidden_actions_matcher'
+    require_relative 'matchers/utils/only_actions/permitted_actions_error_formatter'
+    require_relative 'matchers/utils/only_actions/permitted_actions_matcher'
+
     class Configuration
       attr_accessor :user_alias
 
@@ -19,27 +32,25 @@ module Pundit
         @configuration ||= Pundit::Matchers::Configuration.new
       end
     end
+  end
 
-    RSpec::Matchers.define :forbid_action do |action, *args|
-      match do |policy|
-        if args.any?
-          !policy.public_send("#{action}?", *args)
-        else
-          !policy.public_send("#{action}?")
-        end
+  RSpec::Matchers.define :forbid_action do |action, *args, **kwargs|
+    match do |policy|
+      if args.any?
+        !policy.public_send("#{action}?", *args, **kwargs)
+      else
+        !policy.public_send("#{action}?", **kwargs)
       end
+    end
 
-      failure_message do |policy|
-        "#{policy.class} does not forbid #{action} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
-      end
+    failure_message do |policy|
+      "#{policy.class} does not forbid #{action} for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
+    end
 
-      failure_message_when_negated do |policy|
-        "#{policy.class} does not permit #{action} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
-      end
+    failure_message_when_negated do |policy|
+      "#{policy.class} does not permit #{action} for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
   end
 
@@ -47,6 +58,7 @@ module Pundit
     actions.flatten!
     match do |policy|
       return false if actions.count < 1
+
       @allowed_actions = actions.select do |action|
         policy.public_send("#{action}?")
       end
@@ -56,16 +68,15 @@ module Pundit
     attr_reader :allowed_actions
 
     zero_actions_failure_message = 'At least one action must be ' \
-      'specified when using the forbid_actions matcher.'
+                                   'specified when using the forbid_actions matcher.'
 
     failure_message do |policy|
       if actions.count.zero?
         zero_actions_failure_message
       else
-        "#{policy.class} expected to forbid #{actions}, but allowed " \
-          "#{allowed_actions} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+        "#{policy.class} expected to forbid #{actions}, but permitted " \
+          "#{allowed_actions} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
 
@@ -74,9 +85,8 @@ module Pundit
         zero_actions_failure_message
       else
         "#{policy.class} expected to permit #{actions}, but forbade " \
-          "#{allowed_actions} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "#{allowed_actions} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -87,21 +97,19 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not forbid the edit or update action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not forbid the edit or update action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
 
     failure_message_when_negated do |policy|
-      "#{policy.class} does not permit the edit or update action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not permit the edit or update action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
   end
 
   RSpec::Matchers.define :forbid_mass_assignment_of do |attributes|
     # Map single object argument to an array, if necessary
-    attributes = attributes.is_a?(Array) ? attributes : [attributes]
+    attributes = [attributes] unless attributes.is_a?(Array)
 
     match do |policy|
       return false if attributes.count < 1
@@ -124,7 +132,7 @@ module Pundit
     end
 
     zero_attributes_failure_message = 'At least one attribute must be ' \
-      'specified when using the forbid_mass_assignment_of matcher.'
+                                      'specified when using the forbid_mass_assignment_of matcher.'
 
     failure_message do |policy|
       if attributes.count.zero?
@@ -132,16 +140,14 @@ module Pundit
       elsif defined? @action
         "#{policy.class} expected to forbid the mass assignment of the " \
           "attributes #{attributes} when authorising the #{@action} action, " \
-          'but allowed the mass assignment of the attributes ' \
-          "#{allowed_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          'but permitted the mass assignment of the attributes ' \
+          "#{allowed_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       else
         "#{policy.class} expected to forbid the mass assignment of the " \
-          "attributes #{attributes}, but allowed the mass assignment of " \
-          "the attributes #{allowed_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "attributes #{attributes}, but permitted the mass assignment of " \
+          "the attributes #{allowed_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
 
@@ -152,15 +158,13 @@ module Pundit
         "#{policy.class} expected to permit the mass assignment of the " \
           "attributes #{attributes} when authorising the #{@action} action, " \
           'but permitted the mass assignment of the attributes ' \
-          "#{allowed_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "#{allowed_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       else
         "#{policy.class} expected to permit the mass assignment of the " \
           "attributes #{attributes}, but permitted the mass assignment of " \
-          "the attributes #{allowed_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "the attributes #{allowed_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -171,37 +175,33 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not forbid the new or create action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not forbid the new or create action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
 
     failure_message_when_negated do |policy|
-      "#{policy.class} does not permit the new or create action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not permit the new or create action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
   end
 
-  RSpec::Matchers.define :permit_action do |action, *args|
+  RSpec::Matchers.define :permit_action do |action, *args, **kwargs|
     match do |policy|
       if args.any?
-        policy.public_send("#{action}?", *args)
+        policy.public_send("#{action}?", *args, **kwargs)
       else
-        policy.public_send("#{action}?")
+        policy.public_send("#{action}?", **kwargs)
       end
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit #{action} for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not permit #{action} for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
 
     failure_message_when_negated do |policy|
-      "#{policy.class} does not forbid #{action} for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not forbid #{action} for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
   end
 
@@ -209,6 +209,7 @@ module Pundit
     actions.flatten!
     match do |policy|
       return false if actions.count < 1
+
       @forbidden_actions = actions.reject do |action|
         policy.public_send("#{action}?")
       end
@@ -229,6 +230,7 @@ module Pundit
         tests would pass.'
 
       return true if actions.count < 1
+
       @forbidden_actions = actions.reject do |action|
         policy.public_send("#{action}?")
       end
@@ -238,16 +240,15 @@ module Pundit
     attr_reader :forbidden_actions
 
     zero_actions_failure_message = 'At least one action must be specified ' \
-      'when using the permit_actions matcher.'
+                                   'when using the permit_actions matcher.'
 
     failure_message do |policy|
       if actions.count.zero?
         zero_actions_failure_message
       else
         "#{policy.class} expected to permit #{actions}, but forbade " \
-          "#{forbidden_actions} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "#{forbidden_actions} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
 
@@ -255,10 +256,9 @@ module Pundit
       if actions.count.zero?
         zero_actions_failure_message
       else
-        "#{policy.class} expected to forbid #{actions}, but allowed " \
-          "#{forbidden_actions} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+        "#{policy.class} expected to forbid #{actions}, but permitted " \
+          "#{forbidden_actions} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -269,21 +269,19 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit the edit or update action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not permit the edit or update action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
 
     failure_message_when_negated do |policy|
-      "#{policy.class} does not forbid the edit or update action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not forbid the edit or update action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
   end
 
   RSpec::Matchers.define :permit_mass_assignment_of do |attributes|
     # Map single object argument to an array, if necessary
-    attributes = attributes.is_a?(Array) ? attributes : [attributes]
+    attributes = [attributes] unless attributes.is_a?(Array)
 
     match do |policy|
       return false if attributes.count < 1
@@ -306,7 +304,7 @@ module Pundit
     end
 
     zero_attributes_failure_message = 'At least one attribute must be ' \
-      'specified when using the permit_mass_assignment_of matcher.'
+                                      'specified when using the permit_mass_assignment_of matcher.'
 
     failure_message do |policy|
       if attributes.count.zero?
@@ -315,15 +313,13 @@ module Pundit
         "#{policy.class} expected to permit the mass assignment of the " \
           "attributes #{attributes} when authorising the #{@action} action, " \
           'but forbade the mass assignment of the attributes ' \
-          "#{forbidden_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "#{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       else
         "#{policy.class} expected to permit the mass assignment of the " \
           "attributes #{attributes}, but forbade the mass assignment of the " \
-          "attributes #{forbidden_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "attributes #{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
 
@@ -334,15 +330,13 @@ module Pundit
         "#{policy.class} expected to forbid the mass assignment of the " \
           "attributes #{attributes} when authorising the #{@action} action, " \
           'but forbade the mass assignment of the attributes ' \
-          "#{forbidden_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "#{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       else
         "#{policy.class} expected to forbid the mass assignment of the " \
           "attributes #{attributes}, but forbade the mass assignment of the " \
-          "attributes #{forbidden_attributes} for " +
-          policy.public_send(Pundit::Matchers.configuration.user_alias)
-                .inspect + '.'
+          "attributes #{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -353,15 +347,61 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit the new or create action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not permit the new or create action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
     end
 
     failure_message_when_negated do |policy|
-      "#{policy.class} does not forbid the new or create action for " +
-        policy.public_send(Pundit::Matchers.configuration.user_alias)
-              .inspect + '.'
+      "#{policy.class} does not forbid the new or create action for " \
+        "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
+    end
+  end
+
+  RSpec::Matchers.define :permit_all_actions do
+    match do |policy|
+      @matcher = Pundit::Matchers::Utils::AllActions::PermittedActionsMatcher.new(policy)
+      @matcher.match?
+    end
+
+    failure_message do
+      formatter = Pundit::Matchers::Utils::AllActions::PermittedActionsErrorFormatter.new(@matcher)
+      formatter.message
+    end
+  end
+
+  RSpec::Matchers.define :permit_only_actions do |actions|
+    match do |policy|
+      @matcher = Pundit::Matchers::Utils::OnlyActions::PermittedActionsMatcher.new(policy, actions)
+      @matcher.match?
+    end
+
+    failure_message do
+      formatter = Pundit::Matchers::Utils::OnlyActions::PermittedActionsErrorFormatter.new(@matcher)
+      formatter.message
+    end
+  end
+
+  RSpec::Matchers.define :forbid_all_actions do
+    match do |policy|
+      @matcher = Pundit::Matchers::Utils::AllActions::ForbiddenActionsMatcher.new(policy)
+      @matcher.match?
+    end
+
+    failure_message do
+      formatter = Pundit::Matchers::Utils::AllActions::ForbiddenActionsErrorFormatter.new(@matcher)
+      formatter.message
+    end
+  end
+
+  RSpec::Matchers.define :forbid_only_actions do |actions|
+    match do |policy|
+      @matcher = Pundit::Matchers::Utils::OnlyActions::ForbiddenActionsMatcher.new(policy, actions)
+      @matcher.match?
+    end
+
+    failure_message do
+      formatter = Pundit::Matchers::Utils::OnlyActions::ForbiddenActionsErrorFormatter.new(@matcher)
+      formatter.message
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-04 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -51,10 +51,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pundit/matchers.rb
-homepage: http://github.com/chrisalley/pundit-matchers
+- lib/pundit/matchers/utils/all_actions/actions_matcher.rb
+- lib/pundit/matchers/utils/all_actions/error_message_formatter.rb
+- lib/pundit/matchers/utils/all_actions/forbidden_actions_error_formatter.rb
+- lib/pundit/matchers/utils/all_actions/forbidden_actions_matcher.rb
+- lib/pundit/matchers/utils/all_actions/permitted_actions_error_formatter.rb
+- lib/pundit/matchers/utils/all_actions/permitted_actions_matcher.rb
+- lib/pundit/matchers/utils/only_actions/actions_matcher.rb
+- lib/pundit/matchers/utils/only_actions/error_message_formatter.rb
+- lib/pundit/matchers/utils/only_actions/forbidden_actions_error_formatter.rb
+- lib/pundit/matchers/utils/only_actions/forbidden_actions_matcher.rb
+- lib/pundit/matchers/utils/only_actions/permitted_actions_error_formatter.rb
+- lib/pundit/matchers/utils/only_actions/permitted_actions_matcher.rb
+- lib/pundit/matchers/utils/policy_info.rb
+homepage: https://github.com/punditcommunity/pundit-matchers
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -63,14 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: RSpec matchers for Pundit policies