pundit-matchers 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75eb6737bf97672c843b34798c76b2166c066224
-  data.tar.gz: d2a0041a8e59749948b8d3550e73532cca186baa
+  metadata.gz: 093d792efab35a52d2323239c1a743e67e6d9e8e
+  data.tar.gz: 114b33b8bd33f2fcffd816d01ac7370dc47cc3e4
 SHA512:
-  metadata.gz: 46b092d9f548f9a8c48c622fd70e7c78f4aec1f0e09956dcd06c1031fea94158e103fef923d090bd24a76020881bddd868cebe708e2cf27facd0e70ec49cb514
-  data.tar.gz: 4af2e2282a5bd8a65122a5c9b44b1befaba373e33fe5a3830aeebe9588d29cb253a243a2ec846bcbebf0e95ae1cabdaeb22be66409161c3214fcb5428f12837f
+  metadata.gz: 24076c702f7f4cc4b9c0eaa880400c773df365b5459763fbd5cb5a84194fe15ee03864c05a18a0f4d6f3e834f28dc8a42184f3ac602fd346dbd25062b22ff6e2
+  data.tar.gz: b51fb79d247ff289cf108b99b991451e02e24cb9ee29c423f76203564593919e353d894d4d9707bf8bf2ce450320aff03a1507e80870e959b6139f5fd50c8392

data/lib/pundit/matchers.rb

@@ -1,7 +1,18 @@
 require 'rspec/core'
+require 'pundit/matchers/configuration'
 
 module Pundit
   module Matchers
+    class << self
+      def configure
+        yield(configuration)
+      end
+
+      def configuration
+        @configuration ||= Pundit::Matchers::Configuration.new
+      end
+    end
+
     RSpec::Matchers.define :forbid_action do |action, *args|
       match do |policy|
         if args.any?
@@ -12,13 +23,15 @@ module Pundit
       end
 
       failure_message do |policy|
-        "#{policy.class} does not forbid #{action} for " \
-          "#{policy.user.inspect}."
+        "#{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.user.inspect}."
+        "#{policy.class} does not permit #{action} for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
   end
@@ -38,20 +51,24 @@ module Pundit
       'specified when using the forbid_actions matcher.'
 
     failure_message do |policy|
-      if actions.count == 0
+      if actions.count.zero?
         zero_actions_failure_message
       else
         "#{policy.class} expected to forbid #{actions}, but allowed " \
-          "#{allowed_actions} for #{policy.user.inspect}."
+          "#{allowed_actions} for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
 
     failure_message_when_negated do |policy|
-      if actions.count == 0
+      if actions.count.zero?
         zero_actions_failure_message
       else
         "#{policy.class} expected to permit #{actions}, but forbade " \
-          "#{allowed_actions} for #{policy.user.inspect}."
+          "#{allowed_actions} for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
   end
@@ -62,13 +79,15 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not forbid the edit or update action for " \
-        "#{policy.user.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.user.inspect}."
+      "#{policy.class} does not permit the edit or update action for " +
+        policy.public_send(Pundit::Matchers.configuration.user_alias)
+              .inspect + '.'
     end
   end
 
@@ -89,10 +108,14 @@ module Pundit
       if defined? @action
         "#{policy.class} does not forbid the mass assignment of the " \
           "#{attribute} attribute, when authorising the #{@action} action, " \
-          "for #{policy.user.inspect}."
+          '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.user.inspect}."
+          "#{attribute} attribute for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
 
@@ -100,10 +123,14 @@ module Pundit
       if defined? @action
         "#{policy.class} does not permit the mass assignment of the " \
           "#{attribute} attribute, when authorising the #{@action} action, " \
-          "for #{policy.user.inspect}."
+          '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.user.inspect}."
+          "#{attribute} attribute for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
   end
@@ -114,13 +141,15 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not forbid the new or create action for " \
-        "#{policy.user.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.user.inspect}."
+      "#{policy.class} does not permit the new or create action for " +
+        policy.public_send(Pundit::Matchers.configuration.user_alias)
+              .inspect + '.'
     end
   end
 
@@ -134,13 +163,15 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit #{action} for " \
-        "#{policy.user.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.user.inspect}."
+      "#{policy.class} does not forbid #{action} for " +
+        policy.public_send(Pundit::Matchers.configuration.user_alias)
+              .inspect + '.'
     end
   end
 
@@ -159,20 +190,24 @@ module Pundit
       'when using the permit_actions matcher.'
 
     failure_message do |policy|
-      if actions.count == 0
+      if actions.count.zero?
         zero_actions_failure_message
       else
         "#{policy.class} expected to permit #{actions}, but forbade " \
-          "#{forbidden_actions} for #{policy.user.inspect}."
+          "#{forbidden_actions} for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
 
     failure_message_when_negated do |policy|
-      if actions.count == 0
+      if actions.count.zero?
         zero_actions_failure_message
       else
         "#{policy.class} expected to forbid #{actions}, but allowed " \
-          "#{forbidden_actions} for #{policy.user.inspect}."
+          "#{forbidden_actions} for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
   end
@@ -183,13 +218,15 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit the edit or update action for " \
-        "#{policy.user.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.user.inspect}."
+      "#{policy.class} does not forbid the edit or update action for " +
+        policy.public_send(Pundit::Matchers.configuration.user_alias)
+              .inspect + '.'
     end
   end
 
@@ -210,10 +247,14 @@ module Pundit
       if defined? @action
         "#{policy.class} does not permit the mass assignment of the " \
           "#{attribute} attribute, when authorising the #{@action} action, " \
-          "for #{policy.user.inspect}."
+          '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.user.inspect}."
+          "#{attribute} attribute for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
 
@@ -221,10 +262,14 @@ module Pundit
       if defined? @action
         "#{policy.class} does not forbid the mass assignment of the " \
           "#{attribute} attribute, when authorising the #{@action} action, " \
-          "for #{policy.user.inspect}."
+          '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.user.inspect}."
+          "#{attribute} attribute for " +
+          policy.public_send(Pundit::Matchers.configuration.user_alias)
+                .inspect + '.'
       end
     end
   end
@@ -235,13 +280,15 @@ module Pundit
     end
 
     failure_message do |policy|
-      "#{policy.class} does not permit the new or create action for " \
-        "#{policy.user.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.user.inspect}."
+      "#{policy.class} does not forbid the new or create action for " +
+        policy.public_send(Pundit::Matchers.configuration.user_alias)
+              .inspect + '.'
     end
   end
 end

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: pundit-matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Chris Alley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pundit
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: 1.1.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 1.1.0
 description: A set of RSpec matchers for testing Pundit authorisation policies
 email: chris@chrisalley.info
 executables: []