Merge pull request #15 from upfluence/tg/processor-inherited-methods

Fix ruby inherited methods

Author: tgallice

lib/rb/lib/thrift/processor.rb

@@ -92,13 +92,14 @@ def initialize(handler, middlewares = [], logger=nil)
       end
       @middleware = Middleware.wrap(middlewares)
 
-      @processors = if self.class.const_defined? :METHODS
-                      self.class::METHODS.reduce({}) do |acc, (name, info)|
-                        acc.merge(name => build_processor(name, info))
-                      end
-                    else
-                      {}
-                    end
+      # Walk ancestors child first so inherited methods are exposed and overrides win.
+      @processors = self.class.ancestors.each_with_object({}) do |klass, acc|
+        next unless klass.const_defined?(:METHODS, false)
+
+        klass::METHODS.each do |name, info|
+          acc[name] ||= build_processor(name, info)
+        end
+      end
     end
 
     def read_args(iprot, args_class)

lib/rb/spec/processor_spec.rb

@@ -77,6 +77,20 @@ class CurrentProcessor
         result_klass: EmptyResult,
         args:         [],
         exceptions:   {},
+        void_result:  true,
+        oneway:       false
+      }
+    }.freeze
+  end
+
+  class ExtendedProcessor < CurrentProcessor
+    METHODS = {
+      'pong' => {
+        args_klass:   EmptyArgs,
+        result_klass: EmptyResult,
+        args:         [],
+        exceptions:   {},
+        void_result:  true,
         oneway:       false
       }
     }.freeze
@@ -179,6 +193,25 @@ def read_exception(protocol)
     )
   end
 
+  %w[ping pong].each do |name|
+    it "processes #{name} with a processor extending another service" do
+      handler = double('handler', ping: nil, pong: nil)
+      processor = ExtendedProcessor.new(handler)
+      oprot, trans = output_protocol
+
+      expect(processor.process(request_protocol(name), oprot)).to eq(true)
+      expect(oprot.read_message_begin).to eq(
+        [name, Thrift::MessageTypes::REPLY, 17]
+      )
+
+      EmptyResult.new.read(oprot)
+      oprot.read_message_end
+
+      expect(trans.available).to eq(0)
+      expect(handler).to have_received(name)
+    end
+  end
+
   it 'writes internal errors raised by a current processor' do
     handler = double('handler')
     allow(handler).to receive(:ping).and_raise(StandardError, 'boom')