action_policy 0.4.4 → 0.5.4

data/lib/action_policy/policy/defaults.rb

@@ -21,17 +21,11 @@ module ActionPolicy
         base.authorize :user
       end
 
-      def index?
-        false
-      end
+      def index?() = false
 
-      def create?
-        false
-      end
+      def create?() = false
 
-      def manage?
-        false
-      end
+      def manage?() = false
     end
   end
 end

data/lib/action_policy/policy/execution_result.rb

@@ -19,21 +19,15 @@ module ActionPolicy
         @value = value
       end
 
-      def success?
-        @value == true
-      end
+      def success?() = @value == true
 
-      def fail?
-        @value == false
-      end
+      def fail?() = @value == false
 
       def cached!
         @cached = true
       end
 
-      def cached?
-        @cached == true
-      end
+      def cached?() = @cached == true
 
       def inspect
         "<#{policy}##{rule}: #{@value}>"

data/lib/action_policy/policy/pre_check.rb

@@ -31,40 +31,12 @@ module ActionPolicy
       #
       # Implements filtering logic.
       class Check
-        # Wrapper over check result
-        class Result
-          DENY = :__deny__
-          ALLOW = :__allow__
-
-          KINDS = {
-            DENY => false,
-            ALLOW => true
-          }.freeze
-
-          attr_reader :fulfilled
-
-          def initialize(val)
-            @fulfilled = KINDS.key?(val)
-            @value = val
-          end
-
-          alias fulfilled? fulfilled
-
-          def denied?
-            @value == DENY
-          end
-
-          def value
-            KINDS.fetch(@value)
-          end
-        end
-
         attr_reader :name, :policy_class
 
         def initialize(policy, name, except: nil, only: nil)
           if !except.nil? && !only.nil?
             raise ArgumentError,
-                  "Only one of `except` and `only` may be specified for pre-check"
+              "Only one of `except` and `only` may be specified for pre-check"
           end
 
           @policy_class = policy
@@ -80,23 +52,17 @@ module ActionPolicy
           filter.call(rule)
         end
 
-        def call(policy)
-          Result.new(policy.send(name)).tap do |res|
-            # add denial reason if Reasons included
-            policy.result.reasons.add(policy, name) if
-              res.denied? && policy.result.respond_to?(:reasons)
-          end
-        end
+        def call(policy) = policy.send(name)
 
         def skip!(except: nil, only: nil)
           if !except.nil? && !only.nil?
             raise ArgumentError,
-                  "Only one of `except` and `only` may be specified when skipping pre-check"
+              "Only one of `except` and `only` may be specified when skipping pre-check"
           end
 
           if except.nil? && only.nil?
             raise ArgumentError,
-                  "At least one of `except` and `only` must be specified when skipping pre-check"
+              "At least one of `except` and `only` must be specified when skipping pre-check"
           end
 
           if except
@@ -116,7 +82,12 @@ module ActionPolicy
         # rubocop: enable
 
         def dup
-          self.class.new(policy_class, name, except: blacklist&.dup, only: whitelist&.dup)
+          self.class.new(
+            policy_class,
+            name,
+            except: blacklist&.dup,
+            only: whitelist&.dup
+          )
         end
 
         private
@@ -142,21 +113,12 @@ module ActionPolicy
       def run_pre_checks(rule)
         self.class.pre_checks.each do |check|
           next unless check.applicable?(rule)
-          res = check.call(self)
-          return res.value if res.fulfilled?
+          check.call(self)
         end
 
         yield if block_given?
       end
 
-      def deny!
-        Check::Result::DENY
-      end
-
-      def allow!
-        Check::Result::ALLOW
-      end
-
       def __apply__(rule)
         run_pre_checks(rule) { super }
       end
@@ -165,7 +127,7 @@ module ActionPolicy
         def pre_check(*names, **options)
           names.each do |name|
             # do not allow pre-check override
-            check = pre_checks.find { |c| c.name == name }
+            check = pre_checks.find { _1.name == name }
             raise "Pre-check already defined: #{name}" unless check.nil?
 
             pre_checks << Check.new(self, name, **options)
@@ -174,26 +136,25 @@ module ActionPolicy
 
         def skip_pre_check(*names, **options)
           names.each do |name|
-            check = pre_checks.find { |c| c.name == name }
+            check = pre_checks.find { _1.name == name }
             raise "Pre-check not found: #{name}" if check.nil?
 
             # when no options provided we remove this check completely
             next pre_checks.delete(check) if options.empty?
 
             # otherwise duplicate and apply skip options
-            pre_checks[pre_checks.index(check)] = check.dup.tap { |c| c.skip!(**options) }
+            pre_checks[pre_checks.index(check)] = check.dup.tap { _1.skip!(**options) }
           end
         end
 
         def pre_checks
           return @pre_checks if instance_variable_defined?(:@pre_checks)
 
-          @pre_checks =
-            if superclass.respond_to?(:pre_checks)
-              superclass.pre_checks.dup
-            else
-              []
-            end
+          if superclass.respond_to?(:pre_checks)
+            superclass.pre_checks.dup
+          else
+            []
+          end => @pre_checks
         end
       end
     end

data/lib/action_policy/policy/reasons.rb

@@ -1,16 +1,8 @@
 # frozen_string_literal: true
 
-unless "".respond_to?(:then)
-  require "action_policy/ext/yield_self_then"
-  using ActionPolicy::Ext::YieldSelfThen
-end
-
-unless {}.respond_to?(:transform_keys)
-  require "action_policy/ext/hash_transform_keys"
-  using ActionPolicy::Ext::HashTransformKeys
-end
-
 module ActionPolicy
+  using RubyNext
+
   module Policy
     # Failures reasons store
     class FailureReasons
@@ -33,17 +25,11 @@ module ActionPolicy
 
       # Return Hash of the form:
       #   { policy_identifier => [rules, ...] }
-      def details
-        reasons.transform_keys(&:identifier)
-      end
+      def details() = reasons.transform_keys(&:identifier)
 
-      def empty?
-        reasons.empty?
-      end
+      def empty?() = reasons.empty?
 
-      def present?
-        !empty?
-      end
+      def present?() = !empty?
 
       private
 
@@ -82,6 +68,25 @@ module ActionPolicy
         @details = nil
       end
 
+      # Returns all the details merged together
+      def all_details
+        return @all_details if defined?(@all_details)
+
+        {}.tap do |all|
+          next unless defined?(@reasons)
+
+          reasons.reasons.each_value do |rules|
+            detailed_reasons = rules.last
+
+            next unless detailed_reasons.is_a?(Hash)
+
+            detailed_reasons.each_value do |details|
+              all.merge!(details)
+            end
+          end
+        end => @all_details
+      end
+
       # Add reasons to inspect
       def inspect
         super.then do |str|
@@ -180,10 +185,12 @@ module ActionPolicy
       def allowed_to?(rule, record = :__undef__, **options)
         res =
           if (record == :__undef__ || record == self.record) && options.empty?
+            rule = resolve_rule(rule)
             policy = self
             with_clean_result { apply(rule) }
           else
             policy = policy_for(record: record, **options)
+            rule = policy.resolve_rule(rule)
 
             policy.apply(rule)
             policy.result
@@ -195,6 +202,11 @@ module ActionPolicy
 
         res.success?
       end
+
+      def deny!(reason = nil)
+        result&.reasons&.add(self, reason) if reason
+        super()
+      end
     end
   end
 end

data/lib/action_policy/policy/scoping.rb

@@ -148,12 +148,11 @@ module ActionPolicy
         def scope_matchers
           return @scope_matchers if instance_variable_defined?(:@scope_matchers)
 
-          @scope_matchers =
-            if superclass.respond_to?(:scope_matchers)
-              superclass.scope_matchers.dup
-            else
-              []
-            end
+          if superclass.respond_to?(:scope_matchers)
+            superclass.scope_matchers.dup
+          else
+            []
+          end => @scope_matchers
         end
       end
     end

data/lib/action_policy/rails/controller.rb

@@ -26,6 +26,7 @@ module ActionPolicy
       helper_method :allowed_to? if respond_to?(:helper_method)
 
       attr_writer :authorize_count
+      attr_reader :verify_authorized_skipped
 
       protected :authorize_count=, :authorize_count
     end
@@ -57,13 +58,17 @@ module ActionPolicy
 
     def verify_authorized
       raise UnauthorizedAction.new(controller_path, action_name) if
-        authorize_count.zero?
+        authorize_count.zero? && !verify_authorized_skipped
     end
 
     def authorize_count
       @authorize_count ||= 0
     end
 
+    def skip_verify_authorized!
+      @verify_authorized_skipped = true
+    end
+
     class_methods do
       # Adds after_action callback to check that
       # authorize! method has been called.

data/lib/action_policy/rails/policy/instrumentation.rb

@@ -11,7 +11,7 @@ module ActionPolicy # :nodoc:
         INIT_EVENT_NAME = "action_policy.init"
         APPLY_EVENT_NAME = "action_policy.apply_rule"
 
-        def initialize(*)
+        def initialize(record = nil, **params)
           event = {policy: self.class.name}
           ActiveSupport::Notifications.instrument(INIT_EVENT_NAME, event) { super }
         end

data/lib/action_policy/rspec/be_authorized_to.rb

@@ -45,16 +45,14 @@ module ActionPolicy
 
         @actual_calls = ActionPolicy::Testing::AuthorizeTracker.calls
 
-        actual_calls.any? { |call| call.matches?(policy, rule, target) }
+        actual_calls.any? { _1.matches?(policy, rule, target) }
       end
 
       def does_not_match?(*)
         raise "This matcher doesn't support negation"
       end
 
-      def supports_block_expectations?
-        true
-      end
+      def supports_block_expectations?() = true
 
       def failure_message
         "expected #{formatted_record} " \
@@ -72,14 +70,12 @@ module ActionPolicy
       end
 
       def formatted_calls
-        actual_calls.map do |acall|
-          " - #{acall.inspect}"
+        actual_calls.map do
+          " - #{_1.inspect}"
         end.join("\n")
       end
 
-      def formatted_record(record = target)
-        ::RSpec::Support::ObjectFormatter.format(record)
-      end
+      def formatted_record(record = target) = ::RSpec::Support::ObjectFormatter.format(record)
     end
   end
 end

data/lib/action_policy/rspec/dsl.rb

@@ -50,7 +50,7 @@ if defined?(::RSpec)
   ::RSpec.shared_context "action_policy:policy_context" do
     let(:record) { nil }
     let(:context) { {} }
-    let(:policy) { described_class.new(record, context) }
+    let(:policy) { described_class.new(record, **context) }
   end
 
   ::RSpec.shared_context "action_policy:policy_rule_context" do |policy_rule, *args, method: "describe", block: nil|

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
 
       def initialize(type)
         @type = type
@@ -56,7 +56,7 @@ module ActionPolicy
 
         @actual_scopes = ActionPolicy::Testing::AuthorizeTracker.scopings
 
-        matching_scopes = actual_scopes.select { |scope| scope.matches?(policy, type, name, scope_options) }
+        matching_scopes = actual_scopes.select { _1.matches?(policy, type, name, scope_options) }
 
         return false if matching_scopes.empty?
 
@@ -75,9 +75,7 @@ module ActionPolicy
         raise "This matcher doesn't support negation"
       end
 
-      def supports_block_expectations?
-        true
-      end
+      def supports_block_expectations?() = true
 
       def failure_message
         "expected a scoping named :#{name} for type :#{type} " \
@@ -109,8 +107,8 @@ module ActionPolicy
       end
 
       def formatted_scopings
-        actual_scopes.map do |ascope|
-          " - #{ascope.inspect}"
+        actual_scopes.map do
+          " - #{_1.inspect}"
         end.join("\n")
       end
     end

data/lib/action_policy/utils/pretty_print.rb

@@ -16,10 +16,7 @@ ensure
 end
 
 module ActionPolicy
-  unless "".respond_to?(:then)
-    require "action_policy/ext/yield_self_then"
-    using ActionPolicy::Ext::YieldSelfThen
-  end
+  using RubyNext
 
   # Takes the object and a method name,
   # and returns the "annotated" source code for the method:
@@ -41,7 +38,7 @@ module ActionPolicy
   #  #=> AND
   #  #=> access_feed? #=> true
   module PrettyPrint
-    TRUE =  "\e[32mtrue\e[0m"
+    TRUE = "\e[32mtrue\e[0m"
     FALSE = "\e[31mfalse\e[0m"
 
     class Visitor
@@ -71,7 +68,7 @@ module ActionPolicy
 
       def expression_with_result(sexp)
         expression = Unparser.unparse(sexp)
-        "#{expression} #=> #{colorize(eval_exp(expression))}"
+        "#{expression} #=> #{PrettyPrint.colorize(eval_exp(expression))}"
       end
 
       def eval_exp(exp)
@@ -124,39 +121,39 @@ module ActionPolicy
 
       # Some lines should not be evaled
       def ignore_exp?(exp)
-        exp.match?(/^\s*binding\.(pry|irb)\s*$/)
-      end
-
-      def colorize(val)
-        return val unless $stdout.isatty
-        return TRUE if val.eql?(true)
-        return FALSE if val.eql?(false)
-        val
+        PrettyPrint.ignore_expressions.any? { exp.match?(_1) }
       end
     end
 
     class << self
+      attr_accessor :ignore_expressions
+
       if defined?(::Unparser) && defined?(::MethodSource)
-        def available?
-          true
-        end
+        def available?() = true
 
         def print_method(object, method_name)
-          ast = object.method(method_name).source.then(&Unparser.method(:parse))
+          ast = object.method(method_name).source.then(&Unparser.:parse)
           # outer node is a method definition itself
           body = ast.children[2]
 
           Visitor.new(object).collect(body)
         end
       else
-        def available?
-          false
-        end
+        def available?() = false
 
-        def print_method(_, _)
-          ""
-        end
+        def print_method(_, _) = ""
+      end
+
+      def colorize(val)
+        return val unless $stdout.isatty
+        return TRUE if val.eql?(true)
+        return FALSE if val.eql?(false)
+        val
       end
     end
+
+    self.ignore_expressions = [
+      /^\s*binding\.(pry|irb)\s*$/s
+    ]
   end
 end