hotify 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d43ef4a51523168ebf460a44da52b551af4c1c5f482d31b23bdecc02be9259
-  data.tar.gz: 71fb287342aea6fb116a8edad06a79c73430d6b08bdb8cc2fc444c90e4509735
+  metadata.gz: '08ce6906a3be6a5ff236a332d461d3895dcd1017273a21ad42b5b82c252c65c3'
+  data.tar.gz: c6d49d34473f58493e16b2ca071fca490dca6e2653bce630cf6cdd14936b0c2c
 SHA512:
-  metadata.gz: d7525191394ff12a09a1dd3843b8a13f881534065ee429ca0c010b21a55d55226d1582edd6b8e86a6b2dde98f46553de6515993848171bfeb1467fdbb4b82b9d
-  data.tar.gz: ee1dbb55f0cf6140ec7944e23588fb78225dd72bb3ca907af2ba09e15dcc41381eb25790f93ec57a810af79d508b79ab3bf05a205d8f2f129f5b22c6a6421968
+  metadata.gz: 3e1e7fea15496bd4ee4b06958ec0646881cca7ea5634753e2a1a9eaff8c490e03f4edcf5955835563197dad546f88cd860f68e6461c9c15f6467d8e624e18b99
+  data.tar.gz: b106e7fe91069e3bba0d2fe2667f3bde32b958a96bcc9c34fcf24cd107cc7fb13b0d67835cb9cf84db8c8559c5ce8f56646addd3f4053ec44c43db31ea8e3f7f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotify (0.1.1)
+    hotify (0.1.2)
       onelogin (~> 1.5.0)
       thor (~> 1.0.1)
 

data/README.md

@@ -18,6 +18,13 @@ gem install hotify
 
 ## Usage
 
+Reading onelogin credentials from environment variables. So set the environment variable by using the command below.
+
+```sh
+export ONELOGIN_ID=hoge
+export ONELOGIN_SECRET=foo
+```
+
 ### Dump role and users
 
 ```sh

data/lib/hotify.rb

@@ -15,40 +15,48 @@ end
 module Hotify
   class Error < StandardError; end
   class Role
-    def initialize
-      @client = Hotify::Auth.new.client
+    def dump_role
+      client.get_roles.to_a.each{ |role| p role }
     end
 
-    def dump_role
-      @client.get_roles.to_a.each{ |role| p role }
+    def all_roles
+      @_all_roles ||= client.get_roles.to_a
     end
 
     def roles_from(user: )
-      role_ids = @client.get_user_roles(user.id)
+      role_ids = client.get_user_roles(user.id)
       role_ids.map do | role_id |
-        @client.get_role(role_id)
+        client.get_role(role_id)
       end
     end
 
-    def dump_all_users_and_roles
-      users = Hotify::Users.new
-      all_users_and_roles = users.all_users.map do | user |
-        { user: user, roles: roles_from(user: user) }
-      end
+    def role_ids_from(user: )
+      client.get_user_roles(user.id)
+    end
 
-      all_users_and_roles
+    def users
+      @_users ||= Hotify::Users.new
+    end
+
+    def all_users
+      @_all_users ||= users.all_users
+    end
+
+    def all_users_and_roles
+      @_all_users_and_roles ||= all_users.map do | user |
+        { user: user, role_ids: role_ids_from(user: user) }
+      end
     end
 
     def role_in_user
-      all_users_and_roles = dump_all_users_and_roles
-      all_roles = @client.get_roles.to_a
       role_user = Hash.new { |h,k| h[k] = [] }
 
-
       all_roles.each do | role |
-        all_users_and_roles.each do | user_and_roles |
-          user_and_roles[:roles].each do | role |
-            role_user[role.name].push(user_and_roles[:user])
+        all_users_and_roles.each do | user_and_role_ids |
+          user_and_role_ids[:role_ids].each do | role_id |
+            if role.id == role_id
+              role_user[role.name].push(user_and_role_ids[:user])
+            end
           end
         end
       end
@@ -61,20 +69,26 @@ module Hotify
     end
 
     def add_role(user, role)
-      @client.assign_role_to_user(user.id, [role.id])
+      client.assign_role_to_user(user.id, [role.id])
     end
 
     def leave_role(user, role)
-      @client.remove_role_from_user(user.id, [role.id])
+      client.remove_role_from_user(user.id, [role.id])
     end
 
     def find_by_name(name)
       name = "?name=#{name}"
-      @client.get_role(name)
+      client.get_role(name)
     end
 
     def find_by(id)
-      @client.get_role(id)
+      client.get_role(id)
+    end
+
+    private
+
+    def client
+      @_client ||= Hotify::Auth.new.client
     end
   end
 end

data/lib/hotify/user.rb

@@ -1,9 +1,5 @@
 module Hotify
   class Users
-    def initialize
-      @client = Hotify::Auth.new.client
-    end
-
     def self.find_by(email:)
       users = user_filter_by(email: email) 
       if users.size > 1
@@ -16,7 +12,7 @@ module Hotify
     end
 
     def all_users
-      @client.get_users
+      client.get_users
     end
 
     private
@@ -30,5 +26,9 @@ module Hotify
   
       users
     end
+
+    def client
+      @_client ||= Hotify::Auth.new.client
+    end
   end
 end

data/lib/hotify/version.rb

@@ -1,3 +1,3 @@
 module Hotify
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotify
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - j-o-lantern0422
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug