pundit-matchers 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca57a9d5fc96cbacd89c5af52106a126fa6cf01d72654c677fa5e1a7a957e139
-  data.tar.gz: 5dd3c52dcf6cc289a76ba40947ff1d46fad538e5b6bfcec5484ba1d87b2092b9
+  metadata.gz: '013960778421a77229a9e50388f5cb7073cae3c60024b482f48c39431de063af'
+  data.tar.gz: 12a70d9a7ffdf1df5a2e584e555f3f934d36a971852605afa611c033a07c14dc
 SHA512:
-  metadata.gz: e965e471adca0f06d4ab84e1d03f426902d5ac79bb69644afc88be3b158defb27bcd36d9170c6f47fbb3cbf7d832884a9b8f1e65bc3e7e0587d4ede6d75f9de5
-  data.tar.gz: e8c47b1311ab7afc3d119714ee12d605d0063dc315f38a70e7fc0b5761e99432cd6f3fceb109a504e82b4c61621147197291dbd59f5d1dceb434e7f6ec346d80
+  metadata.gz: 4c00b1be800433a24203f2d964a810eaa7445ed98934598726e568b727db2ad6333886d1d7dffe56196a1bb445a982c6d17ea96cda737cca5a5ca7e801445ada
+  data.tar.gz: 0fb59915496d8b6807b01b84ce6f70c2c350e5dd6db00851c1e013211fb6ab41c6a1cc2f21c11f0a10107f116dadd666ff71228bcf06eee1ed706a90b56d9550

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

@@ -14,7 +14,7 @@ module Pundit
         def actions
           @actions ||= begin
             policy_methods = @policy.public_methods - Object.instance_methods
-            policy_methods.grep(/\?$/).map { |policy_method| policy_method.to_s.sub(/\?$/, '').to_sym }
+            policy_methods.grep(/\?$/).sort.map { |policy_method| policy_method.to_s.delete_suffix('?').to_sym }
           end
         end
 

data/lib/pundit/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core'
 
 module Pundit
@@ -30,27 +32,25 @@ module Pundit
         @configuration ||= Pundit::Matchers::Configuration.new
       end
     end
+  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
+  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
 
@@ -74,10 +74,9 @@ module Pundit
       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
 
@@ -86,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
@@ -99,15 +97,13 @@ 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
 
@@ -143,17 +139,15 @@ module Pundit
         zero_attributes_failure_message
       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 + '.'
+          "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}."
       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
 
@@ -162,17 +156,15 @@ module Pundit
         zero_attributes_failure_message
       elsif defined? @action
         "#{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 + '.'
+          "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}."
       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 + '.'
+          "attributes #{attributes}, but permitted the mass assignment of " \
+          "the attributes #{allowed_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -183,15 +175,13 @@ 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
 
@@ -205,15 +195,13 @@ module Pundit
     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
 
@@ -259,9 +247,8 @@ module Pundit
         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
 
@@ -269,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
@@ -283,15 +269,13 @@ 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
 
@@ -327,17 +311,15 @@ module Pundit
         zero_attributes_failure_message
       elsif defined? @action
         "#{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 + '.'
+          "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}."
       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 #{attributes}, but forbade the mass assignment of the " \
+          "attributes #{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
 
@@ -346,17 +328,15 @@ module Pundit
         zero_attributes_failure_message
       elsif defined? @action
         "#{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 + '.'
+          "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}."
       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 #{attributes}, but forbade the mass assignment of the " \
+          "attributes #{forbidden_attributes} for " \
+          "#{policy.public_send(Pundit::Matchers.configuration.user_alias).inspect}."
       end
     end
   end
@@ -367,15 +347,13 @@ 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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -64,7 +64,7 @@ files:
 - 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: http://github.com/punditcommunity/pundit-matchers
+homepage: https://github.com/punditcommunity/pundit-matchers
 licenses:
 - MIT
 metadata:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: RSpec matchers for Pundit policies