pundit-matchers 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 641ea95570e02c1afd85001023242ff59b363e78
-  data.tar.gz: dcbca06d54b69c95faaec2f9df13e266dd44375f
+  metadata.gz: fa9d9639180168e0aa248c00f916e8711b0e82a3
+  data.tar.gz: 2e70263fd7ca377531a0c34e6136dc0e4ed9f80d
 SHA512:
-  metadata.gz: 7ad50adae39b364ac80520e59afdfda56165ff6d21410f2153d8362a856fedc1e2d32fe42e838210e80e3d59d9f3954d7f0176eb8a49c7f5cb731aa9501e6446
-  data.tar.gz: 685d0b7571579ab06b7e8e9ad70b014534a15d0ccac22813098090da96d76450fcddf1534a75da906b2a6635421bc598b6aad8886ce02be434a8be34243e9de5
+  metadata.gz: 5a5ebc0298d666b8b19884710386fe194f114acd2e7724468286032f516f9a522a13418baba5c5b0e93294000dbbe1f190a0b20e5a1646537ffe5aed28eab0fd
+  data.tar.gz: c2e2e029245a9e6d52b200905653a9acb092ba23abe481bc1f686364bae5171eeeebc580dc379cad9004f93db9925864579d862f9b551971bc8e43c3f019e67b

data/lib/pundit/matchers.rb

@@ -26,28 +26,24 @@ module Pundit
   RSpec::Matchers.define :forbid_actions do |actions|
     match do |policy|
       return false if actions.count < 2
-      actions.each do |action|
-        return false if policy.public_send("#{action}?")
+      @allowed_actions = actions.select do |action|
+        policy.public_send("#{action}?")
       end
-      true
+      @allowed_actions.empty?
     end
 
+    attr_reader :allowed_actions
+
     zero_actions_failure_message = 'At least two actions must be ' \
       'specified when using the forbid_actions matcher.'
 
-    one_action_failure_message = 'More than one action must be specified ' \
-      'when using the forbid_actions matcher. To test a single action, use ' \
-      'forbid_action instead.'
-
     failure_message do |policy|
       case actions.count
       when 0
         zero_actions_failure_message
-      when 1
-        one_action_failure_message
       else
-        "#{policy.class} does not forbid #{actions} for " \
-          "#{policy.user.inspect}."
+        "#{policy.class} expected to forbid #{actions}, but allowed " \
+          "#{allowed_actions} for #{policy.user.inspect}."
       end
     end
 
@@ -55,11 +51,9 @@ module Pundit
       case actions.count
       when 0
         zero_actions_failure_message
-      when 1
-        one_action_failure_message
       else
-        "#{policy.class} does not permit #{actions} for " \
-          "#{policy.user.inspect}."
+        "#{policy.class} expected to permit #{actions}, but forbade " \
+          "#{allowed_actions} for #{policy.user.inspect}."
       end
     end
   end
@@ -155,28 +149,24 @@ module Pundit
   RSpec::Matchers.define :permit_actions do |actions|
     match do |policy|
       return false if actions.count < 2
-      actions.each do |action|
-        return false unless policy.public_send("#{action}?")
+      @forbidden_actions = actions.reject do |action|
+        policy.public_send("#{action}?")
       end
-      true
+      @forbidden_actions.empty?
     end
 
+    attr_reader :forbidden_actions
+
     zero_actions_failure_message = 'At least two actions must be ' \
       'specified when using the permit_actions matcher.'
 
-    one_action_failure_message = 'More than one action must be specified ' \
-      'when using the permit_actions matcher. To test a single action, use ' \
-      'permit_action instead.'
-
     failure_message do |policy|
       case actions.count
       when 0
         zero_actions_failure_message
-      when 1
-        one_action_failure_message
       else
-        "#{policy.class} does not permit #{actions} for " \
-          "#{policy.user.inspect}."
+        "#{policy.class} expected to permit #{actions}, but forbade " \
+          "#{forbidden_actions} for #{policy.user.inspect}."
       end
     end
 
@@ -187,8 +177,8 @@ module Pundit
       when 1
         one_action_failure_message
       else
-        "#{policy.class} does not forbid #{actions} for " \
-          "#{policy.user.inspect}."
+        "#{policy.class} expected to forbid #{actions}, but allowed " \
+          "#{forbidden_actions} for #{policy.user.inspect}."
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for Pundit policies