lib/rb: Namespace properly the std libs

Author: AlexisMontagne

lib/rb/Makefile.am

@@ -42,8 +42,8 @@ TYPE_FILES = ../../types/*.thrift ../../types/*/*.thrift
 
 $(TYPE_FILES):
 	mkdir -p lib/thrift/$(patsubst ../../%,%,$(dir $@))
-	$(THRIFT) -gen rb:namespace_wrapper=thrift \
-		     --out lib/thrift/$(patsubst ../../%,%,$(dir $@)) $@
+	$(THRIFT) -gen rb:namespaced,namespace_wrapper=thrift \
+		     --out lib/ $@
 
 generate-types: $(TYPE_FILES)
 

lib/rb/lib/thrift.rb

@@ -68,3 +68,8 @@
 require 'thrift/server/thread_pool_server'
 
 require 'thrift/thrift_native'
+
+require 'thrift/types/known/any/any'
+require 'thrift/types/known/timestamp/timestamp'
+require 'thrift/types/known/duration/duration'
+require 'thrift/types/annotation/naming/naming'

lib/rb/lib/thrift/types/annotation/deprecation_constants.rb lib/rb/lib/thrift/types/annotation/deprecation/deprecation_constants.rb

@@ -0,0 +1,23 @@
+require 'thrift/types/annotation/naming/naming_types'
+
+module Thrift
+  module Types
+    module Annotation
+      module Naming
+        class CanonicalNameExtractor
+          class << self
+            def extract(definition)
+              definition.structured_annotations.select do |sa|
+                sa.is_a? PreviouslyKnownAs
+              end.map do |pka|
+                "#{pka.namespace_ || definition.namespace}.#{pka.name || definition.name}"
+              end
+            end
+          end
+
+          ::Thrift.register_canonical_name_extractor self
+        end
+      end
+    end
+  end
+end

lib/rb/lib/thrift/types/annotation/deprecation_types.rb lib/rb/lib/thrift/types/annotation/deprecation/deprecation_types.rb

@@ -1,4 +1,4 @@
-require 'thrift/types/known/any_types'
+require 'thrift/types/known/any/any_types'
 require 'json'
 require 'yaml'
 

lib/rb/lib/thrift/types/annotation/naming/naming.rb

@@ -1,4 +1,4 @@
-require 'thrift/types/known/duration_types'
+require 'thrift/types/known/duration/duration_types'
 
 module Thrift
   module Types

lib/rb/lib/thrift/types/annotation/naming_constants.rb lib/rb/lib/thrift/types/annotation/naming/naming_constants.rb

@@ -1,4 +1,4 @@
-require 'thrift/types/known/timestamp_types'
+require 'thrift/types/known/timestamp/timestamp_types'
 
 module Thrift
   module Types

lib/rb/lib/thrift/types/annotation/naming_types.rb lib/rb/lib/thrift/types/annotation/naming/naming_types.rb

@@ -1,4 +1,4 @@
-require 'thrift/types/value_types'
+require 'thrift/types/value/value_types'
 
 module Thrift
   module Types