chore(ruby): Clean up calls to resolve the root module name. (#9503)

chanks · web-flow · commit b622cf1c3901 · 2025-09-17T14:06:32.000Z
Clean up calls to resolve the root module name
diff --git a/generators/ruby-v2/base/src/context/AbstractRubyGeneratorContext.ts b/generators/ruby-v2/base/src/context/AbstractRubyGeneratorContext.ts
@@ -59,9 +59,13 @@ export abstract class AbstractRubyGeneratorContext<
         });
     }
 
+    public getRootModuleName(): string {
+        return capitalize(this.getRootFolderName());
+    }
+
     public getRootModule(): ruby.Module_ {
         return ruby.module({
-            name: capitalize(this.getRootFolderName()),
+            name: this.getRootModuleName(),
             statements: []
         });
     }
diff --git a/generators/ruby-v2/base/src/project/RubyProject.ts b/generators/ruby-v2/base/src/project/RubyProject.ts
@@ -201,7 +201,7 @@ class GemspecFile {
 
     public async toString(): Promise<string> {
         const moduleFolderName = this.context.getRootFolderName();
-        const moduleName = this.context.getRootModule().name;
+        const moduleName = this.context.getRootModuleName();
 
         return dedent`
             # frozen_string_literal: true
@@ -262,7 +262,7 @@ class CustomGemspecFile {
     }
 
     public async toString(): Promise<string> {
-        const moduleName = this.context.getRootModule().name;
+        const moduleName = this.context.getRootModuleName();
 
         return dedent`
             # frozen_string_literal: true
@@ -436,7 +436,7 @@ class VersionFile {
     }
 
     public toString(): string {
-        const seedName = this.context.getRootModule().name;
+        const seedName = this.context.getRootModuleName();
         const version = this.context.getVersionFromConfig();
 
         return dedent`
diff --git a/generators/ruby-v2/model/src/ModelGeneratorContext.ts b/generators/ruby-v2/model/src/ModelGeneratorContext.ts
@@ -35,7 +35,7 @@ export class ModelGeneratorContext extends AbstractRubyGeneratorContext<ModelCus
 
     public getModuleNamesForTypeId(typeId: TypeId): string[] {
         const typeDeclaration = this.getTypeDeclarationOrThrow(typeId);
-        return [this.getRootModule().name, ...this.pascalNames(typeDeclaration), this.getTypesModule().name];
+        return [this.getRootModuleName(), ...this.pascalNames(typeDeclaration), this.getTypesModule().name];
     }
 
     public getModulesForTypeId(typeId: TypeId): ruby.Module_[] {
diff --git a/generators/ruby-v2/model/src/enum/EnumGenerator.ts b/generators/ruby-v2/model/src/enum/EnumGenerator.ts
@@ -27,7 +27,7 @@ export class EnumGenerator extends FileGenerator<RubyFile, ModelCustomConfigSche
         const enumModule = ruby.module({
             name: this.typeDeclaration.name.name.pascalCase.safeName
         });
-        enumModule.addStatement(ruby.codeblock(`extend ${this.context.getRootModule().name}::Internal::Types::Enum`));
+        enumModule.addStatement(ruby.codeblock(`extend ${this.context.getRootModuleName()}::Internal::Types::Enum`));
 
         for (const enumValue of this.enumDeclaration.values) {
             enumModule.addStatement(
diff --git a/generators/ruby-v2/model/src/union/UnionGenerator.ts b/generators/ruby-v2/model/src/union/UnionGenerator.ts
@@ -40,7 +40,7 @@ export class UnionGenerator extends FileGenerator<RubyFile, ModelCustomConfigSch
             superclass: this.context.getModelClassReference(),
             docstring: this.typeDeclaration.docs ?? undefined
         });
-        classNode.addStatement(ruby.codeblock(`extend ${this.context.getRootModule().name}::Internal::Types::Union`));
+        classNode.addStatement(ruby.codeblock(`extend ${this.context.getRootModuleName()}::Internal::Types::Union`));
 
         classNode.addStatement(
             ruby.codeblock((writer) => {
diff --git a/generators/ruby-v2/sdk/src/SdkGeneratorContext.ts b/generators/ruby-v2/sdk/src/SdkGeneratorContext.ts
@@ -79,7 +79,7 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
 
     public getModuleNamesForTypeId(typeId: TypeId): string[] {
         const typeDeclaration = this.getTypeDeclarationOrThrow(typeId);
-        return [this.getRootModule().name, ...this.pascalNames(typeDeclaration), this.getTypesModule().name];
+        return [this.getRootModuleName(), ...this.pascalNames(typeDeclaration), this.getTypesModule().name];
     }
 
     public getModulesForTypeId(typeId: TypeId): ruby.Module_[] {
@@ -146,15 +146,15 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
     public getRawClientClassReference(): ClassReference {
         return ruby.classReference({
             name: "RawClient",
-            modules: [this.getRootModule().name, "Internal", "Http"],
+            modules: [this.getRootModuleName(), "Internal", "Http"],
             fullyQualified: true
         });
     }
 
     public getEnvironmentsClassReference(): ruby.ClassReference {
         return ruby.classReference({
             name: "Environment",
-            modules: [this.getRootModule().name]
+            modules: [this.getRootModuleName()]
         });
     }
 
@@ -176,7 +176,7 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
         // Return the class reference, performing the same casing as the SingleUrlEnvironmentGenerator
         return ruby.classReference({
             name: defaultEnvironment.name.screamingSnakeCase.safeName,
-            modules: [this.getRootModule().name, "Environment"]
+            modules: [this.getRootModuleName(), "Environment"]
         });
     }
 
@@ -187,14 +187,14 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
     public getReferenceToInternalJSONRequest(): ruby.ClassReference {
         return ruby.classReference({
             name: "Request",
-            modules: [this.getRootModule().name, "Internal", "JSON"]
+            modules: [this.getRootModuleName(), "Internal", "JSON"]
         });
     }
 
     public getReferenceToInternalMultipartRequest(): ruby.ClassReference {
         return ruby.classReference({
             name: "Request",
-            modules: [this.getRootModule().name, "Internal", "Multipart"]
+            modules: [this.getRootModuleName(), "Internal", "Multipart"]
         });
     }
 
@@ -203,7 +203,7 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
         return ruby.classReference({
             name: typeDeclaration.name.name.pascalCase.safeName,
             modules: [
-                this.getRootModule().name,
+                this.getRootModuleName(),
                 ...typeDeclaration.name.fernFilepath.allParts.map((path) => path.pascalCase.safeName),
                 "Types"
             ]
@@ -212,7 +212,7 @@ export class SdkGeneratorContext extends AbstractRubyGeneratorContext<SdkCustomC
 
     public getModuleNamesForServiceId(serviceId: ServiceId): string[] {
         return [
-            this.getRootModule().name,
+            this.getRootModuleName(),
             ...this.getSubpackageForServiceId(serviceId).fernFilepath.allParts.map((part) => part.pascalCase.safeName),
             this.getTypesModule().name
         ];
diff --git a/generators/ruby-v2/sdk/src/endpoint/http/HttpEndpointGenerator.ts b/generators/ruby-v2/sdk/src/endpoint/http/HttpEndpointGenerator.ts
@@ -86,7 +86,7 @@ export class HttpEndpointGenerator {
                         body: ruby.raise({
                             errorClass: ruby.classReference({
                                 name: "TimeoutError",
-                                modules: [this.context.getRootModule().name, "Errors"]
+                                modules: [this.context.getRootModuleName(), "Errors"]
                             })
                         })
                     }
@@ -120,7 +120,7 @@ export class HttpEndpointGenerator {
                     ]
                 },
                 elseBody: ruby.codeblock((writer) => {
-                    const rootModuleName = this.context.getRootModule().name;
+                    const rootModuleName = this.context.getRootModuleName();
                     writer.writeLine(
                         `${ERROR_CLASS_VN} = ${rootModuleName}::Errors::ResponseError.subclass_for_code(${CODE_VN})`
                     );
diff --git a/generators/ruby-v2/sdk/src/readme/ReadmeSnippetBuilder.ts b/generators/ruby-v2/sdk/src/readme/ReadmeSnippetBuilder.ts
@@ -43,7 +43,7 @@ export class ReadmeSnippetBuilder extends AbstractReadmeSnippetBuilder {
                 ? this.context.ir.readmeConfig.defaultEndpoint
                 : this.getDefaultEndpointId();
         this.rootPackageName = this.context.getRootFolderName();
-        this.rootPackageClientName = this.context.getRootModule().name;
+        this.rootPackageClientName = this.context.getRootModuleName();
     }
 
     public buildReadmeSnippetsByFeatureId(): Record<FernGeneratorCli.FeatureId, string[]> {
diff --git a/generators/ruby-v2/sdk/src/root-client/RootClientGenerator.ts b/generators/ruby-v2/sdk/src/root-client/RootClientGenerator.ts
@@ -70,7 +70,7 @@ export class RootClientGenerator extends FileGenerator<RubyFile, SdkCustomConfig
             returnType: ruby.Type.class_(
                 ruby.classReference({
                     name: "Client",
-                    modules: [this.context.getRootModule().name],
+                    modules: [this.context.getRootModuleName()],
                     fullyQualified: true
                 })
             )
diff --git a/generators/ruby-v2/sdk/src/subpackage-client/SubPackageClientGenerator.ts b/generators/ruby-v2/sdk/src/subpackage-client/SubPackageClientGenerator.ts
@@ -82,7 +82,7 @@ export class SubPackageClientGenerator extends FileGenerator<RubyFile, SdkCustom
 
     private getClientModuleNames(): string[] {
         return [
-            this.context.getRootModule().name,
+            this.context.getRootModuleName(),
             ...this.subpackage.fernFilepath.allParts.map((path) => path.pascalCase.safeName)
         ];
     }
@@ -95,7 +95,7 @@ export class SubPackageClientGenerator extends FileGenerator<RubyFile, SdkCustom
         return ruby.classReference({
             name: CLIENT_CLASS_NAME,
             modules: [
-                this.context.getRootModule().name,
+                this.context.getRootModuleName(),
                 ...this.subpackage.fernFilepath.allParts.map((path) => path.pascalCase.safeName)
             ],
             fullyQualified: true

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,13 @@ export abstract class AbstractRubyGeneratorContext<`
`59`	`59`	`});`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public getRootModuleName(): string {`
	`63`	`+ return capitalize(this.getRootFolderName());`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`public getRootModule(): ruby.Module_ {`
`63`	`67`	`return ruby.module({`
`64`		`- name: capitalize(this.getRootFolderName()),`
	`68`	`+ name: this.getRootModuleName(),`
`65`	`69`	`statements: []`
`66`	`70`	`});`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export class ModelGeneratorContext extends AbstractRubyGeneratorContext<ModelCus`
`35`	`35`
`36`	`36`	`public getModuleNamesForTypeId(typeId: TypeId): string[] {`
`37`	`37`	`const typeDeclaration = this.getTypeDeclarationOrThrow(typeId);`
`38`		`- return [this.getRootModule().name, ...this.pascalNames(typeDeclaration), this.getTypesModule().name];`
	`38`	`+ return [this.getRootModuleName(), ...this.pascalNames(typeDeclaration), this.getTypesModule().name];`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public getModulesForTypeId(typeId: TypeId): ruby.Module_[] {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export class ReadmeSnippetBuilder extends AbstractReadmeSnippetBuilder {`
`43`	`43`	`? this.context.ir.readmeConfig.defaultEndpoint`
`44`	`44`	`: this.getDefaultEndpointId();`
`45`	`45`	`this.rootPackageName = this.context.getRootFolderName();`
`46`		`- this.rootPackageClientName = this.context.getRootModule().name;`
	`46`	`+ this.rootPackageClientName = this.context.getRootModuleName();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public buildReadmeSnippetsByFeatureId(): Record<FernGeneratorCli.FeatureId, string[]> {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class RootClientGenerator extends FileGenerator<RubyFile, SdkCustomConfig`
`70`	`70`	`returnType: ruby.Type.class_(`
`71`	`71`	`ruby.classReference({`
`72`	`72`	`name: "Client",`
`73`		`- modules: [this.context.getRootModule().name],`
	`73`	`+ modules: [this.context.getRootModuleName()],`
`74`	`74`	`fullyQualified: true`
`75`	`75`	`})`
`76`	`76`	`)`