admission 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71b602ebc6eb991561c298a07838ffc1832a3108
-  data.tar.gz: 8610564b982d63a74056567a7358d64ef3c38b8a
+  metadata.gz: 7d0ddd21cf83cf7bbf30c34dd7e10ef53d919f8f
+  data.tar.gz: 005bfb63f14d000d9e2ee04761c67158a63686a7
 SHA512:
-  metadata.gz: 2f9cfd81aecc86ba02926266113029354ce66e467c34c6ff46b444ba25349820ee443eadacbfad5a5bfa04959d59d39dec55551948bc37355d8398d45abacb45
-  data.tar.gz: 1f482260466f15bbd8076565865c1f0a8b16493d6c0ace7a608f21803a807fe3c4e453eaf778c8b63dcdbf00239b7a722ae24d7554bf87a2c280cab2397da614
+  metadata.gz: cd2f8037bc53cbc86e22f1daa9eb1999dcf1f9d9d761c3d4574056a414307ff928383452628d3dd86b5e8f590ddcb4e3c0727f55daa2902d31d24cd2273b5e8b
+  data.tar.gz: 23f1de94269b77ce818d71166231ec201844b280b1a2e5653d0f4480b60b883199ba3df920560b78affb7c01991f956b9efb94a7050414eaf998b366846f5325

data/lib/admission/privilege.rb

@@ -9,11 +9,9 @@ class Admission::Privilege
   attr_reader :inherited, :context
 
   def initialize name, level=nil
-    name = name.to_sym
-    @name = name
-    level = level ? level.to_sym : BASE_LEVEL_NAME
-    @level = level
-    @hash = [name, level].hash
+    @name = name.to_sym
+    @level = level ? level.to_sym : BASE_LEVEL_NAME
+    @hash = [@name, @level].hash
   end
 
   def inherits_from *privileges
@@ -60,4 +58,4 @@ class Admission::Privilege
     ].join ''
   end
 
-end
+end

data/lib/admission/tests/minitest.rb

@@ -0,0 +1,63 @@
+require_relative './tests'
+
+Minitest::Assertions.module_exec do
+
+  def get_privilege name, context=nil
+    p = Admission::Tests.order.get *Admission::Privilege.split_text_key(name)
+    p = p.dup_with_context context if context
+    p
+  end
+
+  def assert_admission status, privilege, request, scope
+    arbitration = status.instantiate_arbitration request, scope
+    arbitration.prepare_sitting privilege.context
+    result = arbitration.rule_per_privilege(privilege).eql?(true)
+
+    assert result, ->{ Admission::Tests.assertion_failed_message arbitration, privilege }
+  end
+
+  def refute_admission status, privilege, request, scope
+    arbitration = status.instantiate_arbitration request, scope
+    arbitration.prepare_sitting privilege.context
+    result = arbitration.rule_per_privilege(privilege).eql?(true)
+
+    refute result, ->{ Admission::Tests.refutation_failed_message arbitration, privilege }
+  end
+
+  def separate_privileges *args, &block
+    Admission::Tests.separate_privileges *args, &block
+  end
+
+  def assert_admissions_evaluation evaluation, request, to_assert, to_refute
+    should, should_not = evaluation.for_request(request).evaluate_groups to_assert, to_refute
+    assert should.empty?, ->{
+      Admission::Tests.assertion_failed_message evaluation.arbitration,
+          "any of: #{should.map{|p| p.privilege.to_s}.join ', '}"
+    }
+    assert should_not.empty?, ->{
+      Admission::Tests.refutation_failed_message evaluation.arbitration,
+          "any of: #{should_not.map{|p| p.privilege.to_s}.join ', '}"
+    }
+  end
+
+end
+
+if defined?(Mocha::Expectation) && defined?(Admission::Rails)
+
+  Admission::Tests.module_exec do
+
+    def self.create_action_mock controller
+      ->(action, scope, params: nil, &block){
+        c = controller.new
+        c.stubs(:action_name).returns action
+        c.expects(:request_admission!).
+            with(action.to_sym, scope)
+        c.stubs(:params).returns params if params
+        block.call c if block
+        c.send :assure_admission
+      }
+    end
+
+  end
+
+end

data/lib/admission/tests/tests.rb

@@ -0,0 +1,167 @@
+module Admission::Tests
+
+  class << self
+    attr_accessor :order
+    attr_accessor :all_privileges
+
+    def assertion_failed_message arbitration, privilege
+      'Admission denied to %s applying %s.' % [
+          arbitration.case_to_s,
+          privilege.to_s
+      ]
+    end
+
+    def refutation_failed_message arbitration, privilege
+      'Admission given to %s applying %s.' % [
+          arbitration.case_to_s,
+          privilege.to_s
+      ]
+    end
+
+    def separate_privileges selector=nil, inheritance: true, list: all_privileges, &block
+      selector = block unless selector
+      selector = [selector] if selector.is_a? String
+
+      block = case selector
+      when Array
+        if inheritance
+          ref_privileges = selector.map do |s|
+            order.get *Admission::Privilege.split_text_key(s)
+          end
+          ->(p){
+            ref_privileges.any?{|ref_p| p.eql_or_inherits? ref_p }
+          }
+
+        else
+          ->(p){ selector.include? p.text_key }
+
+        end
+
+      when Proc
+        selector
+
+      else raise ArgumentError.new('bad selector type')
+      end
+
+      list.partition &block
+    end
+
+  end
+
+  @all_privileges = []
+
+  class Evaluation
+
+    attr_reader :status, :arbitration
+
+    def initialize status, scope
+      @status = status
+      @scope = scope
+    end
+
+    def request= name
+      @arbitration = status.instantiate_arbitration name.to_sym, @scope
+    end
+
+    def for_request name
+      self.request = name
+      self
+    end
+
+    def evaluate privilege
+      arbitration.prepare_sitting privilege.context
+      arbitration.rule_per_privilege(privilege).eql?(true)
+    end
+
+    def evaluate_groups to_assert, to_refute
+      to_assert = to_assert.map{|p| ContextSpecificPrivilege.new p}
+      to_refute = to_refute.map{|p| ContextSpecificPrivilege.new p}
+      sorted = (to_assert + to_refute).sort_by{|p| p.privilege.context}
+      admissible, denied = sorted.partition{|p| evaluate p.privilege}
+
+      [
+          (denied - to_refute),
+          (admissible - to_assert)
+      ]
+    end
+
+    def messages_for_groups should, should_not
+      [
+          should.map{|p| Admission::Tests.assertion_failed_message arbitration, p.privilege},
+          should_not.map{|p| Admission::Tests.refutation_failed_message arbitration, p.privilege}
+      ].flatten
+    end
+
+  end
+
+  class ContextSpecificPrivilege
+
+    attr_reader :privilege
+
+    def initialize privilege
+      @privilege = privilege
+      @hash = [privilege.name, privilege.level, privilege.context].hash
+    end
+
+    def eql? other
+      hash == other.hash
+    end
+
+  end
+
+  class RuleCheckContext
+
+    attr_reader :action
+
+    def initialize
+      @evaluations = []
+      action = yield self
+      self.set_rule_check_action = action if !self.action && Proc === action
+    end
+
+    def data
+      @data ||= {}
+    end
+
+    def set value
+      case value
+      when Proc then @data_builder = value
+      when Hash then @data = value
+      else raise('context must be Hash or Proc')
+      end
+    end
+
+    def prepare *args, &block
+      raise 'context is static (i.e. context was not set to a Proc)' unless @data_builder
+      @data = @data_builder.call *args, &block
+    end
+
+    def set_rule_check_action= action
+      @action = action
+    end
+
+    def [] value
+      data[value]
+    end
+
+    def []= name, value
+      data[name] = value
+    end
+
+    def add_evaluation *args
+      evaluation = Evaluation.new *args
+      @evaluations.push evaluation
+      evaluation
+    end
+
+    def evaluate request
+      raise 'no evaluation preset' if @evaluations.empty?
+      @evaluations.each do |evaluation|
+        evaluation.request = request
+        yield evaluation
+      end
+    end
+
+  end
+
+end

data/lib/admission/version.rb

@@ -1,3 +1,3 @@
 module Admission
-  VERSION = '0.5.3'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admission
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Ondřej Želazko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies: []
 description: Admission rules to actions or resources, privileges system included
 email: zelazk.o@email.cz
@@ -23,7 +23,6 @@ files:
 - lib/admission/arbitration.rb
 - lib/admission/denied.rb
 - lib/admission/index.rb
-- lib/admission/minitest.rb
 - lib/admission/privilege.rb
 - lib/admission/privileges_order.rb
 - lib/admission/rails.rb
@@ -32,7 +31,8 @@ files:
 - lib/admission/rails/scope_resolver.rb
 - lib/admission/resource_arbitration.rb
 - lib/admission/status.rb
-- lib/admission/tests.rb
+- lib/admission/tests/minitest.rb
+- lib/admission/tests/tests.rb
 - lib/admission/version.rb
 homepage: https://github.com/doooby/admission
 licenses:

data/lib/admission/minitest.rb

@@ -1,41 +0,0 @@
-require_relative './tests'
-
-# custom matchers
-Minitest::Assertions.module_exec do
-
-  def assert_admission status, privilege, action, scope
-    arbitration = status.instantiate_arbitration action, scope
-    arbitration.prepare_sitting privilege.context
-    result = arbitration.rule_per_privilege(privilege).eql?(true)
-
-    assert result, ->{ Admission::Test.assertion_failed_message arbitration, privilege }
-  end
-
-  def refute_admission status, privilege, action, scope
-    arbitration = status.instantiate_arbitration action, scope
-    arbitration.prepare_sitting privilege.context
-    result = arbitration.rule_per_privilege(privilege).eql?(true)
-
-    refute result, ->{ Admission::Test.refutation_failed_message arbitration, privilege }
-  end
-
-  def assert_privileges_admission status, action, scope, assert: [], refute: []
-    arbitration = status.instantiate_arbitration action, scope
-    assert.sort_by! &:context
-    refute.sort_by! &:context
-
-    assert.each do |privilege|
-      arbitration.prepare_sitting privilege.context
-      result = arbitration.rule_per_privilege(privilege).eql?(true)
-      assert result, ->{ Admission::Test.assertion_failed_message arbitration, privilege }
-    end
-
-    refute.each do |privilege|
-      arbitration.prepare_sitting privilege.context
-      result = arbitration.rule_per_privilege(privilege).eql?(true)
-      refute result, ->{ Admission::Test.refutation_failed_message arbitration, privilege }
-    end
-
-  end
-
-end

data/lib/admission/tests.rb

@@ -1,60 +0,0 @@
-module Admission::Test
-
-  class << self
-    attr_accessor :order
-    attr_accessor :all_privileges
-
-    def assertion_failed_message arbitration, privilege
-      'Admission denied to %s using %s' % [
-          arbitration.case_to_s,
-          privilege.to_s
-      ]
-    end
-
-    def refutation_failed_message arbitration, privilege
-      'Admission given to %s using %s' % [
-          arbitration.case_to_s,
-          privilege.to_s
-      ]
-    end
-
-    def separate_privileges selector=nil, inheritance: false, list: all_privileges, &block
-      selector = block unless selector
-
-      block = case selector
-        when String
-          if inheritance
-            ref_privilege = order.get *Admission::Privilege.split_text_key(selector)
-            ->(p){ p.eql_or_inherits? ref_privilege }
-
-          else
-            ->(p){ p.text_key == selector }
-
-          end
-        when Array
-          if inheritance
-            ref_privileges = selector.map do |s|
-              order.get *Admission::Privilege.split_text_key(s)
-            end
-            ->(p){
-              ref_privileges.any?{|ref_p| p.eql_or_inherits? ref_p }
-            }
-
-          else
-            ->(p){ selector.include? p.text_key }
-
-          end
-        when Proc
-          selector
-
-        else raise ArgumentError.new('bad selector type')
-      end
-
-      list.partition &block
-    end
-
-  end
-
-  @all_privileges = []
-
-end