upfluence-thrift 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481691bbd3c9c8992c7f545a9abe7cc0107e20e40eab8440571b9c5d6c56755b
-  data.tar.gz: 2221fd56c4c25e33cdd4828462db6313f685c794307a13b59cb83342b2a62ef1
+  metadata.gz: eb0c6edc7181a95e78d4f3d1da97bf55cff534a6c4f3784c998bbefa1fc0df1c
+  data.tar.gz: c225382fb7a4bc1a0c4896f74a970c669eaf7cac96414b6c7e1be3d1dc7e66e5
 SHA512:
-  metadata.gz: faf079e2e92bc4b3b7b9975d18e4f49259341e541e6805fed6951a2fd3ed9205c6bd9a9574e5c6ff2b610eef6aebdd97718da2dc4c009f9a372227d306546a5e
-  data.tar.gz: a964e13eb46f9c85fd945e25c562426bdb83ee2cb2f1378432fe777a530247476050e6ac2d01ae99e1d0ecbb4ad9f9bd1b2fbcfcf80ea3db443d9cf030db209f
+  metadata.gz: 9bfbd290bda69a9ca7102791fd2291e35902691598be71d1a1429dd16329ef9dad76a38d363e76098ee2b88af7ce8df93927b0f0458f41b93b8e4ec133b227b7
+  data.tar.gz: ffbb8d16a28268f9cb6cc82fa089e9bb06f96aefb3097077923478e4547fbc5cec43b2b640e0a790434e5ed41422236405c75bb835c5e2ac7735352e0dae182b

data/lib/thrift/client.rb

@@ -20,17 +20,9 @@
 
 module Thrift
   module Client
-    def initialize(iprot, middlewares = [], oprot = nil)
+    def initialize(iprot, oprot = nil)
       @iprot = iprot
       @oprot = oprot || iprot
-      @middleware = case middlewares.length
-                    when 0
-                      Middleware::NOP_MIDDLEWARE
-                    when 1
-                      middlewares.first
-                    else
-                      Middleware::MultiMiddleware.new(middlewares)
-                    end
       @seqid = 0
     end
 
@@ -48,9 +40,15 @@ module Thrift
 
     def send_message_args(args_class, args)
       data = args_class.new
+
       args.each do |k, v|
         data.send("#{k.to_s}=", v)
       end
+
+      send_message_instance(data)
+    end
+
+    def send_message_instance(data)
       begin
         data.write(@oprot)
       rescue StandardError => e
@@ -95,4 +93,27 @@ module Thrift
       raise x
     end
   end
+
+  class BaseClient
+    include Client
+
+    def call_unary(name, req)
+      @oprot.write_message_begin(name, Thrift::MessageTypes::ONEWAY, @seqid)
+      send_message_instance(req)
+    end
+
+    def call_binary(name, req, resp_klass)
+      @oprot.write_message_begin(name, Thrift::MessageTypes::CALL, @seqid)
+      send_message_instance(req)
+      receive_message(resp_klass)
+    end
+  end
+
+  class << self
+    def build_client(input)
+      return BaseClient.new(input) if input.is_a? BaseProtocol
+
+      input
+    end
+  end
 end

data/lib/thrift/definition.rb

@@ -1,24 +1,64 @@
 module Thrift
   class StructDefinition
-    attr_reader :namespace, :name, :klass
+    attr_reader :klass
+
     def initialize(klass)
-      @namespace = klass::NAMESPACE
-      @name = klass::NAME
       @klass = klass
     end
 
+    def namespace
+      @klass::NAMESPACE
+    end
+
+    def name
+      @klass::NAME
+    end
+
     def struct_type
-      "#{@namespace}.#{@name}"
+      "#{namespace}.#{name}"
+    end
+  end
+
+  class ServiceDefinition < StructDefinition
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def client_class
+      @klass::Client
+    end
+
+    def processor_class
+      @klass::Processor
+    end
+
+    def namespace
+      @klass::NAMESPACE
+    end
+
+    def service
+      @klass::SERVICE
+    end
+
+    def service_type
+      "#{namespace}.#{service}"
     end
   end
 
   STRUCT_DEFINITIONS = {}
+  SERVICE_DEFINITIONS = {}
 
   class << self
-
     def register_struct_type(klass)
       definition = StructDefinition.new(klass)
       STRUCT_DEFINITIONS[definition.struct_type] = definition
     end
+
+    def register_service_type(klass)
+      definition = ServiceDefinition.new(klass)
+      SERVICE_DEFINITIONS[definition.service_type] = definition
+    end
   end
 end

data/lib/thrift/middleware.rb

@@ -33,5 +33,18 @@ module Thrift
     end
 
     NOP_MIDDLEWARE = NopMiddleware.new
+
+    class << self
+      def wrap(middlewares)
+        case middlewares.length
+        when 0
+          NOP_MIDDLEWARE
+        when 1
+          middlewares.first
+        else
+          MultiMiddleware.new(middlewares)
+        end
+      end
+    end
   end
 end

data/lib/thrift/processor.rb

@@ -21,14 +21,7 @@ module Thrift
   module Processor
     def initialize(handler, middlewares = [])
       @handler = handler
-      @middleware = case middlewares.length
-                    when 0
-                      Middleware::NOP_MIDDLEWARE
-                    when 1
-                      middlewares.first
-                    else
-                      Middleware::MultiMiddleware.new(middlewares)
-                    end
+      @middleware = Middleware.wrap(middlewares)
     end
 
     def process(iprot, oprot)
@@ -46,7 +39,7 @@ module Thrift
         write_exception(
           ApplicationException.new(
             ApplicationException::UNKNOWN_METHOD,
-            'Unknown function '+name,
+            'Unknown function ' + name,
           ),
           oprot,
           name,

data/lib/thrift/struct.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,16 +6,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'set'
 
@@ -24,15 +24,15 @@ module Thrift
     def initialize(d={}, &block)
       # get a copy of the default values to work on, removing defaults in favor of arguments
       fields_with_defaults = fields_with_default_values.dup
-      
-      # check if the defaults is empty, or if there are no parameters for this 
+
+      # check if the defaults is empty, or if there are no parameters for this
       # instantiation, and if so, don't bother overriding defaults.
       unless fields_with_defaults.empty? || d.empty?
         d.each_key do |name|
           fields_with_defaults.delete(name.to_s)
         end
       end
-      
+
       # assign all the user-specified arguments
       unless d.empty?
         d.each do |name, value|
@@ -43,14 +43,14 @@ module Thrift
           instance_variable_set("@#{name}", value)
         end
       end
-      
+
       # assign all the default values
       unless fields_with_defaults.empty?
         fields_with_defaults.each do |name, default_value|
           instance_variable_set("@#{name}", (default_value.dup rescue default_value))
         end
       end
-      
+
       yield self if block_given?
     end
 
@@ -67,7 +67,7 @@ module Thrift
       end
       fields_with_default_values
     end
-    
+
     def inspect(skip_optional_nulls = true)
       fields = []
       each_field do |fid, field_info|

data/lib/thrift/transport/server_socket.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'socket'
 
@@ -37,7 +37,7 @@ module Thrift
     attr_reader :handle
 
     def listen
-      @handle = TCPServer.new(@host, @port)
+      @handle ||= TCPServer.new(@host, @port)
     end
 
     def accept
@@ -60,4 +60,4 @@ module Thrift
 
     alias to_io handle
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-thrift
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: statsd-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ruby bindings for the Apache Thrift RPC system
 email:
 - dev@thrift.apache.org
@@ -183,9 +169,6 @@ files:
 - benchmark/Benchmark.thrift
 - benchmark/benchmark.rb
 - benchmark/client.rb
-- benchmark/gen-rb/benchmark_constants.rb
-- benchmark/gen-rb/benchmark_service.rb
-- benchmark/gen-rb/benchmark_types.rb
 - benchmark/server.rb
 - benchmark/thin_server.rb
 - ext/binary_protocol_accelerated.c
@@ -265,25 +248,6 @@ files:
 - spec/compact_protocol_spec.rb
 - spec/exception_spec.rb
 - spec/flat_spec.rb
-- spec/gen-rb/base/base_service.rb
-- spec/gen-rb/base/base_service_constants.rb
-- spec/gen-rb/base/base_service_types.rb
-- spec/gen-rb/extended/extended_service.rb
-- spec/gen-rb/extended/extended_service_constants.rb
-- spec/gen-rb/extended/extended_service_types.rb
-- spec/gen-rb/flat/namespaced_nonblocking_service.rb
-- spec/gen-rb/flat/referenced_constants.rb
-- spec/gen-rb/flat/referenced_types.rb
-- spec/gen-rb/flat/thrift_namespaced_spec_constants.rb
-- spec/gen-rb/flat/thrift_namespaced_spec_types.rb
-- spec/gen-rb/namespaced_spec_namespace/namespaced_nonblocking_service.rb
-- spec/gen-rb/namespaced_spec_namespace/thrift_namespaced_spec_constants.rb
-- spec/gen-rb/namespaced_spec_namespace/thrift_namespaced_spec_types.rb
-- spec/gen-rb/nonblocking_service.rb
-- spec/gen-rb/other_namespace/referenced_constants.rb
-- spec/gen-rb/other_namespace/referenced_types.rb
-- spec/gen-rb/thrift_spec_constants.rb
-- spec/gen-rb/thrift_spec_types.rb
 - spec/http_client_spec.rb
 - spec/json_protocol_spec.rb
 - spec/namespaced_spec.rb
@@ -302,13 +266,6 @@ files:
 - spec/types_spec.rb
 - spec/union_spec.rb
 - spec/unix_socket_spec.rb
-- test/debug_proto/gen-rb/debug_proto_test_constants.rb
-- test/debug_proto/gen-rb/debug_proto_test_types.rb
-- test/debug_proto/gen-rb/empty_service.rb
-- test/debug_proto/gen-rb/inherited.rb
-- test/debug_proto/gen-rb/reverse_order_service.rb
-- test/debug_proto/gen-rb/service_for_exception_with_a_map.rb
-- test/debug_proto/gen-rb/srv.rb
 homepage: http://thrift.apache.org
 licenses:
 - Apache 2.0
@@ -340,13 +297,6 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for Apache Thrift
 test_files:
-- test/debug_proto/gen-rb/debug_proto_test_constants.rb
-- test/debug_proto/gen-rb/debug_proto_test_types.rb
-- test/debug_proto/gen-rb/service_for_exception_with_a_map.rb
-- test/debug_proto/gen-rb/inherited.rb
-- test/debug_proto/gen-rb/reverse_order_service.rb
-- test/debug_proto/gen-rb/empty_service.rb
-- test/debug_proto/gen-rb/srv.rb
 - spec/ThriftSpec.thrift
 - spec/struct_nested_containers_spec.rb
 - spec/http_client_spec.rb
@@ -368,25 +318,6 @@ test_files:
 - spec/unix_socket_spec.rb
 - spec/ExtendedService.thrift
 - spec/types_spec.rb
-- spec/gen-rb/flat/thrift_namespaced_spec_constants.rb
-- spec/gen-rb/flat/namespaced_nonblocking_service.rb
-- spec/gen-rb/flat/referenced_constants.rb
-- spec/gen-rb/flat/referenced_types.rb
-- spec/gen-rb/flat/thrift_namespaced_spec_types.rb
-- spec/gen-rb/other_namespace/referenced_constants.rb
-- spec/gen-rb/other_namespace/referenced_types.rb
-- spec/gen-rb/extended/extended_service.rb
-- spec/gen-rb/extended/extended_service_types.rb
-- spec/gen-rb/extended/extended_service_constants.rb
-- spec/gen-rb/thrift_spec_constants.rb
-- spec/gen-rb/nonblocking_service.rb
-- spec/gen-rb/thrift_spec_types.rb
-- spec/gen-rb/namespaced_spec_namespace/thrift_namespaced_spec_constants.rb
-- spec/gen-rb/namespaced_spec_namespace/namespaced_nonblocking_service.rb
-- spec/gen-rb/namespaced_spec_namespace/thrift_namespaced_spec_types.rb
-- spec/gen-rb/base/base_service.rb
-- spec/gen-rb/base/base_service_constants.rb
-- spec/gen-rb/base/base_service_types.rb
 - spec/exception_spec.rb
 - spec/ThriftNamespacedSpec.thrift
 - spec/struct_spec.rb
@@ -400,9 +331,6 @@ test_files:
 - spec/base_transport_spec.rb
 - spec/nonblocking_server_spec.rb
 - benchmark/Benchmark.thrift
-- benchmark/gen-rb/benchmark_service.rb
-- benchmark/gen-rb/benchmark_constants.rb
-- benchmark/gen-rb/benchmark_types.rb
 - benchmark/client.rb
 - benchmark/benchmark.rb
 - benchmark/thin_server.rb

data/benchmark/gen-rb/benchmark_constants.rb

@@ -1,11 +0,0 @@
-#
-# Autogenerated by Thrift Compiler (2.0.1-upfluence)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-
-require 'thrift'
-require 'benchmark_types'
-
-module ThriftBenchmark
-end

data/benchmark/gen-rb/benchmark_service.rb

@@ -1,91 +0,0 @@
-#
-# Autogenerated by Thrift Compiler (2.0.1-upfluence)
-#
-# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
-#
-
-require 'thrift'
-require 'benchmark_types'
-
-module ThriftBenchmark
-  module BenchmarkService
-    SERVICE_NAME = "BenchmarkService"
-    PROGRAM_NAME = ""
-
-    class Client
-      include ::Thrift::Client
-
-      def self.from_provider(provider)
-        Client.new(*provider.build(", BenchmarkService"))
-      end
-
-      def fibonacci(ctx, n)
-        @middleware.handle_binary(ctx, 'fibonacci', Fibonacci_args.new(:n => n)) do |ctx, args|
-          send_fibonacci(ctx, args.n)
-          return recv_fibonacci(ctx)
-        end
-      end
-
-      def send_fibonacci(ctx, n)
-        send_message('fibonacci', Fibonacci_args, :n => n)
-      end
-
-      def recv_fibonacci(ctx)
-        result = receive_message(Fibonacci_result)
-        return result.success unless result.success.nil?
-        raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fibonacci failed: unknown result')
-      end
-
-    end
-
-    class Processor
-      include ::Thrift::Processor
-
-      def process_fibonacci(ctx, seqid, iprot, oprot)
-        args = read_args(iprot, Fibonacci_args)
-        @middleware.handle_binary(ctx, 'fibonacci', args) do |ctx, args|
-          result = Fibonacci_result.new()
-          result.success = @handler.fibonacci(ctx, args.n)
-          write_result(result, oprot, 'fibonacci', seqid)
-        end
-      end
-
-    end
-
-    # HELPER FUNCTIONS AND STRUCTURES
-
-    class Fibonacci_args
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      N = 1
-
-      FIELDS = {
-        N => {:type => ::Thrift::Types::BYTE, :name => 'n'}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-    class Fibonacci_result
-      include ::Thrift::Struct, ::Thrift::Struct_Union
-      SUCCESS = 0
-
-      FIELDS = {
-        SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'}
-      }
-
-      def struct_fields; FIELDS; end
-
-      def validate
-      end
-
-      ::Thrift::Struct.generate_accessors self
-    end
-
-  end
-
-end