action_policy 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e78f24a8faa881e8cad62f6bb4fc58921668fb7d41ac933c7fb1934117acc7d
-  data.tar.gz: 39f55de2e98b9a1d67519df40452349a2007e8d7168039438d2c8469cc7779e7
+  metadata.gz: 0e9a1595099a6b87f22ec08fbd6676cd73cea94672c8cc9276525e82e9ba8c1a
+  data.tar.gz: bc743bbc45679d6583d3549cad77fc37f4004d051ef54d4cf8baa252730b0621
 SHA512:
-  metadata.gz: 66b0de36683bc63ce349b0fba097585b7fcb4d7d65145da53c26cd5d6f0c798ef76c447d75a987c1f16110d3d4bb379153407ef79b531613cc6cfa8e55171570
-  data.tar.gz: b7eadbbd0020e60addce888bf8287722c8bafd32a8b35ff2c66d8ea51eaa3b9c6f406e5214fdcddda4e7d4d527d12f08be3f86eac64d28db3b62b7976de28f17
+  metadata.gz: cf8db058edbeb5b198fb58f8ccab0d35e1f71aeb7891a6bab93bf6e04b9819fc321706bfbbe6437b58021325f01f62d5e891e812690a80f8464ef2c825ef8e47
+  data.tar.gz: 8aceb6e4a30d97e487b7bb29de4393c3c7f8598261c12f36dd66743d2a3c469bce61423c062e38b757d5265711d07172a743d04060dc336521f2dd10f80b7693

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master
 
+## 0.7.0 (2024-06-20)
+
+- **Ruby 2.7+** is required.
+
+- Support using callable objects as scopes. ([@killondark][])
+
+## 0.6.9 (2024-04-19)
+
+- Add `.with_context` modifier to the `#have_authorized_scope` matcher. ([@killondark][])
+
 ## 0.6.8 (2024-01-17)
 
 - Do not preload Rails base classes, use load hooks everywhere. ([@palkan][])
@@ -509,3 +519,4 @@ This value is now stored in a cache (if any) instead of just the call result (`t
 [@skojin]: https://github.com/skojin
 [@tomdalling]: https://github.com/tomdalling
 [@matsales28]: https://github.com/matsales28
+[@killondark]: https://github.com/killondark

data/lib/.rbnext/2.7/action_policy/behaviours/policy_for.rb

@@ -9,7 +9,7 @@ module ActionPolicy
 
       # Returns policy instance for the record.
       def policy_for(record:, with: nil, namespace: authorization_namespace, context: nil, allow_nil: false, default: default_authorization_policy_class, strict_namespace: authorization_strict_namespace)
-        context = context ? authorization_context.merge(context) : authorization_context
+        context = context ? build_authorization_context.merge(context) : authorization_context
 
         policy_class = with || ::ActionPolicy.lookup(
           record,
@@ -18,8 +18,10 @@ module ActionPolicy
         policy_class&.new(record, **context)
       end
 
-      def authorization_context
-        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
+      def authorization_context ;  @authorization_context ||= build_authorization_context; end
+
+      def build_authorization_context
+        Kernel.raise NotImplementedError, "Please, define `build_authorization_context` method!"
       end
 
       def authorization_namespace

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

@@ -21,7 +21,7 @@ module ActionPolicy
     #
     class HaveAuthorizedScope < ::RSpec::Matchers::BuiltIn::BaseMatcher
       attr_reader :type, :name, :policy, :scope_options, :actual_scopes,
-        :target_expectations
+        :target_expectations, :context
 
       def initialize(type)
         @type = type
@@ -49,6 +49,11 @@ 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)
 
@@ -56,7 +61,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { |_1| _1.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { |_1| _1.matches?(policy, type, name, scope_options, context) }
 
         return false if matching_scopes.empty?
 
@@ -80,6 +85,7 @@ module ActionPolicy
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
         "#{scope_options_message} " \
+        "#{context ? "and context #{context.inspect} " : ""}" \
         "from #{policy} to have been applied, " \
         "but #{actual_scopes_message}"
       end

data/lib/.rbnext/2.7/action_policy/utils/pretty_print.rb

@@ -7,8 +7,7 @@ begin
   # Ignore parse warnings when patch
   # Ruby version mismatches
   $VERBOSE = nil
-  require "parser/current"
-  require "unparser"
+  require "prism"
 rescue LoadError
   # do nothing
 ensure
@@ -42,7 +41,7 @@ module ActionPolicy
     FALSE = "\e[31mfalse\e[0m"
 
     class Visitor
-      attr_reader :lines, :object
+      attr_reader :lines, :object, :source
       attr_accessor :indent
 
       def initialize(object)
@@ -52,6 +51,8 @@ module ActionPolicy
       def collect(ast)
         @lines = []
         @indent = 0
+        @source = ast.source.source
+        ast = ast.value.child_nodes[0].child_nodes[0].body
 
         visit_node(ast)
 
@@ -67,7 +68,7 @@ module ActionPolicy
       end
 
       def expression_with_result(sexp)
-        expression = Unparser.unparse(sexp)
+        expression = source[sexp.location.start_offset...sexp.location.end_offset]
         "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
       end
 
@@ -78,36 +79,33 @@ module ActionPolicy
         "Failed: #{e.message}"
       end
 
-      def visit_and(ast)
-        visit_node(ast.children[0])
+      def visit_and_node(ast)
+        visit_node(ast.left)
         lines << indented("AND")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_or(ast)
-        visit_node(ast.children[0])
+      def visit_or_node(ast)
+        visit_node(ast.left)
         lines << indented("OR")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_begin(ast)
-        #  Parens
-        if ast.children.size == 1
-          lines << indented("(")
-          self.indent += 2
-          visit_node(ast.children[0])
+      def visit_statements_node(ast)
+        ast.child_nodes.each do |node|
+          visit_node(node)
+          # restore indent after each expression
           self.indent -= 2
-          lines << indented(")")
-        else
-          # Multiple expressions
-          ast.children.each do |node|
-            visit_node(node)
-            # restore indent after each expression
-            self.indent -= 2
-          end
         end
       end
 
+      def visit_parentheses_node(ast)
+        lines << indented("(")
+        self.indent += 2
+        visit_node(ast.child_nodes[0])
+        lines << indented(")")
+      end
+
       def visit_missing(ast)
         lines << indented(expression_with_result(ast))
       end
@@ -128,15 +126,13 @@ module ActionPolicy
     class << self
       attr_accessor :ignore_expressions
 
-      if defined?(::Unparser) && defined?(::MethodSource)
+      if defined?(::Prism) && defined?(::MethodSource)
         def available?() ;  true; end
 
         def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.method(:parse))
-          # outer node is a method definition itself
-          body = ast.children[2]
+          ast = Prism.parse(object.method(method_name).source)
 
-          Visitor.new(object).collect(body)
+          Visitor.new(object).collect(ast)
         end
       else
         def available?() ;  false; end

data/lib/.rbnext/3.0/action_policy/behaviours/policy_for.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module ActionPolicy
+  module Behaviours
+    # Adds `policy_for` method
+    module PolicyFor
+      require "action_policy/ext/policy_cache_key"
+      using ActionPolicy::Ext::PolicyCacheKey
+
+      # Returns policy instance for the record.
+      def policy_for(record:, with: nil, namespace: authorization_namespace, context: nil, allow_nil: false, default: default_authorization_policy_class, strict_namespace: authorization_strict_namespace)
+        context = context ? build_authorization_context.merge(context) : authorization_context
+
+        policy_class = with || ::ActionPolicy.lookup(
+          record,
+          namespace: namespace, context: context, allow_nil: allow_nil, default: default, strict_namespace: strict_namespace
+        )
+        policy_class&.new(record, **context)
+      end
+
+      def authorization_context ;  @authorization_context ||= build_authorization_context; end
+
+      def build_authorization_context
+        Kernel.raise NotImplementedError, "Please, define `build_authorization_context` method!"
+      end
+
+      def authorization_namespace
+        # override to provide specific authorization namespace
+      end
+
+      def default_authorization_policy_class
+        # override to provide a policy class use when no policy found
+      end
+
+      def authorization_strict_namespace
+        # override to provide strict namespace lookup option
+      end
+
+      # Override this method to provide implicit authorization target
+      # that would be used in case `record` is not specified in
+      # `authorize!` and `allowed_to?` call.
+      #
+      # It is also used to infer a policy for scoping (in `authorized_scope` method).
+      def implicit_authorization_target
+        # no-op
+      end
+
+      # Return implicit authorization target or raises an exception if it's nil
+      def implicit_authorization_target!
+        implicit_authorization_target || Kernel.raise(
+          NotFound,
+          [
+            self,
+            "Couldn't find implicit authorization target " \
+            "for #{self.class}. " \
+            "Please, provide policy class explicitly using `with` option or " \
+            "define the `implicit_authorization_target` method."
+          ]
+        )
+      end
+
+      def policy_for_cache_key(record:, with: nil, namespace: nil, context: authorization_context, **__kwrest__)
+        record_key = record._policy_cache_key(use_object_id: true)
+        context_key = context.values.map { _1._policy_cache_key(use_object_id: true) }.join(".")
+
+        "#{namespace}/#{with}/#{context_key}/#{record_key}"
+      end
+    end
+  end
+end

data/lib/.rbnext/3.0/action_policy/behaviours/thread_memoized.rb

@@ -45,7 +45,7 @@ module ActionPolicy
 
       module InstanceMethods # :nodoc:
         def policy_for(record:, **opts)
-          __policy_thread_memoize__(record, **opts) { super(record: record, **opts) }
+          __policy_thread_memoize__(record, **opts) { super }
         end
       end
 

data/lib/.rbnext/3.0/action_policy/policy/core.rb

@@ -147,7 +147,7 @@ module ActionPolicy
       end
 
       # Return annotated source code for the rule
-      # NOTE: require "method_source" and "unparser" gems to be installed.
+      # NOTE: require "method_source" and "prism" gems to be installed.
       # Otherwise returns empty string.
       def inspect_rule(rule) ;  PrettyPrint.print_method(self, rule); end
 

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

@@ -21,7 +21,7 @@ module ActionPolicy
     #
     class HaveAuthorizedScope < ::RSpec::Matchers::BuiltIn::BaseMatcher
       attr_reader :type, :name, :policy, :scope_options, :actual_scopes,
-        :target_expectations
+        :target_expectations, :context
 
       def initialize(type)
         @type = type
@@ -49,6 +49,11 @@ 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)
 
@@ -56,7 +61,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options, context) }
 
         return false if matching_scopes.empty?
 
@@ -80,6 +85,7 @@ module ActionPolicy
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
         "#{scope_options_message} " \
+        "#{context ? "and context #{context.inspect} " : ""}" \
         "from #{policy} to have been applied, " \
         "but #{actual_scopes_message}"
       end

data/lib/.rbnext/3.0/action_policy/utils/pretty_print.rb

@@ -7,8 +7,7 @@ begin
   # Ignore parse warnings when patch
   # Ruby version mismatches
   $VERBOSE = nil
-  require "parser/current"
-  require "unparser"
+  require "prism"
 rescue LoadError
   # do nothing
 ensure
@@ -42,7 +41,7 @@ module ActionPolicy
     FALSE = "\e[31mfalse\e[0m"
 
     class Visitor
-      attr_reader :lines, :object
+      attr_reader :lines, :object, :source
       attr_accessor :indent
 
       def initialize(object)
@@ -52,6 +51,8 @@ module ActionPolicy
       def collect(ast)
         @lines = []
         @indent = 0
+        @source = ast.source.source
+        ast = ast.value.child_nodes[0].child_nodes[0].body
 
         visit_node(ast)
 
@@ -67,7 +68,7 @@ module ActionPolicy
       end
 
       def expression_with_result(sexp)
-        expression = Unparser.unparse(sexp)
+        expression = source[sexp.location.start_offset...sexp.location.end_offset]
         "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
       end
 
@@ -78,36 +79,33 @@ module ActionPolicy
         "Failed: #{e.message}"
       end
 
-      def visit_and(ast)
-        visit_node(ast.children[0])
+      def visit_and_node(ast)
+        visit_node(ast.left)
         lines << indented("AND")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_or(ast)
-        visit_node(ast.children[0])
+      def visit_or_node(ast)
+        visit_node(ast.left)
         lines << indented("OR")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_begin(ast)
-        #  Parens
-        if ast.children.size == 1
-          lines << indented("(")
-          self.indent += 2
-          visit_node(ast.children[0])
+      def visit_statements_node(ast)
+        ast.child_nodes.each do |node|
+          visit_node(node)
+          # restore indent after each expression
           self.indent -= 2
-          lines << indented(")")
-        else
-          # Multiple expressions
-          ast.children.each do |node|
-            visit_node(node)
-            # restore indent after each expression
-            self.indent -= 2
-          end
         end
       end
 
+      def visit_parentheses_node(ast)
+        lines << indented("(")
+        self.indent += 2
+        visit_node(ast.child_nodes[0])
+        lines << indented(")")
+      end
+
       def visit_missing(ast)
         lines << indented(expression_with_result(ast))
       end
@@ -128,15 +126,13 @@ module ActionPolicy
     class << self
       attr_accessor :ignore_expressions
 
-      if defined?(::Unparser) && defined?(::MethodSource)
+      if defined?(::Prism) && defined?(::MethodSource)
         def available?() ;  true; end
 
         def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.method(:parse))
-          # outer node is a method definition itself
-          body = ast.children[2]
+          ast = Prism.parse(object.method(method_name).source)
 
-          Visitor.new(object).collect(body)
+          Visitor.new(object).collect(ast)
         end
       else
         def available?() ;  false; end

data/lib/.rbnext/3.1/action_policy/behaviours/policy_for.rb

@@ -9,7 +9,7 @@ module ActionPolicy
 
       # Returns policy instance for the record.
       def policy_for(record:, with: nil, namespace: authorization_namespace, context: nil, allow_nil: false, default: default_authorization_policy_class, strict_namespace: authorization_strict_namespace)
-        context = context ? authorization_context.merge(context) : authorization_context
+        context = context ? build_authorization_context.merge(context) : authorization_context
 
         policy_class = with || ::ActionPolicy.lookup(
           record,
@@ -18,8 +18,10 @@ module ActionPolicy
         policy_class&.new(record, **context)
       end
 
-      def authorization_context
-        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
+      def authorization_context = @authorization_context ||= build_authorization_context
+
+      def build_authorization_context
+        Kernel.raise NotImplementedError, "Please, define `build_authorization_context` method!"
       end
 
       def authorization_namespace

data/lib/.rbnext/3.1/action_policy/policy/authorization.rb

@@ -42,6 +42,7 @@ module ActionPolicy
       end
 
       attr_reader :authorization_context
+      alias_method :build_authorization_context, :authorization_context
 
       def initialize(record = nil, **params)
         super(record)

data/lib/.rbnext/3.2/action_policy/behaviours/policy_for.rb

@@ -9,7 +9,7 @@ module ActionPolicy
 
       # Returns policy instance for the record.
       def policy_for(record:, with: nil, namespace: authorization_namespace, context: nil, allow_nil: false, default: default_authorization_policy_class, strict_namespace: authorization_strict_namespace)
-        context = context ? authorization_context.merge(context) : authorization_context
+        context = context ? build_authorization_context.merge(context) : authorization_context
 
         policy_class = with || ::ActionPolicy.lookup(
           record,
@@ -18,8 +18,10 @@ module ActionPolicy
         policy_class&.new(record, **context)
       end
 
-      def authorization_context
-        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
+      def authorization_context = @authorization_context ||= build_authorization_context
+
+      def build_authorization_context
+        Kernel.raise NotImplementedError, "Please, define `build_authorization_context` method!"
       end
 
       def authorization_namespace

data/lib/.rbnext/3.2/action_policy/policy/core.rb

@@ -147,7 +147,7 @@ module ActionPolicy
       end
 
       # Return annotated source code for the rule
-      # NOTE: require "method_source" and "unparser" gems to be installed.
+      # NOTE: require "method_source" and "prism" gems to be installed.
       # Otherwise returns empty string.
       def inspect_rule(rule) = PrettyPrint.print_method(self, rule)
 

data/lib/.rbnext/3.2/action_policy/rspec/have_authorized_scope.rb

@@ -21,7 +21,7 @@ module ActionPolicy
     #
     class HaveAuthorizedScope < ::RSpec::Matchers::BuiltIn::BaseMatcher
       attr_reader :type, :name, :policy, :scope_options, :actual_scopes,
-        :target_expectations
+        :target_expectations, :context
 
       def initialize(type)
         @type = type
@@ -49,6 +49,11 @@ 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)
 
@@ -56,7 +61,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options, context) }
 
         return false if matching_scopes.empty?
 
@@ -80,6 +85,7 @@ module ActionPolicy
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
         "#{scope_options_message} " \
+        "#{context ? "and context #{context.inspect} " : ""}" \
         "from #{policy} to have been applied, " \
         "but #{actual_scopes_message}"
       end

data/lib/action_policy/behaviours/memoized.rb

@@ -29,7 +29,7 @@ module ActionPolicy
 
       module InstanceMethods # :nodoc:
         def policy_for(record:, **opts)
-          __policy_memoize__(record, **opts) { super(record: record, **opts) }
+          __policy_memoize__(record, **opts) { super }
         end
       end
 

data/lib/action_policy/behaviours/policy_for.rb

@@ -9,7 +9,7 @@ module ActionPolicy
 
       # Returns policy instance for the record.
       def policy_for(record:, with: nil, namespace: authorization_namespace, context: nil, allow_nil: false, default: default_authorization_policy_class, strict_namespace: authorization_strict_namespace)
-        context = context ? authorization_context.merge(context) : authorization_context
+        context = context ? build_authorization_context.merge(context) : authorization_context
 
         policy_class = with || ::ActionPolicy.lookup(
           record,
@@ -18,8 +18,10 @@ module ActionPolicy
         policy_class&.new(record, **context)
       end
 
-      def authorization_context
-        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
+      def authorization_context = @authorization_context ||= build_authorization_context
+
+      def build_authorization_context
+        Kernel.raise NotImplementedError, "Please, define `build_authorization_context` method!"
       end
 
       def authorization_namespace

data/lib/action_policy/behaviours/thread_memoized.rb

@@ -45,7 +45,7 @@ module ActionPolicy
 
       module InstanceMethods # :nodoc:
         def policy_for(record:, **opts)
-          __policy_thread_memoize__(record, **opts) { super(record: record, **opts) }
+          __policy_thread_memoize__(record, **opts) { super }
         end
       end
 

data/lib/action_policy/policy/authorization.rb

@@ -42,6 +42,7 @@ module ActionPolicy
       end
 
       attr_reader :authorization_context
+      alias_method :build_authorization_context, :authorization_context
 
       def initialize(record = nil, **params)
         super(record)

data/lib/action_policy/policy/core.rb

@@ -147,7 +147,7 @@ module ActionPolicy
       end
 
       # Return annotated source code for the rule
-      # NOTE: require "method_source" and "unparser" gems to be installed.
+      # NOTE: require "method_source" and "prism" gems to be installed.
       # Otherwise returns empty string.
       def inspect_rule(rule) = PrettyPrint.print_method(self, rule)
 

data/lib/action_policy/policy/scoping.rb

@@ -113,8 +113,11 @@ module ActionPolicy
 
       module ClassMethods # :nodoc:
         # Register a new scoping method for the `type`
-        def scope_for(type, name = :default, &block)
+        def scope_for(type, name = :default, callable = nil, &block)
+          name, callable = prepare_args(name, callable)
+
           mid = :"__scoping__#{type}__#{name}"
+          block = ->(target) { callable.call(self, target) } if callable
 
           define_method(mid, &block)
 
@@ -154,6 +157,14 @@ module ActionPolicy
             []
           end
         end
+
+        private
+
+        def prepare_args(name, callable)
+          return [name, callable] if name && callable
+          return [name, nil] if name.is_a?(Symbol) || name.is_a?(String)
+          [:default, name]
+        end
       end
     end
   end

data/lib/action_policy/rails/controller.rb

@@ -48,7 +48,7 @@ module ActionPolicy
     def authorize!(record = :__undef__, to: nil, **options)
       to ||= :"#{action_name}?"
 
-      super(record, to: to, **options)
+      super
 
       self.authorize_count += 1
     end

data/lib/action_policy/rspec/have_authorized_scope.rb

@@ -21,7 +21,7 @@ module ActionPolicy
     #
     class HaveAuthorizedScope < ::RSpec::Matchers::BuiltIn::BaseMatcher
       attr_reader :type, :name, :policy, :scope_options, :actual_scopes,
-        :target_expectations
+        :target_expectations, :context
 
       def initialize(type)
         @type = type
@@ -49,6 +49,11 @@ 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)
 
@@ -56,7 +61,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options, context) }
 
         return false if matching_scopes.empty?
 
@@ -80,6 +85,7 @@ module ActionPolicy
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
         "#{scope_options_message} " \
+        "#{context ? "and context #{context.inspect} " : ""}" \
         "from #{policy} to have been applied, " \
         "but #{actual_scopes_message}"
       end

data/lib/action_policy/test_helper.rb

@@ -82,7 +82,7 @@ module ActionPolicy
     #     end
     #   end
     #
-    def assert_have_authorized_scope(type:, with:, as: :default, scope_options: nil)
+    def assert_have_authorized_scope(type:, with:, as: :default, scope_options: nil, context: {})
       raise ArgumentError, "Block is required" unless block_given?
 
       policy = with
@@ -97,10 +97,13 @@ module ActionPolicy
         "without scope options"
       end
 
+      context_message = context.empty? ? "without context" : "with context: #{context}"
+
       assert(
-        actual_scopes.any? { |scope| scope.matches?(policy, type, as, scope_options) },
+        actual_scopes.any? { |scope| scope.matches?(policy, type, as, scope_options, context) },
         "Expected a scoping named :#{as} for :#{type} type " \
         "#{scope_options_message} " \
+        "and #{context_message} " \
         "from #{policy} to have been applied, " \
         "but no such scoping has been made.\n" \
         "Registered scopings: " \

data/lib/action_policy/testing.rb

@@ -5,7 +5,19 @@ module ActionPolicy
   module Testing
     # Collects all Authorizer calls
     module AuthorizeTracker
+      module Context
+        private
+
+        def context_matches?(context, actual)
+          return true unless context
+
+          context === actual || actual >= context
+        end
+      end
+
       class Call # :nodoc:
+        include Context
+
         attr_reader :policy, :rule
 
         def initialize(policy, rule)
@@ -23,17 +35,11 @@ module ActionPolicy
           "#{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
 
       class Scoping # :nodoc:
+        include Context
+
         attr_reader :policy, :target, :type, :name, :scope_options
 
         def initialize(policy, target, type, name, scope_options)
@@ -44,11 +50,12 @@ module ActionPolicy
           @scope_options = scope_options
         end
 
-        def matches?(policy_class, actual_type, actual_name, actual_scope_options)
+        def matches?(policy_class, actual_type, actual_name, actual_scope_options, actual_context)
           policy_class == policy.class &&
             type == actual_type &&
             name == actual_name &&
-            actual_scope_options === scope_options
+            actual_scope_options === scope_options &&
+            context_matches?(actual_context, policy.authorization_context)
         end
 
         def inspect

data/lib/action_policy/utils/pretty_print.rb

@@ -7,8 +7,7 @@ begin
   # Ignore parse warnings when patch
   # Ruby version mismatches
   $VERBOSE = nil
-  require "parser/current"
-  require "unparser"
+  require "prism"
 rescue LoadError
   # do nothing
 ensure
@@ -42,7 +41,7 @@ module ActionPolicy
     FALSE = "\e[31mfalse\e[0m"
 
     class Visitor
-      attr_reader :lines, :object
+      attr_reader :lines, :object, :source
       attr_accessor :indent
 
       def initialize(object)
@@ -52,6 +51,8 @@ module ActionPolicy
       def collect(ast)
         @lines = []
         @indent = 0
+        @source = ast.source.source
+        ast = ast.value.child_nodes[0].child_nodes[0].body
 
         visit_node(ast)
 
@@ -67,7 +68,7 @@ module ActionPolicy
       end
 
       def expression_with_result(sexp)
-        expression = Unparser.unparse(sexp)
+        expression = source[sexp.location.start_offset...sexp.location.end_offset]
         "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
       end
 
@@ -78,36 +79,33 @@ module ActionPolicy
         "Failed: #{e.message}"
       end
 
-      def visit_and(ast)
-        visit_node(ast.children[0])
+      def visit_and_node(ast)
+        visit_node(ast.left)
         lines << indented("AND")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_or(ast)
-        visit_node(ast.children[0])
+      def visit_or_node(ast)
+        visit_node(ast.left)
         lines << indented("OR")
-        visit_node(ast.children[1])
+        visit_node(ast.right)
       end
 
-      def visit_begin(ast)
-        #  Parens
-        if ast.children.size == 1
-          lines << indented("(")
-          self.indent += 2
-          visit_node(ast.children[0])
+      def visit_statements_node(ast)
+        ast.child_nodes.each do |node|
+          visit_node(node)
+          # restore indent after each expression
           self.indent -= 2
-          lines << indented(")")
-        else
-          # Multiple expressions
-          ast.children.each do |node|
-            visit_node(node)
-            # restore indent after each expression
-            self.indent -= 2
-          end
         end
       end
 
+      def visit_parentheses_node(ast)
+        lines << indented("(")
+        self.indent += 2
+        visit_node(ast.child_nodes[0])
+        lines << indented(")")
+      end
+
       def visit_missing(ast)
         lines << indented(expression_with_result(ast))
       end
@@ -128,15 +126,13 @@ module ActionPolicy
     class << self
       attr_accessor :ignore_expressions
 
-      if defined?(::Unparser) && defined?(::MethodSource)
+      if defined?(::Prism) && defined?(::MethodSource)
         def available?() = true
 
         def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.:parse)
-          # outer node is a method definition itself
-          body = ast.children[2]
+          ast = Prism.parse(object.method(method_name).source)
 
-          Visitor.new(object).collect(body)
+          Visitor.new(object).collect(ast)
         end
       else
         def available?() = false

data/lib/action_policy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -133,7 +133,6 @@ files:
 - LICENSE.txt
 - README.md
 - config/rubocop-rspec.yml
-- lib/.rbnext/1995.next/action_policy/utils/pretty_print.rb
 - lib/.rbnext/2.7/action_policy/behaviours/policy_for.rb
 - lib/.rbnext/2.7/action_policy/i18n.rb
 - lib/.rbnext/2.7/action_policy/policy/cache.rb
@@ -143,6 +142,7 @@ files:
 - lib/.rbnext/2.7/action_policy/rspec/be_authorized_to.rb
 - lib/.rbnext/2.7/action_policy/rspec/have_authorized_scope.rb
 - lib/.rbnext/2.7/action_policy/utils/pretty_print.rb
+- lib/.rbnext/3.0/action_policy/behaviours/policy_for.rb
 - lib/.rbnext/3.0/action_policy/behaviours/thread_memoized.rb
 - lib/.rbnext/3.0/action_policy/ext/policy_cache_key.rb
 - lib/.rbnext/3.0/action_policy/policy/aliases.rb
@@ -234,7 +234,7 @@ metadata:
   documentation_uri: https://actionpolicy.evilmartians.io/
   homepage_uri: https://actionpolicy.evilmartians.io/
   source_code_uri: http://github.com/palkan/action_policy
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -242,15 +242,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Authorization framework for Ruby/Rails application
 test_files: []

data/lib/.rbnext/1995.next/action_policy/utils/pretty_print.rb

@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-
-old_verbose = $VERBOSE
-
-begin
-  require "method_source"
-  # Ignore parse warnings when patch
-  # Ruby version mismatches
-  $VERBOSE = nil
-  require "parser/current"
-  require "unparser"
-rescue LoadError
-  # do nothing
-ensure
-  $VERBOSE = old_verbose
-end
-
-module ActionPolicy
-  using RubyNext
-
-  # Takes the object and a method name,
-  # and returns the "annotated" source code for the method:
-  # code is split into parts by logical operators and each
-  # part is evaluated separately.
-  #
-  # Example:
-  #
-  #  class MyClass
-  #    def access?
-  #      admin? && access_feed?
-  #    end
-  #  end
-  #
-  #  puts PrettyPrint.format_method(MyClass.new, :access?)
-  #
-  #  #=> MyClass#access?
-  #  #=> ↳ admin? #=> false
-  #  #=> AND
-  #  #=> access_feed? #=> true
-  module PrettyPrint
-    TRUE = "\e[32mtrue\e[0m"
-    FALSE = "\e[31mfalse\e[0m"
-
-    class Visitor
-      attr_reader :lines, :object
-      attr_accessor :indent
-
-      def initialize(object)
-        @object = object
-      end
-
-      def collect(ast)
-        @lines = []
-        @indent = 0
-
-        visit_node(ast)
-
-        lines.join("\n")
-      end
-
-      def visit_node(ast)
-        if respond_to?("visit_#{ast.type}")
-          send("visit_#{ast.type}", ast)
-        else
-          visit_missing ast
-        end
-      end
-
-      def expression_with_result(sexp)
-        expression = Unparser.unparse(sexp)
-        "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
-      end
-
-      def eval_exp(exp)
-        return "<skipped>" if ignore_exp?(exp)
-        object.instance_eval(exp)
-      rescue => e
-        "Failed: #{e.message}"
-      end
-
-      def visit_and(ast)
-        visit_node(ast.children[0])
-        lines << indented("AND")
-        visit_node(ast.children[1])
-      end
-
-      def visit_or(ast)
-        visit_node(ast.children[0])
-        lines << indented("OR")
-        visit_node(ast.children[1])
-      end
-
-      def visit_begin(ast)
-        #  Parens
-        if ast.children.size == 1
-          lines << indented("(")
-          self.indent += 2
-          visit_node(ast.children[0])
-          self.indent -= 2
-          lines << indented(")")
-        else
-          # Multiple expressions
-          ast.children.each do |node|
-            visit_node(node)
-            # restore indent after each expression
-            self.indent -= 2
-          end
-        end
-      end
-
-      def visit_missing(ast)
-        lines << indented(expression_with_result(ast))
-      end
-
-      def indented(str)
-        "#{indent.zero? ? "↳ " : ""}#{" " * indent}#{str}".tap do
-          # increase indent after the first expression
-          self.indent += 2 if indent.zero?
-        end
-      end
-
-      # Some lines should not be evaled
-      def ignore_exp?(exp)
-        PrettyPrint.ignore_expressions.any? { exp.match?(_1) }
-      end
-    end
-
-    class << self
-      attr_accessor :ignore_expressions
-
-      if defined?(::Unparser) && defined?(::MethodSource)
-        def available?() = true
-
-        def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.method(:parse))
-          # outer node is a method definition itself
-          body = ast.children[2]
-
-          Visitor.new(object).collect(body)
-        end
-      else
-        def available?() = false
-
-        def print_method(_, _) = ""
-      end
-
-      def colorize(val)
-        return val unless $stdout.isatty
-        return TRUE if val.eql?(true) # rubocop:disable Lint/DeprecatedConstants
-        return FALSE if val.eql?(false) # rubocop:disable Lint/DeprecatedConstants
-        val
-      end
-    end
-
-    self.ignore_expressions = [
-      /^\s*binding\.(pry|irb)\s*$/s
-    ]
-  end
-end