Default to_s

smithy-lang · Jul 23, 2024 · b767cec · b767cec
1 parent 8922cf2
commit b767cec
Show file tree

Hide file tree

Showing 7 changed files with 137 additions and 142 deletions.
diff --git a/codegen/projections/rails_json/lib/rails_json/types.rb b/codegen/projections/rails_json/lib/rails_json/types.rb
diff --git a/codegen/projections/white_label/lib/white_label/types.rb b/codegen/projections/white_label/lib/white_label/types.rb
diff --git a/...rc/main/java/software/amazon/smithy/ruby/codegen/generators/types/StructureGenerator.java b/...rc/main/java/software/amazon/smithy/ruby/codegen/generators/types/StructureGenerator.java
@@ -191,25 +191,29 @@ private void renderToSMethod(RubyCodeWriter writer) {
 
             writer
                     .openBlock("\ndef to_s")
-                    .write("\"#<$L \"\\", fullQualifiedShapeName)
+                    .write("'#<$L ' \\", fullQualifiedShapeName)
                     .indent();
 
             while (iterator.hasNext()) {
                 MemberShape memberShape = iterator.next();
                 String key = symbolProvider.toMemberName(memberShape);
                 String value = "#{" + key + " || 'nil'}";
+                boolean memberLiteral = false;
 
                 if (memberShape.isBlobShape() || memberShape.isStringShape()) {
                     // Strings are wrapped in quotes
                     value = "\"" + value + "\"";
+                    memberLiteral = true;
                 } else if (memberShape.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
-                    value = "\\\"[SENSITIVE]\\\"";
+                    value = "[SENSITIVE]";
+                    memberLiteral = true;
                 }
 
+                String quote = memberLiteral ? "'" : "\"";
                 if (iterator.hasNext()) {
-                    writer.write("\"$L=$L, \"\\", key, value);
+                    writer.write("$3L$1L=$2L, $3L \\", key, value, quote);
                 } else {
-                    writer.write("\"$L=$L>\"", key, value);
+                    writer.write("$3L$1L=$2L>$3L", key, value, quote);
                 }
             }
             writer

diff --git a/...en/src/main/java/software/amazon/smithy/ruby/codegen/generators/types/UnionGenerator.java b/...en/src/main/java/software/amazon/smithy/ruby/codegen/generators/types/UnionGenerator.java
@@ -112,19 +112,17 @@ public void render() {
     }
 
     private void renderUnionToSMethod(RubyCodeWriter writer, MemberShape memberShape) {
-        String fullQualifiedShapeName = settings.getModule() + "::Types::"
-                + symbolProvider.toMemberName(memberShape);
-
-        writer.write("")
-                .openBlock("def to_s");
-
-        if (memberShape.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
-            writer.write("\"#<$L [SENSITIVE]>\"", fullQualifiedShapeName);
-        } else {
-            writer.write("\"#<$L #{__getobj__ || 'nil'}>\"", fullQualifiedShapeName);
+        if (!memberShape.getMemberTrait(model, SensitiveTrait.class).isPresent()) {
+            return;
         }
 
-        writer.closeBlock("end");
+        String fullQualifiedShapeName = settings.getModule() + "::Types::"
+                + symbolProvider.toMemberName(memberShape);
+        writer
+                .write("")
+                .openBlock("def to_s")
+                .write("\"#<$L [SENSITIVE]>\"", fullQualifiedShapeName)
+                .closeBlock("end");
     }
 
     private class UnionToHValueRbsVisitor extends ShapeVisitor.Default<String> {