action_policy 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021e6da5ccd46f76732cb52c0c04ae1a45ce3a74a2b64643e179ee16c40417e3
-  data.tar.gz: 96a978308fde0160f5b739d47abdd833005ba7109e97837ac0dd5721f1ec52a8
+  metadata.gz: 0fe2b2b40f6a3bd85c312495209382b1ee72950072257e676be008e2ef8d77c5
+  data.tar.gz: f0c9b0cb38bc130cdb8c7f3f4cfba3adcc326f25c6435fe75723e8c0d3ba3fe9
 SHA512:
-  metadata.gz: 69953fedcbaa8d007c3c922e17dd26618eda2ed840d59bac476111f62bb7aae7c20f2920606925eb4b3acab7e90f994a6e1a9a55b7de0a0740f3747bb4e85aa3
-  data.tar.gz: 23de3c82949db85f3a41f079187493087add27f88e0cd9315ccb492e925f4490390d5ae17fb493eb3ae290f5469f216ab258e21e7c155be9853de5728c8b3311
+  metadata.gz: f49f02d335942aa0a100e681f7570c1b6d042e68d1ed9d02012ec84b9f354b5c0a1d7a42ba15fbd3c84c84536e444af95057a09ef00cdc6ae3c2f5d0b24dd3a6
+  data.tar.gz: 2eced066c406feb11e8cdf99113fa8d27f8fe73ff015bcc1d2958c0a657540d195b25a8328dee02206b8539e55d16278f531dcde6b9567fef95ec1bead92cda0

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 0.6.0 (2021-09-02)
+
+- Drop Ruby 2.5 support.
+- [Closes [#186](https://github.com/palkan/action_policy/issues/186)] Add `inline_reasons: true` option to `allowed_to?` to avoid wrapping reasons. ([@palkan][])
+- [Fixes [#173](https://github.com/palkan/action_policy/issues/173)] Explicit context were not merged with implicit one within policy classes. ([@palkan][])
+- Add `strict_namespace:` option to policy_for behaviour ([@kevynlebouille][])
+- Prevent possible side effects in policy lookup ([@tomdalling][])
+
 ## 0.5.7 (2021-03-03)
 
 The previous release had incorrect dependencies (due to the missing transpiled files).
@@ -449,3 +457,4 @@ This value is now stored in a cache (if any) instead of just the call result (`t
 [@Be-ngt-oH]: https://github.com/Be-ngt-oH
 [@pirj]: https://github.com/pirj
 [@skojin]: https://github.com/skojin
+[@tomdalling]: https://github.com/tomdalling

data/lib/.rbnext/1995.next/action_policy/behaviours/policy_for.rb

@@ -8,16 +8,18 @@ module ActionPolicy
       using ActionPolicy::Ext::PolicyCacheKey
 
       # Returns policy instance for the record.
-      def policy_for(record:, with: nil, namespace: authorization_namespace, context: authorization_context, allow_nil: false, default: default_authorization_policy_class)
+      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
+
         policy_class = with || ::ActionPolicy.lookup(
           record,
-          namespace: namespace, context: context, allow_nil: allow_nil, default: default
+          namespace: namespace, context: context, allow_nil: allow_nil, default: default, strict_namespace: strict_namespace
         )
         policy_class&.new(record, **context)
       end
 
       def authorization_context
-        raise NotImplementedError, "Please, define `authorization_context` method!"
+        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
       end
 
       def authorization_namespace
@@ -28,6 +30,10 @@ module ActionPolicy
         # 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.
@@ -39,7 +45,7 @@ module ActionPolicy
 
       # Return implicit authorization target or raises an exception if it's nil
       def implicit_authorization_target!
-        implicit_authorization_target || raise(
+        implicit_authorization_target || Kernel.raise(
           NotFound,
           [
             self,

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

@@ -8,16 +8,18 @@ module ActionPolicy
       using ActionPolicy::Ext::PolicyCacheKey
 
       # Returns policy instance for the record.
-      def policy_for(record:, with: nil, namespace: authorization_namespace, context: authorization_context, allow_nil: false, default: default_authorization_policy_class)
+      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
+
         policy_class = with || ::ActionPolicy.lookup(
           record,
-          namespace: namespace, context: context, allow_nil: allow_nil, default: default
+          namespace: namespace, context: context, allow_nil: allow_nil, default: default, strict_namespace: strict_namespace
         )
         policy_class&.new(record, **context)
       end
 
       def authorization_context
-        raise NotImplementedError, "Please, define `authorization_context` method!"
+        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
       end
 
       def authorization_namespace
@@ -28,6 +30,10 @@ module ActionPolicy
         # 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.
@@ -39,7 +45,7 @@ module ActionPolicy
 
       # Return implicit authorization target or raises an exception if it's nil
       def implicit_authorization_target!
-        implicit_authorization_target || raise(
+        implicit_authorization_target || Kernel.raise(
           NotFound,
           [
             self,

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

@@ -133,7 +133,7 @@ module ActionPolicy
       end
 
       # An alias for readability purposes
-      def check?(*args) ;  allowed_to?(*args); end
+      def check?(*args, **hargs) ;  allowed_to?(*args, **hargs); end
 
       # Returns a rule name (policy method name) for activity.
       #

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

@@ -31,6 +31,20 @@ module ActionPolicy
 
       def present?() ;  !empty?; end
 
+      def merge(other)
+        other.reasons.each do |policy_class, rules|
+          reasons[policy_class] ||= []
+
+          rules.each do |rule|
+            if rule.is_a?(::Hash)
+              add_detailed_reason(reasons[policy_class], rule)
+            else
+              add_non_detailed_reason(reasons[policy_class], rule)
+            end
+          end
+        end
+      end
+
       private
 
       def add_non_detailed_reason(store, rule)
@@ -182,7 +196,7 @@ module ActionPolicy
         result.details ||= {}
       end
 
-      def allowed_to?(rule, record = :__undef__, **options)
+      def allowed_to?(rule, record = :__undef__, inline_reasons: false, **options)
         res =
           if (record == :__undef__ || record == self.record) && options.empty?
             rule = resolve_rule(rule)
@@ -196,7 +210,9 @@ module ActionPolicy
             policy.result
           end
 
-        result&.reasons&.add(policy, rule, res.details) if res.fail?
+        if res.fail? && result&.reasons
+          inline_reasons ? result.reasons.merge(res.reasons) : result.reasons.add(policy, rule, res.details)
+        end
 
         res.clear_details
 

data/lib/action_policy/behaviour.rb

@@ -74,10 +74,8 @@ module ActionPolicy
     end
 
     def lookup_authorization_policy(record, **options) # :nodoc:
-      record = implicit_authorization_target! if record == :__undef__
-      raise ArgumentError, "Record must be specified" if record.nil?
-
-      options[:context] && (options[:context] = authorization_context.merge(options[:context]))
+      record = implicit_authorization_target! if :__undef__ == record # rubocop:disable Style/YodaCondition See https://github.com/palkan/action_policy/pull/180
+      Kernel.raise ArgumentError, "Record must be specified" if record.nil?
 
       policy_for(record: record, **options)
     end

data/lib/action_policy/behaviours/policy_for.rb

@@ -8,16 +8,18 @@ module ActionPolicy
       using ActionPolicy::Ext::PolicyCacheKey
 
       # Returns policy instance for the record.
-      def policy_for(record:, with: nil, namespace: authorization_namespace, context: authorization_context, allow_nil: false, default: default_authorization_policy_class)
+      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
+
         policy_class = with || ::ActionPolicy.lookup(
           record,
-          namespace:, context:, allow_nil:, default:
+          namespace:, context:, allow_nil:, default:, strict_namespace:
         )
         policy_class&.new(record, **context)
       end
 
       def authorization_context
-        raise NotImplementedError, "Please, define `authorization_context` method!"
+        Kernel.raise NotImplementedError, "Please, define `authorization_context` method!"
       end
 
       def authorization_namespace
@@ -28,6 +30,10 @@ module ActionPolicy
         # 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.
@@ -39,7 +45,7 @@ module ActionPolicy
 
       # Return implicit authorization target or raises an exception if it's nil
       def implicit_authorization_target!
-        implicit_authorization_target || raise(
+        implicit_authorization_target || Kernel.raise(
           NotFound,
           [
             self,

data/lib/action_policy/policy/core.rb

@@ -133,7 +133,7 @@ module ActionPolicy
       end
 
       # An alias for readability purposes
-      def check?(*args) = allowed_to?(*args)
+      def check?(*args, **hargs) = allowed_to?(*args, **hargs)
 
       # Returns a rule name (policy method name) for activity.
       #

data/lib/action_policy/policy/reasons.rb

@@ -31,6 +31,20 @@ module ActionPolicy
 
       def present?() = !empty?
 
+      def merge(other)
+        other.reasons.each do |policy_class, rules|
+          reasons[policy_class] ||= []
+
+          rules.each do |rule|
+            if rule.is_a?(::Hash)
+              add_detailed_reason(reasons[policy_class], rule)
+            else
+              add_non_detailed_reason(reasons[policy_class], rule)
+            end
+          end
+        end
+      end
+
       private
 
       def add_non_detailed_reason(store, rule)
@@ -182,7 +196,7 @@ module ActionPolicy
         result.details ||= {}
       end
 
-      def allowed_to?(rule, record = :__undef__, **options)
+      def allowed_to?(rule, record = :__undef__, inline_reasons: false, **options)
         res =
           if (record == :__undef__ || record == self.record) && options.empty?
             rule = resolve_rule(rule)
@@ -196,7 +210,9 @@ module ActionPolicy
             policy.result
           end
 
-        result&.reasons&.add(policy, rule, res.details) if res.fail?
+        if res.fail? && result&.reasons
+          inline_reasons ? result.reasons.merge(res.reasons) : result.reasons.add(policy, rule, res.details)
+        end
 
         res.clear_details
 

data/lib/action_policy/rails/controller.rb

@@ -57,7 +57,7 @@ module ActionPolicy
     end
 
     def verify_authorized
-      raise UnauthorizedAction.new(controller_path, action_name) if
+      Kernel.raise UnauthorizedAction.new(controller_path, action_name) if
         authorize_count.zero? && !verify_authorized_skipped
     end
 

data/lib/action_policy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_policy
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.6.0
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-core
@@ -222,7 +222,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
@@ -230,15 +230,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Authorization framework for Ruby/Rails application
 test_files: []