pundit-matchers 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a107f9850cec3d77bce20866a01785d61e2504e
-  data.tar.gz: 1e9e2002a82f622e3355f8c138ee0c35fe4af121
+  metadata.gz: ebd49115f1fcd116573587c08ba1e87701d69ab1
+  data.tar.gz: 20875c30d34d115d91918ad6031bb3b7b5bf899e
 SHA512:
-  metadata.gz: 19fac269273c7411d7c0bd13e02ac8cbb97993b86f8783f7e5336c0edd4533529a970500b3182f430e00094dd24804c59db907eeb0af10af10058eb88bb7eff1
-  data.tar.gz: 3ca539cd281d580845c05b4d41c3b3ec0cdcbd218b5aa72dba52379b049329e6e38360f1014feba0f162e96c4a8c2e38f98e70b85d1df51fe0b8b34256153bc2
+  metadata.gz: c4634c52a265faacfcf42971b28994d585b1c33233f691c21a4499afa8d4ceb36170b2563702477d9caa1eff5560999c3ca05444f9db8496045d3b97981967c5
+  data.tar.gz: f301a9c3f2cc38fcb4dc5c71f46ac07462ad0022c8b5bc5f7822687274b27204e7a66e22245aeb9e24a0ddb9c40e741ea0918131246f3f9888e616d42424f1b0

data/lib/pundit/matchers.rb

@@ -98,44 +98,66 @@ module Pundit
     end
   end
 
-  RSpec::Matchers.define :forbid_mass_assignment_of do |attribute|
+  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]
+
     match do |policy|
-      if defined? @action
-        !policy.send("permitted_attributes_for_#{@action}").include? attribute
-      else
-        !policy.permitted_attributes.include? attribute
+      return false if attributes.count < 1
+
+      @allowed_attributes = attributes.select do |attribute|
+        if defined? @action
+          policy.send("permitted_attributes_for_#{@action}").include? attribute
+        else
+          policy.permitted_attributes.include? attribute
+        end
       end
+
+      @allowed_attributes.empty?
     end
 
+    attr_reader :allowed_attributes
+
     chain :for_action do |action|
       @action = action
     end
 
+    zero_attributes_failure_message = 'At least one attribute must be ' \
+      'specified when using the forbid_mass_assignment_of matcher.'
+
     failure_message do |policy|
-      if defined? @action
-        "#{policy.class} does not forbid the mass assignment of the " \
-          "#{attribute} attribute, when authorising the #{@action} action, " \
-          'for ' +
+      if attributes.count.zero?
+        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 + '.'
       else
-        "#{policy.class} does not forbid the mass assignment of the " \
-          "#{attribute} attribute for " +
+        "#{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 + '.'
       end
     end
 
     failure_message_when_negated do |policy|
-      if defined? @action
-        "#{policy.class} does not permit the mass assignment of the " \
-          "#{attribute} attribute, when authorising the #{@action} action, " \
-          'for ' +
+      if attributes.count.zero?
+        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 + '.'
       else
-        "#{policy.class} does not permit the mass assignment of the " \
-          "#{attribute} attribute for " +
+        "#{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 + '.'
       end
@@ -237,44 +259,66 @@ module Pundit
     end
   end
 
-  RSpec::Matchers.define :permit_mass_assignment_of do |attribute|
+  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]
+
     match do |policy|
-      if defined? @action
-        policy.send("permitted_attributes_for_#{@action}").include? attribute
-      else
-        policy.permitted_attributes.include? attribute
+      return false if attributes.count < 1
+
+      @forbidden_attributes = attributes.select do |attribute|
+        if defined? @action
+          !policy.send("permitted_attributes_for_#{@action}").include? attribute
+        else
+          !policy.permitted_attributes.include? attribute
+        end
       end
+
+      @forbidden_attributes.empty?
     end
 
+    attr_reader :forbidden_attributes
+
     chain :for_action do |action|
       @action = action
     end
 
+    zero_attributes_failure_message = 'At least one attribute must be ' \
+      'specified when using the permit_mass_assignment_of matcher.'
+
     failure_message do |policy|
-      if defined? @action
-        "#{policy.class} does not permit the mass assignment of the " \
-          "#{attribute} attribute, when authorising the #{@action} action, " \
-          'for ' +
+      if attributes.count.zero?
+        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 + '.'
       else
-        "#{policy.class} does not permit the mass assignment of the " \
-          "#{attribute} attribute for " +
+        "#{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 + '.'
       end
     end
 
     failure_message_when_negated do |policy|
-      if defined? @action
-        "#{policy.class} does not forbid the mass assignment of the " \
-          "#{attribute} attribute, when authorising the #{@action} action, " \
-          'for ' +
+      if attributes.count.zero?
+        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 + '.'
       else
-        "#{policy.class} does not forbid the mass assignment of the " \
-          "#{attribute} attribute for " +
+        "#{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 + '.'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails