isomorfeus-policy 1.0.0.delta12 → 1.0.0.epsilon1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2fe7052bf8d2dde88e40dbaf7e84b4a346a2d76d50f388dcd921ec6c7e04f2
-  data.tar.gz: 5b548ae9f03dd1fa28cabc0d239e7b9c5aacb9c73282e1928767d28f18dacf13
+  metadata.gz: 1a2f26a5f58b1c8dce4bb0439587288e5bf5b38cd48174a25abe6bf24479148d
+  data.tar.gz: badb0fdc82dd47c5660d737c798f81f8544a640b91e65ceb638c07f43383c290
 SHA512:
-  metadata.gz: 23e95150876608e3da88a67cd2f25292d178f17379e033ba523b0ee3c1e146d86e11398eae9073d97abf09adc81cf07f592de7183be48fbb2efa59ccc7f625eb
-  data.tar.gz: 9b58c54270a731b88549cff14e4217290f64125b5ce2d623578c2a9c3a5358cc910373320830f413c625e708d106d506c5fa4990dc4e0b938bc6601871f2b655
+  metadata.gz: d778f99cea46d15f2c21e75e80d11e4877d89908012c9610aad44da71af7873109cc965c49be7be372fc9ff5239d35ed02c69529c6e7828269eaf0945577eb5c
+  data.tar.gz: 59c041bb5980a783f77ecb5332b4b7e82024ef4be35dd15f0bed4f2c524485c686a2bcf4a809debbbd9c607fdf70407ee642ad93de04562efeecaf56bb5b7347

data/lib/isomorfeus/policy/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Policy
-    VERSION = '1.0.0.delta12'
+    VERSION = '1.0.0.epsilon1'
   end
 end

data/lib/lucid_policy/base.rb

@@ -1,11 +1,5 @@
 module LucidPolicy
   class Base
     include LucidPolicy::Mixin
-
-    if RUBY_ENGINE != 'opal'
-      def self.inherited(base)
-        Isomorfeus.add_valid_policy_class(base)
-      end
-    end
   end
 end

data/lib/lucid_policy/mixin.rb

@@ -1,38 +1,13 @@
 module LucidPolicy
   module Mixin
     def self.included(base)
-      if RUBY_ENGINE != 'opal'
-        Isomorfeus.add_valid_policy_class(base) unless base == LucidPolicy::Base
-      end
-
-      # DSL
-      # class MySimplePolicy < LucidPolicy::Base
-      #
-      #   policy_for UserOrRoleClass
-      #
-      #   allow BlaBlaGraph, :load
-      #
-      #   deny BlaGraph, SuperOperation
-      #
-      #   deny others # or: allow others
-      #
-      #   with_condition do |user_or_role_instance, target_class, target_method, *props|
-      #      role.class == AdminRole
-      #   end
-      #
-      #   refine BlaGraph, :load, :count do |user_or_role_instance, target_class, target_method, *props|
-      #     allow if role.verified?
-      #     deny
-      #   end
-      # end
-      #
       base.instance_exec do
         def policy_for(a_class)
           raise LucidPolicy::Exception, "policy_for #{a_class} can only be used once within #{self}!" if @the_class
           @the_class = a_class
           unless a_class.methods.include?(:authorization_rules)
             a_class.define_singleton_method(:authorization_rules) do
-              @authorization_rules ||= { classes: {}, conditions: [], others: nil, policy_classes: [] }
+              @authorization_rules ||= {}
             end
           end
           unless a_class.method_defined?(:authorized?)
@@ -42,35 +17,35 @@ module LucidPolicy
               target_method = class_method_props[1]
               props = class_method_props[2..-1]
 
-              condition_result = true
-              self.class.authorization_rules[:conditions].each do |condition|
-                condition_result = condition.call(self, target_class, target_method, *props, &condition)
-                break unless condition_result == true
-              end
+              result = :deny
+              self.class.authorization_rules.each_value do |rules|
+                condition_result = true
+                rules[:conditions].each do |condition|
+                  condition_result = condition.call(self, target_class, target_method, *props, &condition)
+                  break unless condition_result == true
+                end
 
-              if condition_result
-                result = if self.class.authorization_rules[:classes].key?(target_class)
-                           if target_method &&
-                              self.class.authorization_rules[:classes][target_class].key?(:methods) &&
-                              self.class.authorization_rules[:classes][target_class][:methods].key?(target_method)
-                             self.class.authorization_rules[:classes][target_class][:methods][target_method]
+                if condition_result == true
+                  result = if rules[:classes].key?(target_class)
+                             if target_method && rules[:classes][target_class].key?(:methods) &&
+                                rules[:classes][target_class][:methods].key?(target_method)
+                               rules[:classes][target_class][:methods][target_method]
+                             else
+                               rules[:classes][target_class][:default]
+                             end
                            else
-                             self.class.authorization_rules[:classes][target_class][:default]
+                             rules[:others]
                            end
-                         else
-                           self.class.authorization_rules[:others]
-                         end
-
-                if result.class == Proc
-                  policy_helper = Isomorfeus::Policy::Helper.new
-                  policy_helper.instance_exec(self, target_class, target_method, *props, &result)
-                  result = policy_helper.result
-                end
 
-                result == :allow ? true : false
-              else
-                false
+                  if result.class == Proc
+                    policy_helper = Isomorfeus::Policy::Helper.new
+                    policy_helper.instance_exec(self, target_class, target_method, *props, &result)
+                    result = policy_helper.result
+                  end
+                end
+                break if result == :allow
               end
+              result == :allow ? true : false
             end
           end
           unless a_class.method_defined?(:authorized!)
@@ -79,7 +54,7 @@ module LucidPolicy
               raise LucidPolicy::Exception, "#{self} not authorized to call #{class_method_props}"
             end
           end
-          @the_class.authorization_rules[:policy_classes] << self
+          @the_class.authorization_rules[self.to_s] = { classes: {}, conditions: [], others: :deny }
         end
 
         def allow(*classes_and_methods)
@@ -103,7 +78,7 @@ module LucidPolicy
 
         def with_condition(&block)
           _raise_policy_first unless @the_class
-          @the_class.authorization_rules[:conditions] << block
+          @the_class.authorization_rules[self.to_s][:conditions] << block
         end
 
         private
@@ -118,14 +93,14 @@ module LucidPolicy
 
         def _allow_or_deny(allow_or_deny, *classes_and_methods, &block)
           _raise_policy_first unless @the_class
-
+          rule_hash = @the_class.authorization_rules[self.to_s]
           allow_or_deny_or_block = block_given? ? block : allow_or_deny.to_sym
 
           target_classes = []
           target_methods = []
 
           if classes_and_methods.first == :others
-            @the_class.authorization_rules[:others] = allow_or_deny_or_block
+            rule_hash[:others] = allow_or_deny_or_block
             return
           end
 
@@ -138,14 +113,14 @@ module LucidPolicy
           end
 
           target_classes.each do |target_class|
-            @the_class.authorization_rules[:classes][target_class] = {} unless @the_class.authorization_rules[:classes].key?(target_class)
+            rule_hash[:classes][target_class] = {} unless rule_hash[:classes].key?(target_class)
             if allow_or_deny && target_methods.empty?
-              @the_class.authorization_rules[:classes][target_class][:default] = allow_or_deny_or_block
+              rule_hash[:classes][target_class][:default] = allow_or_deny_or_block
             else
-              @the_class.authorization_rules[:classes][target_class][:default] = :deny unless @the_class.authorization_rules[:classes][target_class].key?(:default)
-              @the_class.authorization_rules[:classes][target_class][:methods] = {} unless @the_class.authorization_rules[:classes][target_class].key?(:methods)
+              rule_hash[:classes][target_class][:default] = :deny unless rule_hash[:classes][target_class].key?(:default)
+              rule_hash[:classes][target_class][:methods] = {} unless rule_hash[:classes][target_class].key?(:methods)
               target_methods.each do |target_method|
-                @the_class.authorization_rules[:classes][target_class][:methods][target_method] = allow_or_deny_or_block
+                rule_hash[:classes][target_class][:methods][target_method] = allow_or_deny_or_block
               end
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-policy
 version: !ruby/object:Gem::Version
-  version: 1.0.0.delta12
+  version: 1.0.0.epsilon1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.11
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 description: Policies for Isomorfeus.
 email: jan@kursator.de
 executables: []
@@ -100,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Policies for Isomorfeus.