Enforce Ruby whitespace layout rules

Client: rb

Co-Authored-By: OpenAI Codex (GPT-5.6) <codex@openai.com>

Author: kpumuk

compiler/cpp/src/thrift/generate/t_rb_generator.cc

@@ -606,7 +606,7 @@ void t_rb_generator::generate_rb_struct(t_rb_ofstream& out,
   out << '\n';
 
   out.indent_up();
-  out.indent() << "include ::Thrift::Struct, ::Thrift::Struct_Union" << '\n';
+  out.indent() << "include ::Thrift::Struct, ::Thrift::Struct_Union" << '\n' << '\n';
 
   if (is_exception) {
     generate_rb_simple_exception_constructor(out, tstruct);
@@ -635,7 +635,7 @@ void t_rb_generator::generate_rb_union(t_rb_ofstream& out,
   out.indent() << "class " << type_name(tstruct) << " < ::Thrift::Union" << '\n';
 
   out.indent_up();
-  out.indent() << "include ::Thrift::Struct_Union" << '\n';
+  out.indent() << "include ::Thrift::Struct_Union" << '\n' << '\n';
 
   generate_field_constructors(out, tstruct);
 
@@ -708,7 +708,9 @@ void t_rb_generator::generate_field_constants(t_rb_ofstream& out, t_struct* tstr
 
     out.indent() << field_id_constant_name(field_name) << " = " << (*f_iter)->get_key() << '\n';
   }
-  out << '\n';
+  if (!fields.empty()) {
+    out << '\n';
+  }
 }
 
 void t_rb_generator::generate_field_defns(t_rb_ofstream& out, t_struct* tstruct) {
@@ -975,11 +977,14 @@ void t_rb_generator::generate_service_client(t_service* tservice) {
   f_service_.indent() << "class Client" << extends_client << '\n';
   f_service_.indent_up();
 
-  f_service_.indent() << "include ::Thrift::Client" << '\n' << '\n';
-
   // Generate client method implementations
   vector<t_function*> functions = tservice->get_functions();
   vector<t_function*>::const_iterator f_iter;
+  f_service_.indent() << "include ::Thrift::Client" << '\n';
+  if (!functions.empty()) {
+    f_service_ << '\n';
+  }
+
   for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
     t_struct* arg_struct = (*f_iter)->get_arglist();
     const vector<t_field*>& fields = arg_struct->get_members();
@@ -1080,7 +1085,11 @@ void t_rb_generator::generate_service_client(t_service* tservice) {
 
       // Close function
       f_service_.indent_down();
-      f_service_.indent() << "end" << '\n' << '\n';
+      f_service_.indent() << "end" << '\n';
+    }
+
+    if (f_iter + 1 != functions.end()) {
+      f_service_ << '\n';
     }
   }
 
@@ -1110,11 +1119,17 @@ void t_rb_generator::generate_service_server(t_service* tservice) {
   f_service_.indent() << "class Processor" << extends_processor << '\n';
   f_service_.indent_up();
 
-  f_service_.indent() << "include ::Thrift::Processor" << '\n' << '\n';
+  f_service_.indent() << "include ::Thrift::Processor" << '\n';
+  if (!functions.empty()) {
+    f_service_ << '\n';
+  }
 
   // Generate the process subfunctions
   for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
     generate_process_function(tservice, *f_iter);
+    if (f_iter + 1 != functions.end()) {
+      f_service_ << '\n';
+    }
   }
 
   f_service_.indent_down();
@@ -1193,7 +1208,7 @@ void t_rb_generator::generate_process_function(t_service* tservice, t_function*
   if (tfunction->is_oneway()) {
     f_service_.indent() << "return" << '\n';
     f_service_.indent_down();
-    f_service_.indent() << "end" << '\n' << '\n';
+    f_service_.indent() << "end" << '\n';
     return;
   }
 
@@ -1202,7 +1217,7 @@ void t_rb_generator::generate_process_function(t_service* tservice, t_function*
 
   // Close function
   f_service_.indent_down();
-  f_service_.indent() << "end" << '\n' << '\n';
+  f_service_.indent() << "end" << '\n';
 }
 
 /**

compiler/cpp/tests/rb/t_rb_generator_functional_tests.cc

@@ -99,10 +99,12 @@ TEST_CASE("t_rb_generator uses suffixed field id constants to avoid FIELDS colli
     std::remove(thrift_path.c_str());
 }
 
-TEST_CASE("t_rb_generator emits service arguments as a positional hash", "[functional]")
+TEST_CASE("t_rb_generator formats service classes and positional arguments", "[functional]")
 {
     const string thrift_path = "test_service_arguments.thrift";
     const string thrift_source =
+        "service EmptyService {\n"
+        "}\n"
         "service PingService {\n"
         "  oneway void ping(1: i32 n)\n"
         "}\n";
@@ -123,7 +125,18 @@ TEST_CASE("t_rb_generator emits service arguments as a positional hash", "[funct
     REQUIRE_NOTHROW(gen->generate_program());
 
     const string service = read_file("gen-rb/ping_service.rb");
+    const string expected_empty_result =
+        "  class Ping_result\n"
+        "    include ::Thrift::Struct, ::Thrift::Struct_Union\n"
+        "\n"
+        "    FIELDS";
     REQUIRE(service.find("send_oneway_message(\"ping\", Ping_args, {n: n})") != string::npos);
+    REQUIRE(service.find(expected_empty_result) != string::npos);
+    REQUIRE(service.find("\n\n  end\n") == string::npos);
+
+    const string empty_service = read_file("gen-rb/empty_service.rb");
+    REQUIRE(!empty_service.empty());
+    REQUIRE(empty_service.find("\n\n  end\n") == string::npos);
 
     std::remove(thrift_path.c_str());
 }
@@ -135,6 +148,9 @@ TEST_CASE("t_rb_generator formats multiline Ruby literals, calls, and field meta
         "struct Item {\n"
         "  1: string value\n"
         "}\n"
+        "union Choice {\n"
+        "  1: string value\n"
+        "}\n"
         "const Item ITEM = {\"value\": \"one\"}\n"
         "const set<i32> IDS = [1, 2]\n"
         "struct Defaults {\n"
@@ -157,14 +173,39 @@ TEST_CASE("t_rb_generator formats multiline Ruby literals, calls, and field meta
     REQUIRE_NOTHROW(gen->generate_program());
 
     const string constants = read_file("gen-rb/test_multiline_layout_constants.rb");
-    REQUIRE(constants.find("ITEM = ::Item.new({\n  %q\"value\" => %q\"one\",\n})")
-            != string::npos);
-    REQUIRE(constants.find("IDS = Set.new([\n  1,\n  2,\n])") != string::npos);
+    const string expected_item_constant =
+        "ITEM = ::Item.new({\n"
+        "  %q\"value\" => %q\"one\",\n"
+        "})";
+    const string expected_set_constant =
+        "IDS = Set.new([\n"
+        "  1,\n"
+        "  2,\n"
+        "])";
+    REQUIRE(constants.find(expected_item_constant) != string::npos);
+    REQUIRE(constants.find(expected_set_constant) != string::npos);
 
     const string types = read_file("gen-rb/test_multiline_layout_types.rb");
-    REQUIRE(types.find("VALUES_FIELD_ID => {\n      type: ::Thrift::Types::LIST,\n")
-            != string::npos);
-    REQUIRE(types.find("default: [\n        1,\n        2,\n      ],\n") != string::npos);
+    const string expected_struct =
+        "class Item\n"
+        "  include ::Thrift::Struct, ::Thrift::Struct_Union\n"
+        "\n";
+    const string expected_union =
+        "class Choice < ::Thrift::Union\n"
+        "  include ::Thrift::Struct_Union\n"
+        "\n";
+    const string expected_field_metadata =
+        "    VALUES_FIELD_ID => {\n"
+        "      type: ::Thrift::Types::LIST,\n";
+    const string expected_default =
+        "      default: [\n"
+        "        1,\n"
+        "        2,\n"
+        "      ],\n";
+    REQUIRE(types.find(expected_struct) != string::npos);
+    REQUIRE(types.find(expected_union) != string::npos);
+    REQUIRE(types.find(expected_field_metadata) != string::npos);
+    REQUIRE(types.find(expected_default) != string::npos);
 
     std::remove(thrift_path.c_str());
 }

lib/rb/.rubocop.yml

@@ -15,6 +15,10 @@ Layout/ArgumentAlignment:
 Layout/ArrayAlignment:
   Enabled: true
 
+Layout/BeginEndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: start_of_line
+
 Layout/BlockAlignment:
   Enabled: true
   EnforcedStyleAlignWith: start_of_block
@@ -29,12 +33,42 @@ Layout/ClosingParenthesisIndentation:
 Layout/CommentIndentation:
   Enabled: true
 
+Layout/EmptyLineBetweenDefs:
+  Enabled: true
+
 Layout/EmptyLines:
   Enabled: true
 
+Layout/EmptyLinesAfterModuleInclusion:
+  Enabled: true
+
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+
+Layout/EmptyLinesAroundArguments:
+  Enabled: true
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/EmptyLinesAroundBeginBody:
+  Enabled: true
+
 Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: true
+
+Layout/EmptyLinesAroundMethodBody:
+  Enabled: true
+
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: true
+
 Layout/ElseAlignment:
   Enabled: true
 
@@ -97,6 +131,9 @@ Layout/MultilineMethodCallBraceLayout:
   Enabled: true
   EnforcedStyle: symmetrical
 
+Layout/RescueEnsureAlignment:
+  Enabled: true
+
 Layout/SpaceAfterComma:
   Enabled: true
 
@@ -106,6 +143,9 @@ Layout/SpaceAroundKeyword:
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
 Layout/SpaceBeforeComma:
   Enabled: true
 

lib/rb/ext/extconf.rb

@@ -19,7 +19,7 @@
 #
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-  File.open("Makefile", "w"){ |f| f.puts "all:\n\ninstall:\n" }
+  File.open("Makefile", "w") { |f| f.puts "all:\n\ninstall:\n" }
 else
   require "mkmf"
 

lib/rb/lib/thrift/exceptions.rb

@@ -31,7 +31,6 @@ def initialize(message)
   end
 
   class ApplicationException < Exception
-
     UNKNOWN = 0
     UNKNOWN_METHOD = 1
     INVALID_MESSAGE_TYPE = 2
@@ -87,6 +86,5 @@ def write(oprot, remaining_depth = DEFAULT_RECURSION_DEPTH)
       oprot.write_field_stop
       oprot.write_struct_end
     end
-
   end
 end

lib/rb/lib/thrift/multiplexed_processor.rb

@@ -71,7 +71,6 @@ def check_default_processor(name)
   end
 
   class StoredMessageProtocol < BaseProtocol
-
     include ProtocolDecorator
 
     def initialize(protocol, message_begin)

lib/rb/lib/thrift/protocol/base_protocol.rb

@@ -24,7 +24,6 @@
 
 module Thrift
   class ProtocolException < Exception
-
     UNKNOWN = 0
     INVALID_DATA = 1
     NEGATIVE_SIZE = 2
@@ -42,7 +41,6 @@ def initialize(type = UNKNOWN, message = nil)
   end
 
   class BaseProtocol
-
     MAX_CONTAINER_SIZE = (1 << 31) - 1
 
     attr_reader :trans

lib/rb/lib/thrift/protocol/compact_protocol.rb

@@ -20,7 +20,6 @@
 
 module Thrift
   class CompactProtocol < BaseProtocol
-
     PROTOCOL_ID = [0x82].pack("c").unpack("c").first
     VERSION = 1
     VERSION_MASK = 0x1f

lib/rb/lib/thrift/protocol/json_protocol.rb

@@ -111,7 +111,6 @@ def escapeNum
 
   # Context class for lists
   class JSONListContext < JSONContext
-
     def initialize
       @first = true
     end
@@ -134,7 +133,6 @@ def read(reader)
   end
 
   class JsonProtocol < BaseProtocol
-
     @@kJSONObjectStart = "{"
     @@kJSONObjectEnd = "}"
     @@kJSONArrayStart = "["

lib/rb/lib/thrift/protocol/multiplexed_protocol.rb

@@ -21,7 +21,6 @@
 
 module Thrift
   class MultiplexedProtocol < BaseProtocol
-
     include ProtocolDecorator
 
     def initialize(protocol, service_name)