lib/rb: Handle the PreviouslyKnownAs annotation seamlessly

compiler/cpp/src/generate/t_rb_generator.cc

@@ -134,7 +134,8 @@ class t_rb_generator : public t_oop_generator {
                            t_type* field_type,
                            const std::string& field_name,
                            t_const_value* field_value,
-                           bool optional);
+                           bool optional,
+                           bool embed_annotations);
 
   /**
    * Service-level generation functions
@@ -747,7 +748,8 @@ void t_rb_generator::generate_field_defns(t_rb_ofstream& out, t_struct* tstruct)
                         (*f_iter)->get_type(),
                         (*f_iter)->get_name(),
                         (*f_iter)->get_value(),
-                        (*f_iter)->get_req() == t_field::T_OPTIONAL);
+                        (*f_iter)->get_req() == t_field::T_OPTIONAL,
+                        true);
   }
   out.indent_down();
   out << endl;
@@ -760,7 +762,8 @@ void t_rb_generator::generate_field_data(t_rb_ofstream& out,
                                          t_type* field_type,
                                          const std::string& field_name = "",
                                          t_const_value* field_value = NULL,
-                                         bool optional = false) {
+                                         bool optional = false,
+                                         bool embed_annotations = false) {
   field_type = get_true_type(field_type);
 
   // Begin this field's defn
@@ -804,8 +807,10 @@ void t_rb_generator::generate_field_data(t_rb_ofstream& out,
     out << ", enum_class: " << full_type_name(field_type);
   }
 
-  out << ", legacy_annotations: THRIFT_FIELD_" << upcase_string(field_name)  << "_LEGACY_ANNOTATIONS";
-  out << ", structured_annotations: THRIFT_FIELD_" << upcase_string(field_name)  << "_STRUCTURED_ANNOTATIONS";
+  if (embed_annotations) {
+    out << ", legacy_annotations: THRIFT_FIELD_" << upcase_string(field_name)  << "_LEGACY_ANNOTATIONS";
+    out << ", structured_annotations: THRIFT_FIELD_" << upcase_string(field_name)  << "_STRUCTURED_ANNOTATIONS";
+  }
 
   // End of this field's defn
   out << "}";

lib/rb/lib/thrift/definition.rb

@@ -1,4 +1,12 @@
 module Thrift
+  class DefaultCanonicalNameExtractor
+    class << self
+      def extract(definition)
+        [definition.struct_type]
+      end
+    end
+  end
+
   class StructDefinition
     attr_reader :klass
 
@@ -25,6 +33,12 @@ def name
     def struct_type
       "#{namespace}.#{name}"
     end
+
+    def canonical_names
+      CANONICAL_NAME_EXTRACTORS.reduce([]) do |acc, cur|
+        acc + cur.extract(self)
+      end
+    end
   end
 
   class ServiceDefinition < StructDefinition
@@ -51,6 +65,7 @@ def service_type
 
   STRUCT_DEFINITIONS = {}
   SERVICE_DEFINITIONS = {}
+  CANONICAL_NAME_EXTRACTORS = [DefaultCanonicalNameExtractor]
 
   class << self
     def register_struct_type(klass)
@@ -62,5 +77,9 @@ def register_service_type(klass)
       definition = ServiceDefinition.new(klass)
       SERVICE_DEFINITIONS[definition.service_type] = definition
     end
+
+    def register_canonical_name_extractor(klass)
+      CANONICAL_NAME_EXTRACTORS << klass
+    end
   end
 end