google_directory 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9818097fe34668cd39dc6ef720cf127ba5fbc2538bf89ee72ce9f65f585ed0f7
-  data.tar.gz: 12a8026b64acb4d5f30416bb4904f89f5463ce1b880663e725e946f4bb20c2f0
+  metadata.gz: 8d686d850e36f8f0ca476fa18866bfd73fb913de0e8b134a2fdca08b580a2187
+  data.tar.gz: faa84394c013ca04239bd3f9a5659cf82129f90a8f5750a4cd8b8b2c1a66e07d
 SHA512:
-  metadata.gz: 13c4dd4666a71ad46397c6c298f6ee7d3db374b0bac46d83bb6de540f20dae966e1098b3a0b78474bfaa889ece9ca0fc2c99e7417267523d052f3f45a96e9633
-  data.tar.gz: ebfa0eae70d15e7de9fa9c6ca89148824f8052d7bce27d368dc66852fd9c62450948c4f4cb2df9c656339d82f76e89d5a7bc6ef5e437c22cc52eac7b21af9ae3
+  metadata.gz: 9f4af38fd52d322d6a2a4844e29c3c013c88f74af7e1a3c91e7fe5d540dbbbb28e973eb142f44ff97f46c0b35451a0fa008970c7ac4653e8fb075fe9f1e3ed45
+  data.tar.gz: b70dc522431b30f6cdd4edc57bc3053090e2694e3ee8569f4ac54bd6cb137bbc88450da4d031e3376b551e1bd1bd9184a67090ff39ec746255b4dd030ad61050

data/lib/google_directory/connection.rb

@@ -60,8 +60,9 @@ module GoogleDirectory
         response           = send( command, attributes: attributes )
         response[:status]  = 'success'
       rescue Google::Apis::ClientError => error
-        response = {response: error, command: command,
-                    attributes: attributes, status: 'error'}
+        response = {status: 'error', response: error,
+                    attributes: attributes, command: command,
+                   }
       end
       response
     end

data/lib/google_directory/user_commands.rb

@@ -13,7 +13,7 @@ module GoogleDirectory
     # @return [Hash] formatted as {success: {command: :user_get, attributes: {primary_email: "user@domain"}, response: GoogleUserObject } }
     def user_get( attributes: )
       response = service.get_user( attributes[:primary_email] )
-      {command: :user_get, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_get}
     end
 
     # @note Test if user exists in Google Directory
@@ -23,10 +23,10 @@ module GoogleDirectory
     def user_exists?( attributes: )
       begin
         response = service.get_user( attributes[:primary_email] )
-        return {command: :user_exists?, user: attributes[:primary_email], response: true}
+        return {response: true, attributes: attributes[:primary_email], command: :user_exists?}
       rescue Google::Apis::ClientError => error
         if error.message.include? 'notFound'
-          return {command: :user_exists?, user: attributes[:primary_email], response: false}
+          return {response: false, attributes: attributes[:primary_email], command: :user_exists?}
         else
           raise error
         end
@@ -46,7 +46,7 @@ module GoogleDirectory
       user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
       # create user in directory services
       response = service.insert_user( user_object )
-      {command: :user_create, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_create}
     end
 
     # @note updates an exising Google Directory User
@@ -56,7 +56,7 @@ module GoogleDirectory
     def user_update( attributes: )
       # create a user object for google to update
       response = update_user( attributes )
-      {command: :user_update, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_update}
     end
 
     # @note updates an exising Google Directory User password - convience method instead of using :user_update
@@ -69,7 +69,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_change_password, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_change_password}
     end
 
     # @note activates an exising Google Directory User password - convience method instead of using :user_update
@@ -81,7 +81,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_reactivate, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_reactivate}
     end
 
     # @note suspends an exising Google Directory User password - convience method instead of using :user_update
@@ -93,7 +93,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_suspend, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_suspend}
     end
 
     # @note deletes an exising Google Directory User
@@ -102,7 +102,7 @@ module GoogleDirectory
     # @return [Hash] formatted as {success: {command: :user_delete, attributes: {primary_email: "user@domain"}, response: "" } }
     def user_delete( attributes: )
       response = service.delete_user( attributes[:primary_email] )
-      {command: :user_delete, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_delete}
     end
 
     private

data/lib/google_directory/users_commands.rb

@@ -17,7 +17,7 @@ module GoogleDirectory
       defaults = { max_results: 10, order_by: 'email' }
       filters  = defaults.merge( attributes )
       response = service.list_users( filters )
-      {command: :users_list, filters: filters, response: response}
+      {response: response, attributes: filters, command: :users_list}
     end
 
   end

data/lib/google_directory/version.rb

@@ -1,5 +1,5 @@
 module GoogleDirectory
   module Version
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_directory
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bill Tihen