admission 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9aefe4d664280e644e7168bd08cf1f45d810d5a
-  data.tar.gz: 7e4f1c3635faf675997dadac14746c16984ec02a
+  metadata.gz: a16ee532f627f4f8a387911175cfc2740de6d097
+  data.tar.gz: 3cc968158f4b91bfb4cf76d7935ad4c162895a8b
 SHA512:
-  metadata.gz: b73e51843f67f7f636e018bcc6a308b94c33ba71481008888849579f0d9c32f29801639e04b5936f63318779757b6492f83186ca7d73f01f8fa3cefc45c03de9
-  data.tar.gz: 16278aac0530cbf6d1370eecff3cd4452a7385179df647a15e4a3b8333233f3f69ab20be2dc727138fae76c2fa6e8dd08ac9f9201ef00acfd97f2918bc9aa479
+  metadata.gz: 84f7d2dc2cfa0f687ba8b8ccd63bb7a3b379a8a3ed44eae79b7a1aa866e177260c7b3edf960abf9ed4177754221b1027ca8b54b014e5cec97e730d2b9574b99d
+  data.tar.gz: 566b50a1eb753e167539f8c7203c1a5f4ecca4be743f797303363d859e7111f09c175c42ad71704525c6830c03a977ea332c4ea665ba578c5ea64988d5d41608

data/lib/admission/resource_arbitration.rb

@@ -27,10 +27,14 @@ class Admission::ResourceArbitration < Admission::Arbitration
   end
 
   def scope_and_resource scope_or_resource
-    if scope_or_resource.is_a? Symbol
-      [scope_or_resource]
-    else
-      [self.class.type_to_scope(scope_or_resource.class).to_sym, scope_or_resource]
+    case scope_or_resource
+      when Symbol
+        [scope_or_resource]
+      when Array
+        resource, scope = scope_or_resource
+        [self.class.nested_scope(resource.class, scope), resource]
+      else
+        [self.class.type_to_scope(scope_or_resource.class).to_sym, scope_or_resource]
     end
   end
 

data/lib/admission/version.rb

@@ -1,3 +1,3 @@
 module Admission
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/spec/integration/resource_arbitrating_spec.rb

@@ -22,6 +22,7 @@ RSpec.describe 'resources_arbitrating' do
   end
 
   def rule scope, action, privilege
+    byebug if $bug
     arbitration(scope, action, privilege.context).rule_per_privilege privilege
   end
 
@@ -236,8 +237,38 @@ RSpec.describe 'resources_arbitrating' do
     it 'disallows lord to destroy apache helicopter' do
       helicopter = Person.new 'person', Person::APACHE_HELICOPTER, [:czech]
       expect(
-      rule helicopter, :destroy,
-          privilege(:vassal, :lord, context: [:czech])
+          rule helicopter, :destroy,
+              privilege(:vassal, :lord, context: [:czech])
+      ).to eql(false)
+    end
+
+  end
+
+  describe 'nested resource scope' do
+
+    it 'allows any lord to list others possessions' do
+      expect(
+          rule [person, :possessions], :index, privilege(:vassal, :lord)
+      ).to eql(true)
+
+      expect(
+          rule [person, :possessions], :index, privilege(:vassal)
+      ).to eql(false)
+    end
+
+    it 'allows lord to update possessions of his country' do
+      expect(
+          rule [person, :possessions], :update, privilege(:vassal, :lord)
+      ).to eql(false)
+
+      expect(
+          rule [person, :possessions], :update,
+              privilege(:vassal, :lord, context: [:czech])
+      ).to eql(true)
+
+      expect(
+          rule [person, :possessions], :update,
+              privilege(:vassal, :lord, context: [:taiwan])
       ).to eql(false)
     end
 

data/spec/spec_helper.rb

@@ -8,4 +8,13 @@ def with_bug
   yield
 ensure
   $bug = false
+end
+
+RSpec::Matchers.define :have_inst_vars do |expected|
+  match do |object|
+    expected.to_a.all? do |var_name, value|
+      var = object.instance_variable_get "@#{var_name}"
+      var == value
+    end
+  end
 end

data/spec/test_context/privileges_and_rules.rb

@@ -109,6 +109,11 @@ RESOURCE_RULES = Admission::ResourceArbitration.define_rules PRIVILEGES_ORDER do
           person.sex != Person::APACHE_HELICOPTER
     end
 
+    allow Admission::ResourceArbitration.nested_scope(Person, :possessions), :index
+    allow_resource [Person, :possessions], :update do |person, country|
+      person.countries.include?(country)
+    end
+
   end
 
 end

data/spec/unit/resource_arbitration_spec.rb

@@ -0,0 +1,41 @@
+require_relative './_helper'
+
+RSpec.describe Admission::ResourceArbitration do
+
+  describe '#new' do
+
+    it 'parses simple Symbol scope' do
+      arbitration = Admission::ResourceArbitration.new nil, {scope: -1}, :req, :scope
+      expect(arbitration).to have_inst_vars(
+          person: nil,
+          rules_index: -1,
+          request: :req,
+          resource: nil
+      )
+    end
+
+    it 'parses type scope' do
+      resource = Object.new
+      arbitration = Admission::ResourceArbitration.new nil, {objects: -1}, :req, resource
+      expect(arbitration).to have_inst_vars(
+          person: nil,
+          rules_index: -1,
+          request: :req,
+          resource: resource
+      )
+    end
+
+    it 'parses nested type scope' do
+      resource = Object.new
+      arbitration = Admission::ResourceArbitration.new nil, {:'objects:vars' => -1}, :req, [resource, :vars]
+      expect(arbitration).to have_inst_vars(
+          person: nil,
+          rules_index: -1,
+          request: :req,
+          resource: resource
+      )
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admission
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - doooby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies: []
 description: update-me
 email: zelazk.o@email.cz
@@ -48,7 +48,7 @@ files:
 - spec/unit/ability_spec.rb
 - spec/unit/privilege/order_definer_spec.rb
 - spec/unit/privilege_spec.rb
-- spec/unit/request_arbitration_spec.rb
+- spec/unit/resource_arbitration_spec.rb
 homepage: https://github.com/doooby/admission
 licenses:
 - GPL-3.0

data/spec/unit/request_arbitration_spec.rb

@@ -1,31 +0,0 @@
-# require_relative '../spec_helper'
-# require_relative '../test_context/index'
-#
-# RSpec.describe Admission::RequestArbitration do
-#
-#   # let(:nobody_ability){ Admission::Ability.new Person::FIXTURES[:nobody] }
-#   # let(:haramber_ability){ Admission::Ability.new Person::FIXTURES[:harambe] }
-#
-#   def arbitration person_name, request
-#     person = Person::FIXTURES[person_name]
-#     Admission::RequestArbitration.new person, request
-#   end
-#
-#
-#
-#
-#   describe '#new' do
-#
-#
-#
-#   end
-#
-#   describe '#prepare_sitting' do
-#
-#     it 'sets context and clears decisions cache' do
-#
-#     end
-#
-#   end
-#
-# end