bali 2.1.1 → 2.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGE5M2M0ZmE1MGJmMDc4M2ZmM2Q3NzlkNGY3OTAxMDUzNGEwYTBiNg==
+    ZGNkMWUxZjYxNjc3ODBiNzk5ODI4ZWFhMTM3NTgyOGU0MzAzNTZkNA==
   data.tar.gz: !binary |-
-    NmQ0MGNkOGRiMjJlZjc1YTFmZmMzN2FjNDNiNTU1N2I3OTZkZjMyYg==
+    OWU3MjVhNjYwM2U0YTM4YWFjZDBkNDRlOGE0MTM1MzVlMDdkZDNiNg==
 SHA512:
   metadata.gz: !binary |-
-    NWUxZDA3YmFkMDI1YzIwMDUzMjdmNTIxNjBhZmZjNTZmNzc3NWUxMjNmNDU4
-    MmYzNDgxNzczZjc1ODcxMDU0N2FkN2U0ZDM0NDhmYzI1NzY5N2ZjZTAyZGY1
-    MTBiYTQ1ZjU2ZjhhNmUxNjZhZjJkYWM1NTk1Yzk4ZDAyNjM2OWM=
+    OGY3ZDhiNTNlNDEzZGMxZmIyNDIyM2E5NmRkZjY1MGI2N2ZiOTE2ZDU0NTIz
+    ZmZhMjMwZTE5NTg4NTM1MjUxOGM0OTNkZTc4NDNiZDdiODBlYzY3MWZkZTIx
+    YTJkZGNlODA4ZTAyMzk5YThkZmNlNWNmMGYzMDJhZjA4MzE5OTg=
   data.tar.gz: !binary |-
-    NWUwZTM5NTA5NGFiZDI3NDgxMGM5YTlkYzM2Mzc0Y2NjM2IyMmZiYTNiODFh
-    NWMzMzMzZjgyY2QyZWM4MTc1YzdlNGI0NmE0YzM3YmZjNTg4M2I0OWFmZTAw
-    MWE0Mzk4OWY3YzI2NTVhZjIxOGNkYWRjOGE0NzhiMzYzZWQ2NjE=
+    MTY1NDQ1MzRiOTRlZjhiNmRiYTZhNjM4MmFjODVlYjg5YzkzZDE4Yzk3Nzlk
+    MWVmODIwM2ZjMDFhYTE0YmM5NDMwODI2Y2RmYmJkNTA4Y2JlYjliZGZiYjY5
+    ZjhhZmFkMmVmMTdjODkyNmUyMTBkOTMwOTAzYWQ4OWYzYmZmNjk=

data/CHANGELOG.md

@@ -67,3 +67,8 @@
 
 1. Bug fixes on `clear_rules` which it clear rules defined in `others` even when not asked to
 2. Bug fixes on `Bali::Printer` where inherited rules print the wrong target class due to another bug in an internal file (but doesn't hamper rules-checking logic)
+
+== Version 2.1.2
+
+1. `nil` will be printed <nil> when objecting with can! or cannot! for better readability.
+2. Bug fixes on declaring multiple rules with decider. Previously, others were ignored--now, every single rule will get defined whether decider is present or not.

data/lib/bali/dsl/rules_for_dsl.rb

@@ -101,33 +101,32 @@ class Bali::RulesForDsl
   end # others
 
   # to define can and cant is basically using this method
-  def bali_process_auth_rules(auth_val, operations)
+  def bali_process_auth_rules(auth_val, args)
     conditional_hash = nil
+    operations = []
 
-    # scan operations for options
-    operations.each do |elm|
+    # scan args for options
+    args.each do |elm|
       if elm.is_a?(Hash)
         conditional_hash = elm
+      else
+        operations << elm
       end
     end
 
-    if conditional_hash
-      op = operations[0]
+    # add operation one by one
+    operations.each do |op|
       rule = Bali::Rule.new(auth_val, op)
-      if conditional_hash[:if] || conditional_hash["if"]
-        rule.decider = conditional_hash[:if] || conditional_hash["if"]
-        rule.decider_type = :if
-      elsif conditional_hash[:unless] || conditional_hash[:unless]
-        rule.decider = conditional_hash[:unless] || conditional_hash["unless"]
-        rule.decider_type = :unless
+      if conditional_hash
+        if conditional_hash[:if] || conditional_hash["if"]
+          rule.decider = conditional_hash[:if] || conditional_hash["if"]
+          rule.decider_type = :if
+        elsif conditional_hash[:unless] || conditional_hash[:unless]
+          rule.decider = conditional_hash[:unless] || conditional_hash["unless"]
+          rule.decider_type = :unless
+        end
       end
       self.current_rule_group.add_rule(rule)
-    else
-      # no conditional hash, proceed adding operations one by one
-      operations.each do |op|
-        rule = Bali::Rule.new(auth_val, op)
-        self.current_rule_group.add_rule(rule)
-      end
     end
   end # bali_process_auth_rules
 

data/lib/bali/foundations/exceptions/authorization_error.rb

@@ -12,6 +12,8 @@ class Bali::AuthorizationError < Bali::Error
   attr_accessor :target
 
   def to_s
+    # better error message for nil, so that it won't be empty
+    role = self.role ? self.role : "<nil>"
     "Role #{role} is performing #{operation} using precedence #{auth_level}"
   end
 end

data/lib/bali/objector.rb

@@ -98,13 +98,14 @@ module Bali::Objector::Statics
             break
           elsif deducted_roles.is_a?(Array)
             break
-          else
-            # keep it nil if _subtarget_roles is not either String, Symbol or Array
-            deducted_roles = nil
           end
         end # if matching class
       end # each TRANSLATED_SUBTARGET_ROLES
 
+      if deducted_roles.nil?
+        raise Bali::AuthorizationError, "Bali does not know how to process roles: #{_subtarget_roles}"
+      end
+
       return deducted_roles
     end # if
   end

data/lib/bali/version.rb

@@ -1,3 +1,3 @@
 module Bali
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bali
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Adam Pahlevi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler