passpartu 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10de14cce11b5f7b38f3ff759c2d24b5a7044744f137b5f2e46ab65975b5b6c2
-  data.tar.gz: 7731b1ad92a9f96da5f54c1d2f018f0925297464c15fdfc5aa7bdc464da637a6
+  metadata.gz: 396d094c919ae767cf6653747b219b0018a95c0672fd8beb9da5c1f0c64fd7c6
+  data.tar.gz: fdca15a751308a1c2a6bcf818f21572b7cb1a8e95a8f59c8f363d5431758375a
 SHA512:
-  metadata.gz: 6b5072898c8144f59252a1b74fd10c671a84b328d9920344eaf7ceca7ace5c642faea0a782cc114ec240db3552cf14549cd094a555c545566a5df5c0a46eba31
-  data.tar.gz: 4424887961ea98e0b405c4f0768a9c0a7a6e3280a4e131c805d0b7b5ba3aa18fa52fb826f8f0fca55e80ee10b9acdce97639b71c595a259a6b09d9486b2b8811
+  metadata.gz: 9e548a9a7493741c606bfdb93f6bbe90a082496e76b739645d658e91b531671170053fb1342272d76e5116093184d548aef593c11cbb1e715227427be295d637
+  data.tar.gz: e945766a4d0157bc22ce976a4552fd72b62c2ffc5a153c1e1c44fd9dc5996c88f729bc2eba49b6fbc90d6f6472aaf6e46fedc7c52db687aed8d2aa433bc20708

data/README.md

@@ -87,7 +87,6 @@ It's possible to use `crud` key to set values for `create`, `read`, `update`, `d
 
 In case `crud: true` and `delete: false` - result `false` 
 
-
 ### Only
 
 It's possible to include specific roles to checks
@@ -160,6 +159,25 @@ Check user roles AND policy rule
   user_agent.agent_can?(:orders, :edit, except: [:admin, :manager]) { user_agent.orders.include?(order) }
 ```
 
+### 'Maybe' option
+
+Option 'maybe' means that user can do something if the block returns true. In this case block is required
+and error is raised when option is maybe and no block given.
+
+```yml
+manager:
+  products:
+    create: true
+    delete: false
+  bookings:
+    update: maybe
+```
+
+```ruby
+manager.can?(:bookings, :update) # raises error
+manager.can?(:bookings, :update) { user.bookings.include?(booking) } # returns true or false
+```
+
 ### Waterfall check
 
 Allow or restrict absolutely everything for particular role or/and particular domain.

data/lib/passpartu/block_verify.rb

@@ -2,11 +2,21 @@
 
 module Passpartu
   class BlockVerify < ::Passpartu::Verify
+    class BlockMissedError < StandardError; end
+    MAYBE_VALUE = 'maybe'
+
     def call
       policy_result = super
+      raise BlockMissedError, "Block is required for 'maybe' allowed resource" if maybe? && block.nil?
       return policy_result if block.nil?
 
       policy_result && block.call
     end
+
+    private
+
+    def maybe?
+      result == MAYBE_VALUE
+    end
   end
 end

data/lib/passpartu/patcher.rb

@@ -15,7 +15,6 @@ module Passpartu
     end
 
     def call
-      phash = respond_to?(:policy_hash) ? {} : Passpartu.policy
       role_method = Passpartu.config.role_access_method
 
       klass.class_eval do
@@ -26,12 +25,12 @@ module Passpartu
             only: only,
             except: except,
             skip: skip,
-            policy_hash: phash,
+            policy_hash: -> { respond_to?(:policy_hash) ? policy_hash : Passpartu.policy }.call,
             &block
           )
         end
 
-        phash.each_key do |policy_role|
+        Passpartu.policy.each_key do |policy_role|
           define_method("#{policy_role}_can?") do |*keys, only: nil, except: nil, skip: nil, &block|
             send(role_method).to_s == policy_role &&
               Passpartu::BlockVerify.call(
@@ -40,7 +39,7 @@ module Passpartu
                 only: only,
                 except: except,
                 skip: skip,
-                policy_hash: phash,
+                policy_hash: -> { respond_to?(:policy_hash) ? policy_hash : Passpartu.policy }.call,
                 &block
               )
           end

data/lib/passpartu/validate_result.rb

@@ -3,6 +3,7 @@
 module Passpartu
   class ValidateResult
     class PolicyMissedError < StandardError; end
+    class InvalidResultError < StandardError; end
 
     attr_reader :result
 
@@ -15,20 +16,20 @@ module Passpartu
     end
 
     def call
-      raise PolicyMissedError if raise_error?
-      return false unless boolean?
+      raise PolicyMissedError if raise_policy_missed_error?
+      return false if result_not_defined?
 
       result
     end
 
     private
 
-    def boolean?
-      [true, false].include?(result)
+    def raise_policy_missed_error?
+      result_not_defined? && Passpartu.config.raise_policy_missed_error
     end
 
-    def raise_error?
-      !boolean? && Passpartu.config.raise_policy_missed_error
+    def result_not_defined?
+      result.nil? || result.is_a?(Hash)
     end
   end
 end

data/lib/passpartu/verify.rb

@@ -31,12 +31,10 @@ module Passpartu
 
       validate_result
     rescue StandardError => e
-      if ['TrueClass does not have #dig method', 'FalseClass does not have #dig method'].include?(e.message)
-        raise WaterfallError,
-              "Looks like you want to use check_waterfall feature, but it's set to 'false'. Otherwise check your #{Passpartu.config.policy_file} for validness"
-      else
-        raise e
-      end
+      raise e unless ['TrueClass does not have #dig method', 'FalseClass does not have #dig method'].include?(e.message)
+
+      raise WaterfallError,
+            "Looks like you want to use check_waterfall feature, but it's set to 'false'. Otherwise check your #{Passpartu.config.policy_file} for validness"
     end
 
     private
@@ -49,7 +47,7 @@ module Passpartu
     end
 
     def default_check
-      @result = policy_hash.dig(role, *keys)
+      @result = policy_hash.has_key?(role) ? policy_hash.dig(role, *keys) : policy_hash.dig(*keys)
     end
 
     def check_crud_if

data/lib/passpartu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Passpartu
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

data/lib/passpartu.rb

@@ -83,6 +83,8 @@ module Passpartu
           value.define_singleton_method(:dig) { |*_keys| true }
         when false
           value.define_singleton_method(:dig) { |*_keys| false }
+        when 'maybe'
+          value.define_singleton_method(:dig) { |*_keys| 'maybe' }
         else
           patch_policy_booleans_if(value)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Passpartu makes policies great again