pundit-matchers 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6da63810349db845aacf792c80cd2436b275eaf9
-  data.tar.gz: d7f3c91ccaf71149e87d9a87198006d148be3c9b
+  metadata.gz: c237783c9720f52b37ead7abf55f5c383107d4bb
+  data.tar.gz: 1e7f173871d4460b1124584cc2b9e6b522cf6251
 SHA512:
-  metadata.gz: 3fc712d8b3b02dfdab84de7a0b9c5b368d52715c0691bc4cc43678748282099433d099d05a7eac43e6ed9e888d234af2380447960a93d02d095ad8f174601d51
-  data.tar.gz: 3e9d67313289a15a7f9aee53086020780024d55d2a819db783db9a8bec317ab55addb777c7cb6392019c1cda7458b9d94f1826d36953ce5eff23e7bfd354d336
+  metadata.gz: 37abbbf51d6f80013ed6e1a6a59b38aa60a89f6ef3ea4e75e8073e88180dcc7c959669b7e45ffd6f3106f56ed8d78299d6483f1671c57523650cb6f600100680
+  data.tar.gz: 1ce22d083a336dbb4934bcd329a652038fc96376510e40695efc47805e2823674467586835109bab06f8990717cab9bbfbee27d36a9b3d7dacdc65bb6ab3bd8f

data/lib/pundit/matchers.rb

@@ -8,61 +8,81 @@ module Pundit
       end
 
       failure_message do |policy|
-        "#{policy.class} does not permit #{action} on #{policy.record} for " +
+        "#{policy.class} does not permit #{action} on #{policy.record} for " \
           "#{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not forbid #{action} on #{policy.record} for " +
+        "#{policy.class} does not forbid #{action} on #{policy.record} for " \
           "#{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :permit_new_and_create_actions do
       match do |policy|
-        policy.new? and policy.create?
+        policy.new? && policy.create?
       end
 
       failure_message do |policy|
-        "#{policy.class} does not permit the new or create action on " +
+        "#{policy.class} does not permit the new or create action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not forbid the new or create action on " +
+        "#{policy.class} does not forbid the new or create action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :permit_edit_and_update_actions do
       match do |policy|
-        policy.edit? and policy.update?
+        policy.edit? && policy.update?
       end
 
       failure_message do |policy|
-        "#{policy.class} does not permit the edit or update action on " +
+        "#{policy.class} does not permit the edit or update action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not forbid the edit or update action on " +
+        "#{policy.class} does not forbid the edit or update action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :permit_mass_assignment_of do |attribute|
       match do |policy|
-        policy.permitted_attributes.include? attribute
+        if @action
+          policy.send("permitted_attributes_for_#{@action}").include? attribute
+        else
+          policy.permitted_attributes.include? attribute
+        end
+      end
+
+      chain :for_action do |action|
+        @action = action
       end
 
       failure_message do |policy|
-        "#{policy.class} does not permit the mass assignment of the " +
-          "#{attribute} attribute for #{policy.user.inspect}."
+        if @action
+          "#{policy.class} does not permit the mass assignment of the " \
+            "#{attribute} attribute, when authorising the #{@action} action, " \
+            "for #{policy.user.inspect}."
+        else
+          "#{policy.class} does not permit the mass assignment of the " \
+            "#{attribute} attribute for #{policy.user.inspect}."
+        end
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not forbid the mass assignment of the " +
-          "#{attribute} attribute for #{policy.user.inspect}."
+        if @action
+          "#{policy.class} does not forbid the mass assignment of the " \
+            "#{attribute} attribute, when authorising the #{@action} action, " \
+            "for #{policy.user.inspect}."
+        else
+          "#{policy.class} does not forbid the mass assignment of the " \
+            "#{attribute} attribute for #{policy.user.inspect}."
+        end
       end
     end
 
@@ -72,61 +92,81 @@ module Pundit
       end
 
       failure_message do |policy|
-        "#{policy.class} does not forbid #{action} on #{policy.record} for " +
+        "#{policy.class} does not forbid #{action} on #{policy.record} for " \
           "#{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not permit #{action} on #{policy.record} for " +
+        "#{policy.class} does not permit #{action} on #{policy.record} for " \
           "#{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :forbid_new_and_create_actions do
       match do |policy|
-        !policy.new? and !policy.create?
+        !policy.new? && !policy.create?
       end
 
       failure_message do |policy|
-        "#{policy.class} does not forbid the new or create action on " +
+        "#{policy.class} does not forbid the new or create action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not permit the new or create action on " +
+        "#{policy.class} does not permit the new or create action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :forbid_edit_and_update_actions do
       match do |policy|
-        !policy.edit? and !policy.update?
+        !policy.edit? && !policy.update?
       end
 
       failure_message do |policy|
-        "#{policy.class} does not forbid the edit or update action on " +
+        "#{policy.class} does not forbid the edit or update action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not permit the edit or update action on " +
+        "#{policy.class} does not permit the edit or update action on " \
           "#{policy.record} for #{policy.user.inspect}."
       end
     end
 
     RSpec::Matchers.define :forbid_mass_assignment_of do |attribute|
       match do |policy|
-        policy.permitted_attributes.exclude? attribute
+        if @action
+          policy.send("permitted_attributes_for_#{@action}").exclude? attribute
+        else
+          policy.permitted_attributes.exclude? attribute
+        end
+      end
+
+      chain :for_action do |action|
+        @action = action
       end
 
       failure_message do |policy|
-        "#{policy.class} does not forbid the mass assignment of the " +
-          "#{attribute} attribute for #{policy.user.inspect}."
+        if @action
+          "#{policy.class} does not forbid the mass assignment of the " \
+            "#{attribute} attribute, when authorising the #{@action} action, " \
+            "for #{policy.user.inspect}."
+        else
+          "#{policy.class} does not forbid the mass assignment of the " \
+            "#{attribute} attribute for #{policy.user.inspect}."
+        end
       end
 
       failure_message_when_negated do |policy|
-        "#{policy.class} does not permit the mass assignment of the " +
-          "#{attribute} attribute for #{policy.user.inspect}."
+        if @action
+          "#{policy.class} does not permit the mass assignment of the " \
+            "#{attribute} attribute, when authorising the #{@action} action, " \
+            "for #{policy.user.inspect}."
+        else
+          "#{policy.class} does not permit the mass assignment of the " \
+            "#{attribute} attribute for #{policy.user.inspect}."
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement