mumukit-auth 0.2.3 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI4N2M5NDExZDc1NjhjYTQ2NjMwNGRmZjFjZmY1ZjI0NWM5MDVlNg==
+    OTg2YjA1MGExZDRlODhkMjk4MTJiNGFlN2FlZWE5NDcwNTgxYjM1YQ==
   data.tar.gz: !binary |-
-    NDJjMTc0ZmMzODc2NThjNGNjYmNjNjRiNDgyZDAxYzExN2RkMzJkMQ==
+    M2U4ZmU4MDE1NjViNGIxYzgzMzNmNzRmNmE1MjMxMWMxNjE4ZTM3OA==
 SHA512:
   metadata.gz: !binary |-
-    YTU3YjdjN2VlZGY0N2RmZWM1ZTNkOTg0YjE3YTdiZTE5MmQ0ZjI0YTY2NmYy
-    OWNkOGUyNjdkZTIzYmFiNzUyNGQ4MGMwMGExZGE0Mzk5Y2VhMTRhMDU2ZWVi
-    ZDY5MjMyMDJiZmFiMTNjNTgxNzQ2NTE3NTk4NDNmZTg0OGY0MGU=
+    ODZkYTk5NjcxNzcxYTRkYWE1MjU5MmYwMmQzYmZmNzFiNDUxNmU2YjIxMGM1
+    ZWVmZjMyZWVjY2MzZDkzMDQyNTRjOGQwZTRhMjA3ODkyYTM1ZjgxNGMxYzgx
+    ZjkxNmUwNDMyYTI0MzQ2N2MwMmYxYjE0ZDA3ZTQ1NjIxMDJjZDM=
   data.tar.gz: !binary |-
-    ZTFjM2UxMTc4MmRiZjQ0ZWExYTRlYThiNzIyNDcxNjgzNjk3YjUwYjdhMzFm
-    YmU5NzM5ZWFiNzdkZDRiOWJmNmU2OTM2ZTRhYmNjZTA0NDgxYTUyMjdlYzU1
-    NWI2NjdhZDVlYzEzZDZjOGE1NjczMGE5ZWQwZDEwOTAxMjAyOTQ=
+    YTUyZWExNzBlMTQyMWRmNTcwMzEzZWZkYmYyNWE3NzdlNjgxY2UyOWM0ZWYy
+    ZTYyZTQ4ZmRkYmUzOGI2MTNkZDFiYzhjOWE3NWExNWIwNWQ0MzBmNGM2ZDE1
+    MTJkNjE0MDBjNjVlNjc3YzdlZGI4ZmIyYjQ0MTZhYzczMDFjYmQ=

data/lib/mumukit/auth/metadata.rb

@@ -13,15 +13,29 @@ class Mumukit::Auth::Metadata
 
   def add_permission!(app, permission)
     if permissions(app).present?
-      @json[app] = process_permission(app, permission)
+      @json[app] = process_add_permission(app, permission)
     else
       @json.merge!("#{app}" => {'permissions' => permission})
     end
-    @json
   end
 
-  def process_permission(app, permission)
-    {permissions: Mumukit::Auth::Permissions.load(permissions(app).as_json + ":#{permission}").to_s}
+  def remove_permission!(app, permission)
+    if permissions(app).present?
+      @json[app] = process_remove_permission(app, permission)
+    end
+    @json.delete(app) if @json.dig(app, 'permissions').blank?
+  end
+
+  def process_permission(new_permissions)
+    {'permissions' => Mumukit::Auth::Permissions.load(new_permissions).to_s}
+  end
+
+  def process_remove_permission(app, permission)
+    process_permission(permissions(app).as_json.split(':').reject { |it| it == permission }.join(':'))
+  end
+
+  def process_add_permission(app, permission)
+    process_permission(permissions(app).as_json + ":#{permission}")
   end
 
   def librarian?(slug)

data/lib/mumukit/auth/user.rb

@@ -9,9 +9,14 @@ class Mumukit::Auth::User
     @user = user || client.user(@social_id)
   end
 
-  def update_permissions(key, permission)
+  def add_permission!(key, permission)
     metadata.add_permission!(key, permission)
-    client.update_user_metadata social_id, metadata.as_json
+    update_user_metadata!
+  end
+
+  def remove_permission!(key, permission)
+    metadata.remove_permission!(key, permission)
+    update_user_metadata!
   end
 
   def permissions_string
@@ -64,4 +69,10 @@ class Mumukit::Auth::User
     )
   end
 
+  private
+
+  def update_user_metadata!
+    client.update_user_metadata social_id, metadata.as_json
+  end
+
 end

data/lib/mumukit/auth/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Auth
-    VERSION = '0.2.3'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mumukit-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: 
 email:
 - franco@mumuki.org