admission 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16ee532f627f4f8a387911175cfc2740de6d097
-  data.tar.gz: 3cc968158f4b91bfb4cf76d7935ad4c162895a8b
+  metadata.gz: f6fc32c93d1bd50bfe3cea39b1e7e62be2add21e
+  data.tar.gz: '095f27c6a9e95f503954ff5bea97ae12c828ef8f'
 SHA512:
-  metadata.gz: 84f7d2dc2cfa0f687ba8b8ccd63bb7a3b379a8a3ed44eae79b7a1aa866e177260c7b3edf960abf9ed4177754221b1027ca8b54b014e5cec97e730d2b9574b99d
-  data.tar.gz: 566b50a1eb753e167539f8c7203c1a5f4ecca4be743f797303363d859e7111f09c175c42ad71704525c6830c03a977ea332c4ea665ba578c5ea64988d5d41608
+  metadata.gz: e46fdce9e3feea2f4c99c7d38a9ef606499f19fac82491644c82625da439b0337392d04e731e6ce2e9efd6f6ae97ddadef5c9f267df8d643432d2fccb8827c95
+  data.tar.gz: daefd3683677ec4ff98f1c8a5bb2147baf44d8690423024954a78859aa45fdbce73a26ae81ee9ad16b297b1127a3005202efa927748fd49501f345f3c10cd939

data/lib/admission/arbitration.rb

@@ -7,7 +7,7 @@ class Admission::Arbitration
     @request = request.to_sym
   end
 
-  def prepare_sitting *context
+  def prepare_sitting context=nil
     @context = context
     @decisions = {}
   end
@@ -25,7 +25,7 @@ class Admission::Arbitration
   def make_decision from_rules, privilege
     if from_rules
       decision = from_rules[privilege]
-      decision = @person.instance_exec *@context, &decision if Proc === decision
+      decision = @person.instance_exec @context, &decision if Proc === decision
 
       unless Admission::VALID_DECISION.include? decision
         raise "invalid decision: #{decision}"

data/lib/admission/privilege.rb

@@ -19,9 +19,8 @@ class Admission::Privilege
     @inherited = privileges
   end
 
-  def dup_with_context *context
-    context = context.flatten.compact
-    return self if context.empty?
+  def dup_with_context context=nil
+    return self if context.nil?
     with_context = dup
     with_context.instance_variable_set :@context, context
     with_context

data/lib/admission/resource_arbitration.rb

@@ -12,9 +12,9 @@ class Admission::ResourceArbitration < Admission::Arbitration
       decision = from_rules[privilege]
       if Proc === decision
         if decision.instance_variable_get :@resource_arbiter
-          decision = @person.instance_exec @resource, *@context, &decision
+          decision = @person.instance_exec @resource, @context, &decision
         else
-          decision = @person.instance_exec *@context, &decision
+          decision = @person.instance_exec @context, &decision
         end
       end
 

data/lib/admission/status.rb

@@ -26,11 +26,27 @@ class Admission::Status
     end
   end
 
+  def allowed_in_contexts *args
+    return [] unless @privileges
+    arbitration = @arbiter.new person, rules, *args
+
+    @privileges.reduce [] do |list, privilege|
+      context = privilege.context
+
+      unless list.include? context
+        arbitration.prepare_sitting context
+        list << context if arbitration.rule_per_privilege(privilege).eql? true
+      end
+
+      list
+    end
+  end
+
   private
 
   def process_request arbitration
     privileges.any? do |privilege|
-      arbitration.prepare_sitting *privilege.context
+      arbitration.prepare_sitting privilege.context
       arbitration.rule_per_privilege(privilege).eql? true
     end
   end

data/lib/admission/version.rb

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

data/spec/integration/action_arbitrating_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe 'actions_arbitrating' do
   def arbitration request, context=nil
     person = Person.new 'person', Person::MALE, [:czech]
     arbitration = Admission::Arbitration.new person, ACTIONS_RULES, request
-    arbitration.prepare_sitting *context
+    arbitration.prepare_sitting context
     arbitration
   end
 
@@ -39,7 +39,7 @@ RSpec.describe 'actions_arbitrating' do
     arbitration = Admission::Arbitration.new person, ACTIONS_RULES, :anything
     arbitration.prepare_sitting :czech
     expect(
-        arbitration.rule_per_privilege privilege(:human, :count, context: [:czech])
+        arbitration.rule_per_privilege privilege(:human, :count, context: :czech)
     ).to eql(true)
   end
 
@@ -60,24 +60,24 @@ RSpec.describe 'actions_arbitrating' do
   it 'allows count and king to impose corvee in his countries' do
     expect(
         rule :impose_corvee,
-            privilege(:human, :count, context: [:czech])
+            privilege(:human, :count, context: :czech)
     ).to eql(true)
 
     expect(
         rule :impose_corvee,
-            privilege(:human, :king, context: [:czech])
+            privilege(:human, :king, context: :czech)
     ).to eql(true)
   end
 
   it 'forbids count and king to impose corvee outside his countries' do
     expect(
         rule :impose_corvee,
-            privilege(:human, :count, context: [:taiwan])
+            privilege(:human, :count, context: :taiwan)
     ).to eql(:forbidden)
 
     expect(
         rule :impose_corvee,
-            privilege(:human, :king, context: [:taiwan])
+            privilege(:human, :king, context: :taiwan)
     ).to eql(:forbidden)
   end
 

data/spec/integration/resource_arbitrating_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe 'resources_arbitrating' do
 
   def arbitration scope, action, context=nil
     arbitration = Admission::ResourceArbitration.new person, RESOURCE_RULES, action, scope
-    arbitration.prepare_sitting *context
+    arbitration.prepare_sitting context
     arbitration
   end
 
@@ -48,7 +48,7 @@ RSpec.describe 'resources_arbitrating' do
           :anything, :actions
       arbitration.prepare_sitting :czech
       expect(
-          arbitration.rule_per_privilege privilege(:human, :count, context: [:czech])
+          arbitration.rule_per_privilege privilege(:human, :count, context: :czech)
       ).to eql(true)
     end
 
@@ -69,24 +69,24 @@ RSpec.describe 'resources_arbitrating' do
     it 'allows count and king to impose corvee in his countries' do
       expect(
           actions_rule :impose_corvee,
-              privilege(:human, :count, context: [:czech])
+              privilege(:human, :count, context: :czech)
       ).to eql(true)
 
       expect(
           actions_rule :impose_corvee,
-              privilege(:human, :king, context: [:czech])
+              privilege(:human, :king, context: :czech)
       ).to eql(true)
     end
 
     it 'forbids count and king to impose corvee outside his countries' do
       expect(
           actions_rule :impose_corvee,
-              privilege(:human, :count, context: [:taiwan])
+              privilege(:human, :count, context: :taiwan)
       ).to eql(:forbidden)
 
       expect(
           actions_rule :impose_corvee,
-              privilege(:human, :king, context: [:taiwan])
+              privilege(:human, :king, context: :taiwan)
       ).to eql(:forbidden)
     end
 
@@ -145,17 +145,17 @@ RSpec.describe 'resources_arbitrating' do
 
     it 'allows vassal to list persons only per his countries' do
       expect(
-          rule :persons, :index, privilege(:vassal, context: [:czech])
+          rule :persons, :index, privilege(:vassal, context: :czech)
       ).to eql(true)
 
       expect(
-          rule :persons, :index, privilege(:vassal, context: [:taiwan])
+          rule :persons, :index, privilege(:vassal, context: :taiwan)
       ).to eql(false)
     end
 
     it 'allows access scope-arbiter by resource' do
       expect(
-          rule person, :index, privilege(:vassal, context: [:czech])
+          rule person, :index, privilege(:vassal, context: :czech)
       ).to eql(true)
     end
 
@@ -171,22 +171,22 @@ RSpec.describe 'resources_arbitrating' do
 
     it 'allows lord to list persons from his country' do
       expect(
-          rule person, :index, privilege(:vassal, context: [:czech])
+          rule person, :index, privilege(:vassal, context: :czech)
       ).to eql(true)
 
       expect(
-          rule :persons, :index, privilege(:vassal, context: [:czech])
+          rule :persons, :index, privilege(:vassal, context: :czech)
       ).to eql(true)
 
       expect(
-          rule person, :index, privilege(:vassal, context: [:taiwan])
+          rule person, :index, privilege(:vassal, context: :taiwan)
       ).to eql(false)
     end
 
     it 'allows lord to update person that is from his country' do
       expect(
           rule female, :update,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(true)
 
       expect(
@@ -199,12 +199,12 @@ RSpec.describe 'resources_arbitrating' do
 
       expect(
           rule female, :update,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(false)
 
       expect(
           rule female, :update,
-              privilege(:vassal, :lord, context: [:taiwan])
+              privilege(:vassal, :lord, context: :taiwan)
       ).to eql(false)
     end
 
@@ -216,7 +216,7 @@ RSpec.describe 'resources_arbitrating' do
 
     it 'disallows vassal to update person' do
       expect(
-          rule person, :update, privilege(:vassal, context: [:czech])
+          rule person, :update, privilege(:vassal, context: :czech)
       ).to eql(false)
     end
 
@@ -225,12 +225,12 @@ RSpec.describe 'resources_arbitrating' do
 
       expect(
           rule person, :destroy,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(true)
 
       expect(
           rule female, :destroy,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(false)
     end
 
@@ -238,7 +238,7 @@ RSpec.describe 'resources_arbitrating' do
       helicopter = Person.new 'person', Person::APACHE_HELICOPTER, [:czech]
       expect(
           rule helicopter, :destroy,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(false)
     end
 
@@ -263,12 +263,12 @@ RSpec.describe 'resources_arbitrating' do
 
       expect(
           rule [person, :possessions], :update,
-              privilege(:vassal, :lord, context: [:czech])
+              privilege(:vassal, :lord, context: :czech)
       ).to eql(true)
 
       expect(
           rule [person, :possessions], :update,
-              privilege(:vassal, :lord, context: [:taiwan])
+              privilege(:vassal, :lord, context: :taiwan)
       ).to eql(false)
     end
 

data/spec/test_context/privileges_and_rules.rb

@@ -82,7 +82,7 @@ RESOURCE_RULES = Admission::ResourceArbitration.define_rules PRIVILEGES_ORDER do
 
   privilege :vassal do
 
-    allow_resource Person, :show do |person, _|
+    allow_resource Person, :show do |person, *|
       raise 'person is nil' unless person
       self == person
     end

data/spec/unit/privilege_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe Admission::Privilege do
 
   describe '#dup_with_context' do
 
-    it 'self when context is empty' do
+    it 'self when context is nil' do
       p2 = privilege.dup_with_context
       expect(p2).to be_a(Admission::Privilege)
       expect(p2).to equal(privilege)
@@ -94,26 +94,14 @@ RSpec.describe Admission::Privilege do
       p2 = privilege.dup_with_context nil
       expect(p2).to be_a(Admission::Privilege)
       expect(p2).to equal(privilege)
-
-      p2 = privilege.dup_with_context []
-      expect(p2).to be_a(Admission::Privilege)
-      expect(p2).to equal(privilege)
-    end
-
-    it 'duplicates with context as array' do
-      p2 = privilege.dup_with_context :moon
-      expect(p2).to be_a(Admission::Privilege)
-      expect(p2).not_to equal(privilege)
-      expect(p2).to eql(privilege)
-      expect(p2).to have_attributes(name: :man, level: :base, context: [:moon])
     end
 
     it 'duplicates only change context' do
-      p2 = privilege.dup_with_context [:moon]
+      p2 = privilege.dup_with_context :moon
       expect(p2).to be_a(Admission::Privilege)
       expect(p2).not_to equal(privilege)
       expect(p2).to eql(privilege)
-      expect(p2).to have_attributes(name: :man, level: :base, context: [:moon])
+      expect(p2).to have_attributes(name: :man, level: :base, context: :moon)
     end
 
   end

data/spec/unit/status_spec.rb

@@ -0,0 +1,61 @@
+require_relative './_helper'
+
+RSpec.describe Admission::Status do
+
+  def privilege context
+    @fake_privilege_klass ||= Struct.new(:context, :inherited)
+    @fake_privilege_klass.new context
+  end
+
+  describe '#new' do
+
+    it 'sets privileges to nil' do
+      instance = Admission::Status.new :person, nil, :rules, :arbiter
+      expect(instance).to have_inst_vars(
+          person: :person,
+          privileges: nil,
+          rules: :rules,
+          arbiter: :arbiter
+      )
+
+      instance = Admission::Status.new :person, [], :rules, :arbiter
+      expect(instance).to have_inst_vars(
+          person: :person,
+          privileges: nil,
+          rules: :rules,
+          arbiter: :arbiter
+      )
+    end
+
+    it 'sets privileges' do
+      instance = Admission::Status.new :person, ['kkk'], :rules, :arbiter
+      expect(instance).to have_inst_vars(
+          person: :person,
+          privileges: ['kkk'],
+          rules: :rules,
+          arbiter: :arbiter
+      )
+    end
+
+  end
+
+  describe '#allowed_in_contexts' do
+
+    it 'returns empty list for blank privileges' do
+      instance = Admission::Status.new :person, nil, :rules, :arbiter
+      expect(instance.allowed_in_contexts).to eq([])
+    end
+
+    it 'lists only context for which any privilege allows it' do
+      priv1 = privilege text: '1'
+      priv2 = privilege text: '2'
+      rules = {can: {priv1 => true}}
+      instance = Admission::Status.new nil, [priv1, priv2], rules, Admission::Arbitration
+
+      list = instance.allowed_in_contexts :can
+      expect(list).to eq([priv1.context])
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admission
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - doooby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies: []
 description: update-me
 email: zelazk.o@email.cz
@@ -45,10 +45,10 @@ files:
 - spec/test_context/persons_fixtures.rb
 - spec/test_context/privileges_and_rules.rb
 - spec/unit/_helper.rb
-- spec/unit/ability_spec.rb
 - spec/unit/privilege/order_definer_spec.rb
 - spec/unit/privilege_spec.rb
 - spec/unit/resource_arbitration_spec.rb
+- spec/unit/status_spec.rb
 homepage: https://github.com/doooby/admission
 licenses:
 - GPL-3.0

data/spec/unit/ability_spec.rb

@@ -1,29 +0,0 @@
-# require_relative '../spec_helper'
-# require_relative '../test_context/index'
-#
-# RSpec.describe Admission::Ability do
-#
-#   let(:nobody_ability){ Admission::Ability.new Person::FIXTURES[:nobody] }
-#   let(:haramber_ability){ Admission::Ability.new Person::FIXTURES[:harambe] }
-#
-#
-#   describe '#new' do
-#
-#     it 'creates instance with no privileges' do
-#       expect(nobody_ability.instance_variable_get :@no_privileges).to be
-#     end
-#
-#     it 'creates instance with some privileges' do
-#       expect(haramber_ability.instance_variable_get :@no_privileges).not_to be
-#     end
-#
-#   end
-#
-#   # describe '#process' do
-#   #
-#   #   it '' do
-#   #   end
-#   #
-#   # end
-#
-# end