bali 6.0.0rc1 → 6.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d59bbcd74624299c6680e6b33787924db86c22e95ea1eac9817835c90c8fd1b
-  data.tar.gz: 656f6455652098bd35ed58ea60434ace5643f2c5d6063a4ccf1e2b235156a79b
+  metadata.gz: dc092b862d79cc3506ac33a12c09c11a7d79b9b9c91c6a3116b8e6f2d3217288
+  data.tar.gz: b8ee30857224a08cece951ccd5e615d62c2fc1b5888ac9ec77548736c859278d
 SHA512:
-  metadata.gz: e66ac8fffcacebda88e299bef9e0ef512d0dbed4f9e4b309df3bec6b3afabe4af4fd2182f501df0847c396f918adcc128c68846fd163a049b56b2ec2c807884b
-  data.tar.gz: a629ff732df6cb1bc347de1bab16dafb87ad29d87029c3a87b30a4b0301da430cf15e47f5b6844f104a071d0f755dce18a0d29277a07c0f4bd5bdde12e7fd5e9
+  metadata.gz: 7379abef2d029101733e7a7dcb1f4d1718adc07f40cb99f5df4e3ac4ec18ccfd8d5e64c6bbd091527186d9cd7b6ef3d17129c02afc46eaffce1e482ed049bc37
+  data.tar.gz: a5908ad1de7f4882eab302e17aab0c13f478bf2f665a43043ff1a62fdb3e7c99f1d41ecd62d6d17a5474f5a787a5efecbf1b4d5dede94d21d324c9ed2f5c1af9

data/lib/bali.rb

@@ -10,19 +10,10 @@ end
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
-loader.ignore("#{__dir__}/bali/activerecord.rb")
+loader.ignore("#{__dir__}/bali/rails")
 loader.setup
 
 module Bali
-  # mapping class to a RuleClass
-  RULE_CLASS_MAP = {}
-
-  # {
-  #   User: :roles,
-  #   AdminUser: :admin_roles
-  # }
-  TRANSLATED_SUBTARGET_ROLES = {}
-
   extend self
 
   def config
@@ -35,7 +26,9 @@ module Bali
 
   if defined? Rails
     require "bali/railtie"
-    require "bali/activerecord"
+    require "bali/rails/action_controller"
+    require "bali/rails/action_view"
+    require "bali/rails/active_record"
   end
 end
 

data/lib/bali/authorizer.rb

@@ -1,6 +1,6 @@
 module Bali::Authorizer
   def self.included(base)
-    base.extend Bali::Authorizer::Statics
+    base.extend Bali::Statics::Authorizer
   end
 
   def can?(actor_or_roles, operation = nil)
@@ -11,14 +11,3 @@ module Bali::Authorizer
     self.class.cant?(actor_or_roles, operation, self)
   end
 end
-
-# to allow class-level objection
-module Bali::Authorizer::Statics
-  def can?(actor_or_roles, operation, record = self)
-    Bali::Judge.check(:can, actor_or_roles, operation, record)
-  end
-
-  def cant?(actor_or_roles, operation, record = self)
-    Bali::Judge.check(:cant, actor_or_roles, operation, record)
-  end
-end

data/lib/bali/judge.rb

@@ -27,6 +27,13 @@ class Bali::Judge
     :should_cross_check
 
   class << self
+    def default_judgement_value(term)
+      case term
+      when :can then false
+      when :cant then true
+      end
+    end
+
     def check(term, actor_or_roles, operation, record)
       if operation.nil?
         # eg: user.can? :sign_in
@@ -34,7 +41,7 @@ class Bali::Judge
         actor_or_roles = nil
       end
 
-      judgement_value = default_value = term == :can ? false : true
+      judgement_value = default_value = default_judgement_value(term)
       roles = Bali::Role.formalize actor_or_roles
 
       roles.each do |role|
@@ -70,81 +77,44 @@ class Bali::Judge
   end
 
   def judgement
-    our_holy_judgement = natural_value if no_rule_group?
+    judgement = natural_value if no_rule_group?
 
-    if our_holy_judgement.nil? && rule.nil? && may_have_reservation?
-      our_holy_judgement = cross_check_reverse_value(cross_check_judge.judgement)
+    if judgement.nil? && rule.nil? && may_have_reservation?
+      judgement = cross_check_reverse_value(cross_check_judge.judgement)
     end
 
-    if our_holy_judgement.nil? && rule.nil?
+    if judgement.nil? && rule.nil?
       cross_check_value = nil
       # default if can? for undefined rule is false, after related clause
       # cant be found in cant?
-      if should_cross_check
-        cross_check_value = cross_check_judge.judgement
-      end
+      cross_check_value = cross_check_judge.judgement if should_cross_check
 
       # if cross check value nil, then the reverse rule is not defined,
       # let's determine whether they can do anything or not
       if cross_check_value.nil?
-        # rule_group can be nil for when user checking under undefined rule-group
-        if rule_group
-          if rule_group.can_all?
-            our_holy_judgement = term == :cant ? DEFINITE_FALSE : DEFINITE_TRUE
-          elsif rule_group.cant_all?
-            our_holy_judgement = term == :cant ? DEFINITE_TRUE : DEFINITE_FALSE
-          end
-
-        end # if rule_group exist
+        judgement = deduce_from_defined_disposition
       else
         # process value from cross checking
-
         if otherly_rule && (cross_check_value == FUZY_FALSE || cross_check_value == FUZY_TRUE)
           # give chance to check at others block
           @rule = otherly_rule
         else
-          our_holy_judgement = cross_check_reverse_value(cross_check_value)
+          judgement = cross_check_reverse_value(cross_check_value)
         end
       end
-    end # if our judgement nil and rule is nil
-
-    # if our holy judgement is still nil, but rule is defined
-    if our_holy_judgement.nil? && rule
-      if rule.conditional?
-        our_holy_judgement = run_condition(rule, actor, record)
-      else
-        our_holy_judgement = DEFINITE_TRUE
-      end
     end
 
-    # return fuzy if otherly rule defines contrary to this term
-    if our_holy_judgement.nil? && rule.nil? && (other_rule_group && other_rule_group.find_rule(reversed_term, operation))
-      if rule_group && (rule_group.can_all? || rule_group.cant_all?)
-        # don't overwrite our holy judgement with fuzy value if rule group
-        # zeus/plant, because zeus/plant is more definite than any fuzy values
-        # eventhough the rule is abstractly defined
-      else
-        our_holy_judgement = term == :cant ? FUZY_TRUE : FUZY_FALSE
-      end
-    end
-
-    # if at this point still nil, well,
-    # return the natural value for this judge
-    if our_holy_judgement.nil?
-      if otherly_rule
-        our_holy_judgement = FUZY_TRUE
-      else
-        our_holy_judgement = natural_value
-      end
-    end
+    judgement ||= deduce_by_evaluation ||
+      deduce_from_fuzy_rules ||
+      natural_value
 
     return !should_cross_check ?
-      our_holy_judgement :
+      judgement :
 
       # translate response for value above to traditional true/false
       # holy judgement refer to non-standard true/false being used inside Bali
       # which need to be translated from other beings to know
-      our_holy_judgement > 0
+      judgement > 0
   end
 
   private
@@ -214,17 +184,15 @@ class Bali::Judge
         (rule_group && rule_group.can_all?)
     end
 
-    def run_condition(rule, actor, record)
-      # must test first
+    def evaluate(rule, actor, record)
       conditional = rule.conditional
-      case conditional.arity
-      when 0
-        return conditional.() ? DEFINITE_TRUE : DEFINITE_FALSE
-      when 1
-        return conditional.(record) ? DEFINITE_TRUE : DEFINITE_FALSE
-      when 2
-        return conditional.(record, actor) ? DEFINITE_TRUE : DEFINITE_FALSE
-      end
+      evaluation  = case conditional.arity
+                    when 0 then conditional.()
+                    when 1 then conditional.(record)
+                    when 2 then conditional.(record, actor)
+                    end
+
+      evaluation ? DEFINITE_TRUE : DEFINITE_FALSE
     end
 
     def cross_check_reverse_value(cross_check_value)
@@ -236,4 +204,30 @@ class Bali::Judge
       end
     end
 
+    def deduce_by_evaluation
+      return unless rule
+
+      rule.conditional? ?
+        evaluate(rule, actor, record) :
+        judgement = DEFINITE_TRUE
+    end
+
+    def deduce_from_defined_disposition
+      return unless rule_group
+
+      if rule_group.can_all?
+        term == :cant ? DEFINITE_FALSE : DEFINITE_TRUE
+      elsif rule_group.cant_all?
+        term == :cant ? DEFINITE_TRUE : DEFINITE_FALSE
+      end
+    end
+
+    def deduce_from_fuzy_rules
+      reversed_otherly_rule = other_rule_group.find_rule(reversed_term, operation)
+
+      if reversed_otherly_rule
+        term == :cant ? FUZY_TRUE : FUZY_FALSE
+      end
+    end
+
 end

data/lib/bali/printer.rb

@@ -12,10 +12,11 @@ module Bali::Printer
     output = StringIO.new
 
     # build up the string for pretty printing rules
-    Bali::RULE_CLASS_MAP.each do |klass, rule_class|
-      output << "===== #{klass.to_s} =====\n\n"
+    rule_classes = ObjectSpace.each_object(Class).select { |cls| cls < Bali::Rules }
+    rule_classes.each do |rule_class|
+      output << "===== #{rule_class.model_class} =====\n\n"
 
-      rule_class.roles.each do |subtarget, role|
+      rule_class.ruler.roles.each do |subtarget, role|
         print_role role, output
       end
 
@@ -28,7 +29,7 @@ module Bali::Printer
   end
 
   def print_role role, target_io
-    subtarget = role.subtarget.to_s.capitalize
+    subtarget = role.name.to_s.capitalize
     subtarget = "By default" if subtarget.blank?
     can_all = role.can_all?
     counter = 0

data/lib/bali/rails/action_controller.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'active_support/lazy_load_hooks'
+
+ActiveSupport.on_load :action_controller do
+  require "bali"
+  ::ActionController::Base.send :include, Bali::Statics::Authorizer
+end

data/lib/bali/rails/action_view.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'active_support/lazy_load_hooks'
+
+ActiveSupport.on_load :action_view do
+  require "bali"
+  ::ActionView::Base.send :include, Bali::Statics::Authorizer
+end

data/lib/bali/{activerecord.rb → rails/active_record.rb}

@@ -5,4 +5,6 @@ require 'active_support/lazy_load_hooks'
 ActiveSupport.on_load :active_record do
   require "bali"
   ::ActiveRecord::Base.send :include, Bali::Authorizer
+  ::ActiveRecord::Base.send :extend, Bali::Statics::Authorizer
+  ::ActiveRecord::Base.send :extend, Bali::Statics::ActiveRecord
 end

data/lib/bali/role.rb

@@ -5,7 +5,7 @@ class Bali::Role
     DEFAULT_ALLOW = :default_allow
   ].freeze
 
-  attr_accessor :subtarget
+  attr_accessor :name
   attr_accessor :cans, :cants
 
   attr_accessor :can_all
@@ -15,21 +15,22 @@ class Bali::Role
 
   def self.formalize(object)
     case object
-    when String then [object]
-    when Symbol then [object]
-    when NilClass then [object]
+    when String, Symbol, NilClass then [object]
     when Array then object
-    else
-      kls_name = object.class.to_s
-      method_name = Bali::TRANSLATED_SUBTARGET_ROLES[kls_name]
-      roles = method_name ? formalize(object.send(method_name)) : formalize(nil)
-
-      roles
+    else formalize(extract_roles_from_object(object))
     end
   end
 
-  def initialize(subtarget)
-    @subtarget = subtarget&.to_sym
+  def self.extract_roles_from_object(object)
+    method_name = object.class.role_field_for_authorization
+
+    method_name ?
+      formalize(object.send(method_name)) :
+      formalize(nil)
+  end
+
+  def initialize(name)
+    @name = name&.to_sym
     @right_level = INHERIT
 
     @cans = {}

data/lib/bali/ruler.rb

@@ -6,19 +6,9 @@ class Bali::Ruler
   private :model_class
 
   def self.for(record_class)
-    rule_class = Bali::RULE_CLASS_MAP[record_class.to_s]
-
-    if rule_class.nil?
-      rule_class_maker_str = record_class.to_s + Bali.config.suffix
-      rule_class_maker = rule_class_maker_str.safe_constantize
-
-      if rule_class_maker && rule_class_maker.ancestors.include?(Bali::Rules)
-        rule_class = rule_class_maker.ruler
-        Bali::RULE_CLASS_MAP[record_class.to_s] = rule_class
-      end
-    end
-
-    rule_class
+    rule_maker_cls_str = "#{record_class}#{Bali.config.suffix}"
+    rule_class = rule_maker_cls_str.safe_constantize
+    rule_class.ruler if rule_class
   end
 
   def initialize(model_class)
@@ -27,7 +17,7 @@ class Bali::Ruler
   end
 
   def << role
-    @roles[role.subtarget] = role
+    @roles[role.name] = role
   end
 
   def [] role

data/lib/bali/rules.rb

@@ -4,6 +4,16 @@ class Bali::Rules
     attr_reader :ruler
   end
 
+  def self.inherited(subcls)
+    # Every rule class has the inherited block even if it's never
+    # used/formally defined, so it's easier to work with or make
+    # assumption/checking on the inherited block. As we treat
+    # rules defined in the inherited scope, as default value,
+    # this decision makes sense.
+
+    subcls.set_role nil
+  end
+
   def self.model_class
     class_name = to_s
     suffix = Bali.config.suffix
@@ -44,11 +54,7 @@ class Bali::Rules
   end
 
   def self.ruler
-    @ruler ||= begin
-      rule_class = Bali::Ruler.new(model_class)
-      Bali::RULE_CLASS_MAP[model_class.to_s] = rule_class
-      rule_class
-    end
+    @ruler ||= Bali::Ruler.new(model_class)
   end
 
   def self.set_role(role)

data/lib/bali/statics/active_record.rb

@@ -0,0 +1,13 @@
+module Bali::Statics::ActiveRecord
+  def self.extended(cls)
+    cls.class_eval do
+      class << self
+        attr_accessor :role_field_for_authorization
+      end
+
+      def self.extract_roles_from method_name
+        @role_field_for_authorization = method_name
+      end
+    end
+  end
+end

data/lib/bali/statics/authorizer.rb

@@ -0,0 +1,9 @@
+module Bali::Statics::Authorizer
+  def can?(actor_or_roles, operation, record = self)
+    Bali::Judge.check(:can, actor_or_roles, operation, record)
+  end
+
+  def cant?(actor_or_roles, operation, record = self)
+    Bali::Judge.check(:cant, actor_or_roles, operation, record)
+  end
+end

data/lib/bali/version.rb

@@ -1,3 +1,3 @@
 module Bali
-  VERSION = "6.0.0rc1"
+  VERSION = "6.0.0rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bali
 version: !ruby/object:Gem::Version
-  version: 6.0.0rc1
+  version: 6.0.0rc2
 platform: ruby
 authors:
 - Adam Notodikromo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -62,16 +62,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -131,18 +131,22 @@ files:
 - bin/console
 - bin/setup
 - lib/bali.rb
-- lib/bali/activerecord.rb
 - lib/bali/authorizer.rb
 - lib/bali/config.rb
 - lib/bali/dsl_error.rb
 - lib/bali/error.rb
 - lib/bali/judge.rb
 - lib/bali/printer.rb
+- lib/bali/rails/action_controller.rb
+- lib/bali/rails/action_view.rb
+- lib/bali/rails/active_record.rb
 - lib/bali/railtie.rb
 - lib/bali/role.rb
 - lib/bali/rule.rb
 - lib/bali/ruler.rb
 - lib/bali/rules.rb
+- lib/bali/statics/active_record.rb
+- lib/bali/statics/authorizer.rb
 - lib/bali/tasks/bali/print_rules.rake
 - lib/bali/version.rb
 - lib/generators/rails/USAGE