passpartu 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34188ab985989f3022e6fdcefa8ebdae5140e954e3e92ae59483cf29e523b30d
-  data.tar.gz: 8268980e9fe35799d4409205d902691c9a7127e33f1a8638138d82a53612a01a
+  metadata.gz: f1074ae228e7b5f0cfff3a9a2fc0acd58536a161451cab914b814e8b1bf44470
+  data.tar.gz: 4ecf5e75ec63192afd3d739b47dd646912de8b594f01e8553fd6f9df0d1dbfb6
 SHA512:
-  metadata.gz: 97826c98b5cb98587b30fe29bedb5c7e8c20ee6e2de9c76f3d7ab198ba5fd25e5cb7b68f2b4848f8b50e6447ca4463eebf3988e3339931c91dd87ddc01a0b9a1
-  data.tar.gz: 5383f59ecb8aca48eb483670cb051428c529845891c26e5f45534cb550e4db761cde0f6a894945b695314c5f418ea2a33fe10333598c64cd7e5ee51d3df4ac49
+  metadata.gz: ceeac19430a29384cf70bf5755ed6786e06f76d981d1c42e81a677f8163211f46bc6a4bdb4eca6d9968cc7751d0c234392edfe6227c2dfd2c0c2f1132ab36cb0
+  data.tar.gz: 5d4aef534482fc686033d67c043e8378dc92c8bfecbb00672d81949fa5a63ccba6c36c3fd492267375a38854085eae4f13af6da8aa20c3df7e1c1c935ee39c40

data/README.md

@@ -1,4 +1,4 @@
-# Passpartu v0.5.5 - [changelog](https://github.com/coaxsoft/passpartu/blob/master/CHANGELOG.md)
+# Passpartu v0.6.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)).
 
@@ -31,7 +31,7 @@ NOTE: Your `User` model must respond to `role` method that returns a string or a
 Keep all your policies in one place.
 Create `./config/passpartu.yml` and start writing your policies.
 
-#### Example of `passpartu.yml` 
+#### Example of `passpartu.yml`
 ```yml
 # ./config/passpartu.yml
 manager: &manager
@@ -70,6 +70,25 @@ It's possible to use `crud` key to set values for `create`, `read`, `update`, `d
 `create`, `read`, `update`, `delete` has higher priority than `crud`
 In case `crud: true` and `delete: false` - result `false` 
 
+#### Only
+It's possible to include specific roles to checks
+```ruby
+    user_admin.can?(:orders, :edit) # check policy for admin and returns true if policy true
+    user_admin.can?(:orders, :edit, only: :admin) # returns true because the user is an admin and we included only admin
+    user_manager.can?(:orders, :edit, only: :admin) # returns false because user is manager and we included only admin
+```
+It's possible to give an array as only attribute
+
+```ruby
+  user_admin.can?(:orders, :edit, only: [:admin, :manager]) # returns true
+  user_manager.can?(:orders, :edit, only: [:admin, :manager]) # returns true
+```
+
+Note: `only` has higher priority than `except/skip`. Do not use both.
+```ruby
+  user_admin.can?(:orders, :edit, only: :admin, except: :admin) # returns true
+```
+
 
 #### Skip (except)
 It's possible to exclude roles from checks
@@ -90,7 +109,7 @@ It's possible to give an array as except attribute
 Note: `expect` has higher priority than `skip`. Do not use both.
 ```ruby
   user_agent.can?(:orders, :edit, except: [:admin, :manager]) { user_agent.orders.include?(order) }
-  # equals to 
+  # equals to
   user_agent.can?(:orders, :edit, skip: [:admin, :manager]) { user_agent.orders.include?(order) }
 ```
 
@@ -183,7 +202,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/OrestF/passpartu. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/coaxsoft/passpartu. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/passpartu/patcher.rb

@@ -11,13 +11,17 @@ module Passpartu
 
     def call
       klass.class_eval do
-        define_method('can?') do |*keys, except: nil, skip: nil, &block|
-          Passpartu::BlockVerify.call(role, keys, except: except, skip: skip, &block)
+        define_method('can?') do |*keys, only: nil, except: nil, skip: nil, &block|
+          Passpartu::BlockVerify.call(role, keys, only: only, except: except, skip: skip, &block)
         end
 
         Passpartu.policy.keys.each do |policy_role|
-          define_method("#{policy_role}_can?") do |*keys, except: nil, skip: nil, &block|
-            role.to_s == policy_role && Passpartu::BlockVerify.call(role, keys, except: except, skip: skip, &block)
+          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)
           end
         end
       end

data/lib/passpartu/verify.rb

@@ -2,22 +2,24 @@ module Passpartu
   class Verify
     CRUD_KEY = 'crud'.freeze
 
-    attr_reader :role, :keys, :result, :except, :block
-    def initialize(role, keys, except, skip, block)
+    attr_reader :role, :keys, :result, :only, :except, :block
+
+    def initialize(role, keys, only, except, skip, block)
       exclusion = except || skip # alias
 
       @role = role.to_s
       @keys = keys.map(&:to_s)
-      @except = Array(exclusion).map(&:to_s) if present?(exclusion)
+      @only = Array(only).map(&:to_s) if present?(only)
+      @except = Array(exclusion).map(&:to_s) if present?(exclusion) && !@only
       @block = block
     end
 
-    def self.call(role, keys, except: nil, skip: nil, &block)
-      new(role, keys, except, skip, block).call
+    def self.call(role, keys, only: nil, except: nil, skip: nil, &block)
+      new(role, keys, only, except, skip, block).call
     end
 
     def call
-      return false if role_excepted?
+      return false if role_ignore?
 
       check_policy
       check_crud if policy_missed? && last_key_crud?
@@ -27,10 +29,11 @@ module Passpartu
 
     private
 
-    def role_excepted?
-      return false if blank?(except)
+    def role_ignore?
+      return !only.include?(role) if present?(only)
+      return except.include?(role) if present?(except)
 
-      except.include?(role)
+      false
     end
 
     def check_policy

data/lib/passpartu/version.rb

@@ -1,3 +1,3 @@
 module Passpartu
-  VERSION = '0.5.5'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - OrestF
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Passpartu makes policies great again