mumukit-auth 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f582e482347dc9147657752b0307c6756d81b627
-  data.tar.gz: 9a783d130d27f08a61fec39d6a34348c8355fb48
+  metadata.gz: 8fbc5aece9f1ceef11e2f32c4e1bb84a4644031b
+  data.tar.gz: 588bd33d6ba3f2d5e01e03242a461b67a369277e
 SHA512:
-  metadata.gz: 7154ba40df463d0110b76c96d04cc335dc421db62e310b5788d78bd9712536b4606baeac7e4c1f75040ea600f8434152f4662f314636f72851eddc578b0a5cbb
-  data.tar.gz: 9faa565b72369ff5213f3bd440b8c4f62726fdca9cddd423f33a513c335ad7c4e334d4be89783df03b18fe428bd160c9fd76973746ea6622c93103c2801bdaf4
+  metadata.gz: 56728c7d40f73f4f6a8a7c35189b355b72842d44fc2ab08ccce57b4bae7eeb5e180731ccb89e3bab3529a49734c723be4b6856d931a9c2f15917385e00df7d72
+  data.tar.gz: d6caaa9740b5ed65217ad769ffcfc6e42159454b5facfffd0250a63587f7236ddccd7d55053c7ec0393e478e19255f55873697f101eea1109cd119756fefd771

data/lib/mumukit/auth/permissions.rb

@@ -30,11 +30,15 @@ class Mumukit::Auth::Permissions
   end
 
   def add_permission!(role, *grants)
-    scope_for(role)&.add_grant! *grants
+    scope_for(role).add_grant! *grants
+  end
+
+  def merge(other)
+    self.class.new(scopes.merge(other.scopes) { |_key, left, right| left.merge right})
   end
 
   def remove_permission!(role, grant)
-    scope_for(role)&.remove_grant!(grant)
+    scope_for(role).remove_grant!(grant)
   end
 
   def update_permission!(role, old_grant, new_grant)

data/lib/mumukit/auth/scope.rb

@@ -3,7 +3,8 @@ module Mumukit::Auth
     attr_accessor :grants
 
     def initialize(grants=[])
-      @grants = grants
+      @grants = []
+      add_grant! *grants
     end
 
     def protect!(resource_slug)
@@ -15,7 +16,7 @@ module Mumukit::Auth
     end
 
     def add_grant!(*grants)
-      self.grants.push *grants.map(&:to_mumukit_grant)
+      grants.each { |grant| push_and_compact! grant }
     end
 
     def remove_grant!(grant)
@@ -23,6 +24,10 @@ module Mumukit::Auth
       self.grants.delete(grant)
     end
 
+    def merge(other)
+      self.class.new grants + other.grants
+    end
+
     def to_s
       grants.map(&:to_s).join(':')
     end
@@ -44,5 +49,20 @@ module Mumukit::Auth
     def any_grant?(&block)
       @grants.any?(&block)
     end
+
+    def push_and_compact!(grant)
+      grant = grant.to_mumukit_grant
+      return if has_broader_grant? grant
+      remove_narrower_grants! grant
+      grants << grant
+    end
+
+    def remove_narrower_grants!(grant)
+      grants.reject! { |it| grant.allows? it }
+    end
+
+    def has_broader_grant?(grant)
+      grants.any? { |it| it.allows? grant }
+    end
   end
 end

data/lib/mumukit/auth/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Auth
-    VERSION = '3.2.0'
+    VERSION = '3.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-auth
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler