google_directory 0.2.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad3d45be79a46c765d3e286620049175179c317083042a816acd730751a00ebc
-  data.tar.gz: 2032dcf141e7f8c93d23cee5262c1104fbb902de6bcab02aff8f031b03c8091a
+  metadata.gz: 5070bbd5107bafb81ceff5210423594e3a9da84b733395060f76128ce9c4c5f1
+  data.tar.gz: e5e5200f5d09fe988048f9c1ce0ba97e5206a2d3d03fc41dcec125f4ecc999e7
 SHA512:
-  metadata.gz: db8d3e223648271045ae7ede6b39e2ff6b6ac4ffbf0979a88338bbe86c408a2e6cb0366328d9723cd03db536e226e85c2839f8ca0e474208ed732733c9a9e6a5
-  data.tar.gz: 39e9c27cd74a021935569401113c71fd3814db24bfd7813977d5460b74fc4bde218b3fb23b3c4666687eec1e7addb781d3903e70cc76be66db16a3526c2d82b0
+  metadata.gz: 69573841d026c9edb615e7fe7a8fbebc486df2ed3b46e9ed0d05188651d4afc452dd2c0f87e92f7bedfbd31dce1732f2e3e9b3848af3db6b376263e417ede652
+  data.tar.gz: 558df129d6cefee0d825167261eabc8deb037b475619f5aa6dd110448f9ac7018cb704f373bdb9fe2c05005f0c00e5115e1c2ff3c8550502c5a744468f230dd6

data/lib/google_directory/connection.rb

@@ -36,9 +36,9 @@ module GoogleDirectory
 
     # @note make connection to google directory services
     # @param service [Class] the default is: Google::Apis::AdminDirectoryV1::DirectoryService
-    def initialize( service: Google::Apis::AdminDirectoryV1::DirectoryService )
+    def initialize( service: Google::Apis::AdminDirectoryV1::DirectoryService, authorization: nil )
       @service   = service.new
-      @service.authorization = authorize
+      @service.authorization = authorization || authorize
     end
 
     def version
@@ -74,6 +74,10 @@ module GoogleDirectory
     attr_reader :service
 
     def authorize
+      if !CREDENTIALS_PATH or !SUB_ACCOUNT
+        raise "Please set the environment variables CREDENTIALS_JSON_PATH and SUB_ACCOUNT_NAME to connect to Google Directory API"
+      end
+
       scope = ['https://www.googleapis.com/auth/admin.directory.user', 'https://www.googleapis.com/auth/admin.directory.user.security']
       authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
         json_key_io: File.open(CREDENTIALS_PATH),

data/lib/google_directory/user_commands.rb

@@ -43,7 +43,15 @@ module GoogleDirectory
       defaults  = { suspended: true, password: password, change_password_at_next_login: true }
       user_attr = defaults.merge( attributes )
       # create a google user object
-      user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
+      # Ruby 3: pass keyword args instead of positional Hash
+      # Also coerce nested :name Hash into a UserName object if provided
+      if user_attr[:name].is_a?(Hash)
+        name_hash = user_attr[:name]
+        user_attr = user_attr.merge(
+          name: Google::Apis::AdminDirectoryV1::UserName.new(**name_hash.transform_keys(&:to_sym))
+        )
+      end
+      user_object = Google::Apis::AdminDirectoryV1::User.new(**user_attr)
       # create user in directory services
       response = service.insert_user( user_object )
       {response: response, attributes: attributes[:primary_email], command: :user_create}
@@ -108,7 +116,15 @@ module GoogleDirectory
     private
     def update_user( user_attr )
       # create a user object that google will create
-      user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
+      # Ruby 3: pass keyword args instead of positional Hash
+      # Also coerce nested :name Hash into a UserName object if provided
+      if user_attr[:name].is_a?(Hash)
+        name_hash = user_attr[:name]
+        user_attr = user_attr.merge(
+          name: Google::Apis::AdminDirectoryV1::UserName.new(**name_hash.transform_keys(&:to_sym))
+        )
+      end
+      user_object = Google::Apis::AdminDirectoryV1::User.new(**user_attr)
       # send user object to google directory
       service.update_user( user_attr[:primary_email], user_object )
     end

data/lib/google_directory/users_commands.rb

@@ -16,7 +16,8 @@ module GoogleDirectory
     def users_list( attributes: {} )
       defaults = { max_results: 10, order_by: 'email' }
       filters  = defaults.merge( attributes )
-      response = service.list_users( filters )
+      # Ruby 3: DirectoryService#list_users accepts only keyword args
+      response = service.list_users(**filters)
       {response: response, attributes: filters, command: :users_list}
     end
 

data/lib/google_directory/version.rb

@@ -1,5 +1,5 @@
 module GoogleDirectory
   module Version
-    VERSION = "0.2.4"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_directory
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Bill Tihen
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2026-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-admin_directory_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="