passpartu 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ff6ec8f5f35ec4a606df7c651868203f755d0d6f5b6152d23a152fa91d45126
-  data.tar.gz: 4ed57d9ced50f0c8ab11725835be3cc2ecb37a9309433146429312d22417dd13
+  metadata.gz: f9a34533883b1c070612ecd73c34299a9c05f899e31256b8f51f0b9edf50c6e4
+  data.tar.gz: 625c359af9f1d4560f28d63fe47b426351f1cf7f5e0f68da3e7aaafb2bfec08f
 SHA512:
-  metadata.gz: c55101f249104c06a591cffa4df5126e3bf01a0f81a1bcd96d766b91d657f7997cfaebc81ae22e4da56265951ec47b751565c97a220ec17042945b9ba3e0fbb7
-  data.tar.gz: 5618f1ecf4e1b8ad3b27f802cefd2213e65ee08125e840aa32aab603b1ca85868fc4d79464bcacf4d9be75103174cff9474c05ef8d6d3058d0fd56381cc86f69
+  metadata.gz: bb08f025f855506ea084cf9010dddb38d6f9f499d12e837fb015bf061163b48b86312da2e20e3a223559ebf1800b1fd332adfecb7769e52e6fcd3cbbd503f717
+  data.tar.gz: b10e9806c7eb0dee1e0332b5f651a4ab82da93a52cf1c955681f3d3c5be9cb32fd4346dd18da26f5d7af78c0a6876b289ce075a01a1ba2049a5becd0f5d25afe

data/README.md

@@ -1,11 +1,11 @@
-# Passpartu v1.0.3 - [changelog](https://github.com/coaxsoft/passpartu/blob/master/CHANGELOG.md)
+# Passpartu v1.1.0 - [changelog](https://github.com/coaxsoft/passpartu/blob/master/CHANGELOG.md)
 
 Passpartu makes policies great again (works awesome with [Pundit](https://rubygems.org/gems/pundit)).
 
 ### Tested with ruby:
-- 2.7.3
-- 3.0.0
 - 3.1.1
+- 3.0.0
+- 2.7.3
 
 Instead of this:
 
@@ -78,7 +78,7 @@ admin:
 
 ## Features
 
-#### CRUD
+### CRUD
 
 It's possible to use `crud` key to set values for `create`, `read`, `update`, `delete` at once.
 `create`, `read`, `update`, `delete` has higher priority than `crud`
@@ -86,7 +86,7 @@ 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
+### Only
 
 It's possible to include specific roles to checks
 
@@ -109,7 +109,7 @@ Note: `only` has higher priority than `except/skip`. Do not use both.
   user_admin.can?(:orders, :edit, only: :admin, except: :admin) # returns true
 ```
 
-#### Skip (except)
+### Skip (except)
 
 It's possible to exclude roles from checks
 
@@ -136,7 +136,7 @@ Note: `expect` has higher priority than `skip`. Do not use both.
   user_agent.can?(:orders, :edit, skip: [:admin, :manager]) { user_agent.orders.include?(order) }
 ```
 
-#### Per role methods
+### Per role methods
 
 Check user roles AND policy rule
 
@@ -148,7 +148,7 @@ Check user roles AND policy rule
     user_admin.manager_can?(:orders, :edit) # false
 ```
 
-#### Code blocks
+### Code blocks
 
 ```ruby
   # check rules as usual AND code in the block   
@@ -158,7 +158,7 @@ Check user roles AND policy rule
   user_agent.agent_can?(:orders, :edit, except: [:admin, :manager]) { user_agent.orders.include?(order) }
 ```
 
-#### Waterfall check
+### Waterfall check
 
 Allow or restrict absolutely everything for particular role or/and particular domain.
 
@@ -190,7 +190,7 @@ user_medium_loser.can?(:orders, :delete) # false
 user_medium_loser.can?(:products, :create) # true
 user_medium_loser.can?(:products, :create, :and_delete) # true
 ```
-##### Real life example
+#### Real life example
 
 You need to check custom rule for agent
 
@@ -232,6 +232,7 @@ Passpartu.configure do |config|
   config.policy_file = './config/passpartu.yml'
   config.raise_policy_missed_error = true
   config.check_waterfall = false
+  config.role_access_method = :role
 end
 
 ```

data/lib/passpartu/patcher.rb

@@ -15,18 +15,34 @@ module Passpartu
     end
 
     def call
+      phash = respond_to?(:policy_hash) ? {} : Passpartu.policy
+      role_method = Passpartu.config.role_access_method
+
       klass.class_eval do
         define_method(:can?) do |*keys, only: nil, except: nil, skip: nil, &block|
-          Passpartu::BlockVerify.call(role, keys, only: only, except: except, skip: skip, &block)
+          Passpartu::BlockVerify.call(
+            send(role_method),
+            keys,
+            only: only,
+            except: except,
+            skip: skip,
+            policy_hash: phash,
+            &block
+          )
         end
 
-        Passpartu.policy.each_key do |policy_role|
+        phash.each_key do |policy_role|
           define_method("#{policy_role}_can?") do |*keys, only: nil, except: nil, skip: nil, &block|
-            role.to_s == policy_role && Passpartu::BlockVerify.call(role, keys,
-                                                                    only: only,
-                                                                    except: except,
-                                                                    skip: skip,
-                                                                    &block)
+            send(role_method).to_s == policy_role &&
+              Passpartu::BlockVerify.call(
+                send(role_method),
+                keys,
+                only: only,
+                except: except,
+                skip: skip,
+                policy_hash: phash,
+                &block
+              )
           end
         end
       end

data/lib/passpartu/{user.rb → test_user.rb}

@@ -3,7 +3,7 @@
 # for testing only
 
 module Passpartu
-  class User
+  class TestUser
     attr_reader :role
 
     def initialize(role)
@@ -11,11 +11,19 @@ module Passpartu
     end
   end
 
-  class Person
+  class TestPerson
     attr_reader :role
 
     def initialize(role)
       @role = role
     end
   end
+
+  class TestUserWithOtherRoleMethod
+    attr_reader :other_role_method
+
+    def initialize(role)
+      @other_role_method = role
+    end
+  end
 end

data/lib/passpartu/verify.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
-
+require 'byebug'
 module Passpartu
   class Verify
     CRUD_KEY = 'crud'
 
-    attr_reader :role, :keys, :result, :only, :except, :block
+    attr_reader :role, :keys, :result, :only, :except, :block, :policy_hash
 
-    def initialize(role, keys, only, except, skip, block)
+    def initialize(role, keys, only, except, skip, policy_hash, &block)
       exclusion = except || skip # alias
 
       @role = role.to_s
@@ -14,12 +14,13 @@ module Passpartu
       @only = Array(only).map(&:to_s) if present?(only)
       @except = Array(exclusion).map(&:to_s) if present?(exclusion) && !@only
       @block = block
+      @policy_hash = deep_stringify_keys(policy_hash)
 
       raise PolicyYmlNotFoundError if Passpartu.policy.nil?
     end
 
-    def self.call(role, keys, only: nil, except: nil, skip: nil, &block)
-      new(role, keys, only, except, skip, block).call
+    def self.call(role, keys, only: nil, except: nil, skip: nil, policy_hash: Passpartu.policy, &block)
+      new(role, keys, only, except, skip, policy_hash, &block).call
     end
 
     def call
@@ -48,9 +49,7 @@ module Passpartu
     end
 
     def default_check
-      return unless policy_missed?
-
-      @result = Passpartu.policy.dig(role, *keys)
+      @result = policy_hash.dig(role, *keys)
     end
 
     def check_crud_if
@@ -79,5 +78,11 @@ module Passpartu
     def present?(item)
       !blank?(item)
     end
+
+    def deep_stringify_keys(hash)
+      return hash.deep_stringify_keys if hash.respond_to?(:deep_stringify_keys)
+
+      JSON.parse(JSON.dump(hash))
+    end
   end
 end

data/lib/passpartu/version.rb

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

data/lib/passpartu.rb

@@ -6,7 +6,7 @@ require_relative 'passpartu/patcher'
 require_relative 'passpartu/verify'
 require_relative 'passpartu/block_verify'
 require_relative 'passpartu/validate_result'
-require_relative 'passpartu/user' # for testing only
+require_relative 'passpartu/test_user' # for testing only
 
 module Passpartu
   class Error < StandardError; end
@@ -31,7 +31,7 @@ module Passpartu
   end
 
   class Config
-    attr_accessor :raise_policy_missed_error
+    attr_accessor :raise_policy_missed_error, :role_access_method
     attr_reader :policy_file, :check_waterfall, :policy
 
     DEFAULT_POLICY_FILE = './config/passpartu.yml'
@@ -41,6 +41,7 @@ module Passpartu
       self.policy = load_policy_file(policy_file) if File.exist?(policy_file)
       @raise_policy_missed_error = true
       @check_waterfall = false
+      @role_access_method = :role
     end
 
     def policy_file=(file = nil)

data/passpartu.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir['README.md', 'lib/**/*', 'lib/*', 'passpartu.gemspec']
 
   spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.11'
   spec.add_development_dependency 'codecov', '~> 0.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - OrestF
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +121,7 @@ files:
 - lib/passpartu.rb
 - lib/passpartu/block_verify.rb
 - lib/passpartu/patcher.rb
-- lib/passpartu/user.rb
+- lib/passpartu/test_user.rb
 - lib/passpartu/validate_result.rb
 - lib/passpartu/verify.rb
 - lib/passpartu/version.rb
@@ -131,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Passpartu makes policies great again