passpartu 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a282e26dea8142a8ad36151367612a9bfbc3ad0e4c116d87343e93f7e8301a9
-  data.tar.gz: 0dc7b495c6b574a3ca83328e1014e948cbf2993b9fe97cbed192cfb0756b91a6
+  metadata.gz: 172ad6a276a5b27cafa024e776e3363de78b82fc5606e9f2eb92689323898269
+  data.tar.gz: 1e343e86551faab902c18eee6faaa9ee85cea5980102a1bd2448f1e4f23abbbf
 SHA512:
-  metadata.gz: 73f3c5177366551d7101dd0873e17c6f13dd76b5fb682c0b6b55f07514c9329c728f4e1c5f83c136c7875f5b59968278ad86707010a8b5874b5f4ffdcc386071
-  data.tar.gz: 43ac9dcdc2d90c3db00e781277abdd544a748cab17a2548de57a6d206d1605302cf93e7a9ab90ddb390f90a2bd8878d92663fd363c99017f4bbe3bc4444f90c8
+  metadata.gz: 8b0cbed99bb314138bb993f303d7f1eed70e2160fd051d7eb358252dcb80c4accc3059c029bc5fcc297a80feb498eb6bfcc34c9d3a7ca41377240e71b2b0c621
+  data.tar.gz: 5c65e2c58397b1ce5f80e2cdc7c6d3e4bc0aca4746f536444c05bb4ec29ed48eefc98ef63a9d13d32d474524f3d47afa0dc50874291826eb76640856dc0b6890

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.2'
 end

data/lib/passpartu.rb

@@ -66,7 +66,17 @@ module Passpartu
     private
 
     def load_policy_file(path)
-      RUBY_VERSION.to_f >= 3.1 ? YAML.load_file(path, aliases: true) : YAML.load_file(path)
+      yaml = File.read(path)
+
+      if RUBY_VERSION.to_f >= 3.1
+        YAML.safe_load(
+          yaml,
+          permitted_classes: [Symbol],
+          aliases: true
+        )
+      else
+        YAML.load_file(yaml)
+      end
     end
 
     def policy=(value)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - OrestF
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +129,6 @@ homepage: https://github.com/coaxsoft/passpartu
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Passpartu makes policies great again
 test_files: []