compiler/cpp/src/generate/t_rb_generator: Embed the annotations in the struct and service definitions

Author: AlexisMontagne

compiler/cpp/src/generate/t_rb_generator.cc

@@ -184,6 +184,8 @@ class t_rb_generator : public t_oop_generator {
 
   void generate_rdoc(t_rb_ofstream& out, t_doc* tdoc);
 
+  void generate_rb_annotations(t_rb_ofstream& out, t_annotated* tannotated, std::string key_prefix);
+
   /**
    * Helper rendering functions
    */
@@ -596,6 +598,7 @@ void t_rb_generator::generate_rb_struct(t_rb_ofstream& out,
   out.indent() << "NAME = '" << tstruct->get_name() << "'.freeze" << endl;
   out.indent() << "NAMESPACE = '" << tstruct->get_program()->get_namespace("*") << "'.freeze" << endl << endl;
 
+  generate_rb_annotations(out, tstruct, "");
   generate_field_constants(out, tstruct);
   generate_field_defns(out, tstruct);
   generate_rb_struct_required_validator(out, tstruct);
@@ -607,6 +610,28 @@ void t_rb_generator::generate_rb_struct(t_rb_ofstream& out,
   out.indent() << "end" << endl << endl;
 }
 
+
+void t_rb_generator::generate_rb_annotations(t_rb_ofstream& out,
+                                       t_annotated* tannotated,
+                                       std::string key_prefix) {
+  out.indent() << key_prefix << "LEGACY_ANNOTATIONS = {" << endl;
+  out.indent_up();
+  const map<string, string>& annotations = tannotated->legacy_annotations();
+  for (map<string, string>::const_iterator ns_it = annotations.begin(); ns_it != annotations.end(); ++ns_it) {
+    out << indent() << "%q\"" << escape_string(ns_it->first) << "\" => %q\"" << escape_string(ns_it->second)<< "\"," << endl;
+  }
+  out.indent_down();
+  out.indent() << "}.freeze" << endl << endl;
+
+  out.indent() << key_prefix << "STRUCTURED_ANNOTATIONS = [" << endl;
+  out.indent_up();
+  vector<t_structured_annotation*> sannotations = tannotated->structured_annotations();
+  for (vector<t_structured_annotation*>::const_iterator it = sannotations.begin(); it != sannotations.end(); it++) {
+    render_const_value(out.indent(), (*it)->type_, (*it)->value_) << "," << endl;
+  }
+  out.indent_down();
+  out.indent() << "].freeze" << endl << endl;
+}
 /**
  * Generates a ruby union
  */
@@ -623,8 +648,8 @@ void t_rb_generator::generate_rb_union(t_rb_ofstream& out,
   out.indent() << "NAME = '" << tstruct->get_name() << "'.freeze" << endl;
   out.indent() << "NAMESPACE = '" << tstruct->get_program()->get_namespace("*") << "'.freeze" << endl << endl;
 
+  generate_rb_annotations(out, tstruct, "");
   generate_field_constructors(out, tstruct);
-
   generate_field_constants(out, tstruct);
   generate_field_defns(out, tstruct);
   generate_rb_union_validator(out, tstruct);
@@ -702,6 +727,10 @@ void t_rb_generator::generate_field_defns(t_rb_ofstream& out, t_struct* tstruct)
   const vector<t_field*>& fields = tstruct->get_members();
   vector<t_field*>::const_iterator f_iter;
 
+  for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+    generate_rb_annotations(out, *f_iter, "THRIFT_FIELD_" + upcase_string((*f_iter)->get_name())  + "_");
+  }
+
   out.indent() << "FIELDS = {" << endl;
   out.indent_up();
   for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
@@ -775,6 +804,9 @@ 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";
+
   // End of this field's defn
   out << "}";
 }
@@ -826,6 +858,7 @@ void t_rb_generator::generate_service(t_service* tservice) {
   f_service_.indent() << "NAMESPACE = '" << tservice->get_program()->get_namespace("*") << "'.freeze" << endl << endl;
 
   // Generate the three main parts of the service (well, two for now in PHP)
+  generate_rb_annotations(f_service_, tservice, "");
   generate_service_helpers(tservice);
   generate_service_client(tservice);
   generate_service_server(tservice);
@@ -1019,11 +1052,15 @@ void t_rb_generator::generate_service_server(t_service* tservice) {
   f_service_.indent_down();
   f_service_.indent() << "end" << endl << endl;
 
+  for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+    generate_rb_annotations(f_service_, *f_iter, "THRIFT_METHOD_" + upcase_string((*f_iter)->get_name())  + "_");
+  }
+
   f_service_.indent() << "METHODS = {" << endl;
   f_service_.indent_up();
 
   for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
-  f_service_.indent() << "'" << (*f_iter)->get_name() << "' => { args_klass: " << capitalize((*f_iter)->get_name()) << "_args, oneway: " << ((*f_iter)->is_oneway() ? "true" : "false") << "}," << endl;
+  f_service_.indent() << "'" << (*f_iter)->get_name() << "' => { args_klass: " << capitalize((*f_iter)->get_name()) << "_args, oneway: " << ((*f_iter)->is_oneway() ? "true" : "false") << ", legacy_annotations: THRIFT_METHOD_" << upcase_string((*f_iter)->get_name()) << "_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_" << upcase_string((*f_iter)->get_name()) << "_STRUCTURED_ANNOTATIONS}," << endl;
   }
 
   f_service_.indent_down();

lib/rb/lib/thrift/definition.rb

@@ -6,6 +6,14 @@ def initialize(klass)
       @klass = klass
     end
 
+    def structured_annotations
+      @klass::STRUCTURED_ANNOTATIONS
+    end
+
+    def legacy_annotations
+      @klass::LEGACY_ANNOTATIONS
+    end
+
     def namespace
       @klass::NAMESPACE
     end
@@ -20,12 +28,6 @@ def struct_type
   end
 
   class ServiceDefinition < StructDefinition
-    attr_reader :klass
-
-    def initialize(klass)
-      @klass = klass
-    end
-
     def client_class
       @klass::Client
     end
@@ -34,8 +36,8 @@ def processor_class
       @klass::Processor
     end
 
-    def namespace
-      @klass::NAMESPACE
+    def name
+      service
     end
 
     def service