passpartu 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a282e26dea8142a8ad36151367612a9bfbc3ad0e4c116d87343e93f7e8301a9
-  data.tar.gz: 0dc7b495c6b574a3ca83328e1014e948cbf2993b9fe97cbed192cfb0756b91a6
+  metadata.gz: 396d094c919ae767cf6653747b219b0018a95c0672fd8beb9da5c1f0c64fd7c6
+  data.tar.gz: fdca15a751308a1c2a6bcf818f21572b7cb1a8e95a8f59c8f363d5431758375a
 SHA512:
-  metadata.gz: 73f3c5177366551d7101dd0873e17c6f13dd76b5fb682c0b6b55f07514c9329c728f4e1c5f83c136c7875f5b59968278ad86707010a8b5874b5f4ffdcc386071
-  data.tar.gz: 43ac9dcdc2d90c3db00e781277abdd544a748cab17a2548de57a6d206d1605302cf93e7a9ab90ddb390f90a2bd8878d92663fd363c99017f4bbe3bc4444f90c8
+  metadata.gz: 9e548a9a7493741c606bfdb93f6bbe90a082496e76b739645d658e91b531671170053fb1342272d76e5116093184d548aef593c11cbb1e715227427be295d637
+  data.tar.gz: e945766a4d0157bc22ce976a4552fd72b62c2ffc5a153c1e1c44fd9dc5996c88f729bc2eba49b6fbc90d6f6472aaf6e46fedc7c52db687aed8d2aa433bc20708

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/verify.rb

@@ -47,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.2.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-19 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