action_policy 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491af624707f597ded52f7d1cacdfc07435937250370804c0ac374f436b494ce
-  data.tar.gz: 33ac6abf6907738c6fce67193659e4fdb6615a2dd78a375dba4b57060c9d8f6e
+  metadata.gz: '095ceaf3dffeb28e23d1b89a20108ad23e6ddfb48e3fc317cf481151cdf82d66'
+  data.tar.gz: a1cac52b3641e0e3e9709a42a409324f348b13a037342cc004a4b51b99bc15ab
 SHA512:
-  metadata.gz: 54e1dffffae9777c07d47f5718143cfbc546d6d100e873aadc3a51a1e8821f6495a7d869a477ac7d9d65be1ef92e1fef8bb9adde6c5177186c63eebb8dc88a94
-  data.tar.gz: 2b866340538957aa93c5db05a9c8bc7181b9cc4b9b178a137b58a13ad0d7a5158904b911834ab5dd2cf5af4d29bca29d7003095144c7786583375ec8d273c0d5
+  metadata.gz: 3a4b4c4b40036ca59122dfa6c3623b542525b7e663ddfaacec4fe93fdadb0a85fc2c12d73f6a58c89cba8d0e647bf5ff8dbf094f6bc181db93a44a004fd07284
+  data.tar.gz: 28bbda81d9a149ad339558cc7f6b6d175f8385e3be2f0c8118df5491b8152e271382aed6d60235f3de73d73b92406d6442dcf25b24296e73af74d29054890af4

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## master
 
+## 0.6.4 (2022-01-17)
+
+- Fix loading of Rails scope matchers. ([@palkan][])
+
+[Issue #225](https://github.com/palkan/action_policy/issues/225)
+
+- Add support to assert context in test matchers ([@matsales28][])
+
+## 0.6.3 (2022-08-16)
+
+- Fix regression for [#179](https://github.com/palkan/action_policy/issues/179). ([@palkan][])
+
 ## 0.6.2 (2022-08-12)
 
 - Allow omitting authorization record if `with` is provided. ([@palkan][])
@@ -468,3 +480,4 @@ This value is now stored in a cache (if any) instead of just the call result (`t
 [@pirj]: https://github.com/pirj
 [@skojin]: https://github.com/skojin
 [@tomdalling]: https://github.com/tomdalling
+[@matsales28]: https://github.com/matsales28

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Vladimir Dementyev
+Copyright (c) 2018-2023 Vladimir Dementyev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/.rbnext/2.7/action_policy/rspec/be_authorized_to.rb

@@ -20,7 +20,7 @@ module ActionPolicy
     #   end
     #
     class BeAuthorizedTo < ::RSpec::Matchers::BuiltIn::BaseMatcher
-      attr_reader :rule, :target, :policy, :actual_calls
+      attr_reader :rule, :target, :policy, :actual_calls, :context
 
       def initialize(rule, target)
         @rule = rule
@@ -32,10 +32,16 @@ module ActionPolicy
         self
       end
 
+      def with_context(context)
+        @context = context
+        self
+      end
+
       def match(_expected, actual)
         raise "This matcher only supports block expectations" unless actual.is_a?(Proc)
 
         @policy ||= ::ActionPolicy.lookup(target)
+        @context ||= nil
 
         begin
           ActionPolicy::Testing::AuthorizeTracker.tracking { actual.call }
@@ -45,7 +51,7 @@ module ActionPolicy
 
         @actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
-        actual_calls.any? { |_1| _1.matches?(policy, rule, target) }
+        actual_calls.any? { |_1| _1.matches?(policy, rule, target, context) }
       end
 
       def does_not_match?(*)
@@ -57,6 +63,7 @@ module ActionPolicy
       def failure_message
         "expected #{formatted_record} " \
         "to be authorized with #{policy}##{rule}, " \
+        "#{context ? "and context #{context.inspect}, " : ""}" \
         "but #{actual_calls_message}"
       end
 

data/lib/.rbnext/3.0/action_policy/rspec/be_authorized_to.rb

@@ -20,7 +20,7 @@ module ActionPolicy
     #   end
     #
     class BeAuthorizedTo < ::RSpec::Matchers::BuiltIn::BaseMatcher
-      attr_reader :rule, :target, :policy, :actual_calls
+      attr_reader :rule, :target, :policy, :actual_calls, :context
 
       def initialize(rule, target)
         @rule = rule
@@ -32,10 +32,16 @@ module ActionPolicy
         self
       end
 
+      def with_context(context)
+        @context = context
+        self
+      end
+
       def match(_expected, actual)
         raise "This matcher only supports block expectations" unless actual.is_a?(Proc)
 
         @policy ||= ::ActionPolicy.lookup(target)
+        @context ||= nil
 
         begin
           ActionPolicy::Testing::AuthorizeTracker.tracking { actual.call }
@@ -45,7 +51,7 @@ module ActionPolicy
 
         @actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
-        actual_calls.any? { _1.matches?(policy, rule, target) }
+        actual_calls.any? { _1.matches?(policy, rule, target, context) }
       end
 
       def does_not_match?(*)
@@ -57,6 +63,7 @@ module ActionPolicy
       def failure_message
         "expected #{formatted_record} " \
         "to be authorized with #{policy}##{rule}, " \
+        "#{context ? "and context #{context.inspect}, " : ""}" \
         "but #{actual_calls_message}"
       end
 

data/lib/action_policy/behaviour.rb

@@ -61,7 +61,7 @@ module ActionPolicy
       @_authorization_context ||= build_authorization_context
     end
 
-    def build_authorization_context
+    private def build_authorization_context
       self.class.authorization_targets
         .each_with_object({}) do |(key, meth), obj|
         obj[key] = send(meth)
@@ -75,7 +75,7 @@ module ActionPolicy
     end
 
     def lookup_authorization_policy(record, with: nil, **options) # :nodoc:
-      if record == :__undef__
+      if :__undef__ == record # rubocop:disable Style/YodaCondition
         record =
           if with
             implicit_authorization_target

data/lib/action_policy/lookup_chain.rb

@@ -100,7 +100,7 @@ module ActionPolicy
     # Enable namespace cache by default or
     # if RACK_ENV provided and equal to "production"
     self.namespace_cache_enabled =
-      !ENV["RACK_ENV"].nil? ? ENV["RACK_ENV"] == "production" : true
+      (!ENV["RACK_ENV"].nil?) ? ENV["RACK_ENV"] == "production" : true
 
     # By self `policy_class` method
     INSTANCE_POLICY_CLASS = ->(record, **) {

data/lib/action_policy/railtie.rb

@@ -4,6 +4,14 @@ module ActionPolicy # :nodoc:
   require "action_policy/rails/controller"
   require "action_policy/rails/channel"
 
+  if defined?(::ActionController)
+    require "action_policy/rails/scope_matchers/action_controller_params"
+  end
+
+  if defined?(::ActiveRecord)
+    require "action_policy/rails/scope_matchers/active_record"
+  end
+
   class Railtie < ::Rails::Railtie # :nodoc:
     # Provides Rails-specific configuration,
     # accessible through `Rails.application.config.action_policy`
@@ -81,8 +89,6 @@ module ActionPolicy # :nodoc:
         ::Rails.application.config.action_policy.namespace_cache_enabled
 
       ActiveSupport.on_load(:action_controller) do
-        require "action_policy/rails/scope_matchers/action_controller_params"
-
         next unless ::Rails.application.config.action_policy.auto_inject_into_controller
 
         ActionController::Base.include ActionPolicy::Controller
@@ -104,7 +110,6 @@ module ActionPolicy # :nodoc:
 
       ActiveSupport.on_load(:active_record) do
         require "action_policy/rails/ext/active_record"
-        require "action_policy/rails/scope_matchers/active_record"
       end
     end
   end

data/lib/action_policy/rspec/be_authorized_to.rb

@@ -20,7 +20,7 @@ module ActionPolicy
     #   end
     #
     class BeAuthorizedTo < ::RSpec::Matchers::BuiltIn::BaseMatcher
-      attr_reader :rule, :target, :policy, :actual_calls
+      attr_reader :rule, :target, :policy, :actual_calls, :context
 
       def initialize(rule, target)
         @rule = rule
@@ -32,10 +32,16 @@ module ActionPolicy
         self
       end
 
+      def with_context(context)
+        @context = context
+        self
+      end
+
       def match(_expected, actual)
         raise "This matcher only supports block expectations" unless actual.is_a?(Proc)
 
         @policy ||= ::ActionPolicy.lookup(target)
+        @context ||= nil
 
         begin
           ActionPolicy::Testing::AuthorizeTracker.tracking { actual.call }
@@ -45,7 +51,7 @@ module ActionPolicy
 
         @actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
-        actual_calls.any? { _1.matches?(policy, rule, target) }
+        actual_calls.any? { _1.matches?(policy, rule, target, context) }
       end
 
       def does_not_match?(*)
@@ -57,6 +63,7 @@ module ActionPolicy
       def failure_message
         "expected #{formatted_record} " \
         "to be authorized with #{policy}##{rule}, " \
+        "#{context ? "and context #{context.inspect}, " : ""}" \
         "but #{actual_calls_message}"
       end
 

data/lib/action_policy/test_helper.rb

@@ -36,7 +36,7 @@ module ActionPolicy
     #       get :show, id: user.id
     #     end
     #
-    def assert_authorized_to(rule, target, with: nil)
+    def assert_authorized_to(rule, target, with: nil, context: {})
       raise ArgumentError, "Block is required" unless block_given?
 
       policy = with || ::ActionPolicy.lookup(target)
@@ -50,8 +50,9 @@ module ActionPolicy
       actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
       assert(
-        actual_calls.any? { |call| call.matches?(policy, rule, target) },
+        actual_calls.any? { |call| call.matches?(policy, rule, target, context) },
         "Expected #{target.inspect} to be authorized with #{policy}##{rule}, " \
+        "#{context ? "and context #{context}, " : ""}" \
         "but no such authorization has been made.\n" \
         "Registered authorizations: " \
         "#{actual_calls.empty? ? "none" : actual_calls.map(&:inspect).join(",")}"

data/lib/action_policy/testing.rb

@@ -13,14 +13,23 @@ module ActionPolicy
           @rule = rule
         end
 
-        def matches?(policy_class, actual_rule, target)
+        def matches?(policy_class, actual_rule, target, context)
           policy_class == policy.class &&
             (target.is_a?(Class) ? target == policy.record : target === policy.record) &&
-            rule == actual_rule
+            rule == actual_rule && context_matches?(context, policy.authorization_context)
         end
 
         def inspect
-          "#{policy.record.inspect} was authorized with #{policy.class}##{rule}"
+          "#{policy.record.inspect} was authorized with #{policy.class}##{rule} " \
+            "and context #{policy.authorization_context.inspect}"
+        end
+
+        private
+
+        def context_matches?(context, actual)
+          return true unless context
+
+          context === actual || actual >= context
         end
       end
 

data/lib/action_policy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionPolicy
-  VERSION = "0.6.2"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core