upfluence-thrift 1.1.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86be9e073b58c320330f5ac9f55b33d9886939785ae72282dc54d1682060352a
-  data.tar.gz: 3f057f5442bc6e9faf3a35e276210ffd4789bf561f1e70a934cfbb747b8dfa29
+  metadata.gz: 65c3e787432bc70631ee206f1118e8da08d4c274d06c26fcc531ec2ebb03c26f
+  data.tar.gz: b906595d1faa44c761062d44baec1e4b4eb96cd5dfb0174ac4bbb68d5ff3d6f8
 SHA512:
-  metadata.gz: 477fa6678b03f067306dc38d4041a505963666a4575c25a81b3fa4796239e21cb7c473fbc16413b9e90b0c17ba8a539685429274f851167bb6af88d1f1313891
-  data.tar.gz: 5ae56c20604b78f69176f4b4e9b7ad8e7af0484f51b3ec1895220801c4bed08dcae3dc788b596479910d25e0ee3df884008d547d855da099e046b2184a0badae
+  metadata.gz: 6888cd0e99251cb5c67eb314620f00f449270e544b7593088c50fbedfcff06893595c167e13031502ed8134608c03fd6510eaa21c10945a5cb404c1e22fe72bc
+  data.tar.gz: 9df5b7919319e943cd76e8ed28a8c24111d859cbb895033357aacb5fc24930cad9bfcf1ab8fa540c405fd15eb7fe40023f4b0aca8d96dfb796f68f3fc780022b

data/ext/extconf.rb

@@ -23,10 +23,7 @@ else
   require 'mkmf'
   require 'rbconfig'
 
-  $ARCH_FLAGS = RbConfig::CONFIG['CFLAGS'].scan( /(-arch )(\S+)/ ).map{|x,y| x + y + ' ' }.join('')
-
-
-  $CFLAGS = "-fsigned-char -g -O2 -Wall -Werror " + $ARCH_FLAGS
+  $CFLAGS += " -fsigned-char"
 
   have_func("strlcpy", "string.h")
 

data/lib/thrift/client.rb

@@ -16,10 +16,11 @@
 # specific language governing permissions and limitations
 # under the License.
 #
+#
 
 module Thrift
   module Client
-    def initialize(iprot, oprot=nil)
+    def initialize(iprot, oprot = nil)
       @iprot = iprot
       @oprot = oprot || iprot
       @seqid = 0
@@ -39,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
@@ -86,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

@@ -0,0 +1,64 @@
+module Thrift
+  class StructDefinition
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def namespace
+      @klass::NAMESPACE
+    end
+
+    def name
+      @klass::NAME
+    end
+
+    def struct_type
+      "#{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/exceptions.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,21 +6,21 @@
 # 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.
-# 
+#
 
 module Thrift
   class Exception < StandardError
     def initialize(message)
-      super
+      super(message)
       @message = message
     end
 

data/lib/thrift/middleware.rb

@@ -0,0 +1,50 @@
+module Thrift
+  module Middleware
+    class NopMiddleware
+      def handle_binary(_mth, args = {}, &block)
+        block.call(args)
+      end
+
+      def handle_unary(_mth, args = {},  &block)
+        block.call(args)
+      end
+    end
+
+    class MultiMiddleware
+      def initialize(middlewares)
+        @middlewares = middlewares
+      end
+
+      def handle_unary(mth, args = {}, &block)
+        @middlewares.reverse.reduce(block) do |acc, m|
+          Proc.new do |args|
+            m.handle_unary(mth, args) { |args| acc.call(args) }
+          end
+        end.call(args)
+      end
+
+      def handle_binary(mth, args = {}, &block)
+        @middlewares.reverse.reduce(block) do |acc, m|
+          Proc.new do |args|
+            m.handle_binary(mth, args) { |args| acc.call(args) }
+          end
+        end.call(args)
+      end
+    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

@@ -19,8 +19,9 @@
 
 module Thrift
   module Processor
-    def initialize(handler)
+    def initialize(handler, middlewares = [])
       @handler = handler
+      @middleware = Middleware.wrap(middlewares)
     end
 
     def process(iprot, oprot)
@@ -31,7 +32,6 @@ module Thrift
         rescue => e
           write_exception(e, oprot, name, seqid)
         end
-
         true
       else
         iprot.skip(Types::STRUCT)
@@ -39,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/base_transport.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.
-# 
+#
 
 module Thrift
   class TransportException < Exception
@@ -48,7 +48,7 @@ module Thrift
 
   class BaseTransport
     def open?; end
-    
+
     def open; end
 
     def close; end
@@ -62,6 +62,8 @@ module Thrift
       raise NotImplementedError
     end
 
+    def set_context(ctx); end
+
     # Returns an unsigned byte as a Fixnum in the range (0..255).
     def read_byte
       buf = read_all(1)
@@ -86,7 +88,7 @@ module Thrift
         chunk = read(size - buf.length)
         buf << chunk
       end
-    
+
       buf
     end
 
@@ -100,7 +102,7 @@ module Thrift
 
     def flush; end
   end
-  
+
   class BaseTransportFactory
     def get_transport(trans)
       return trans

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

data/lib/thrift/types/known/any.rb

@@ -0,0 +1,179 @@
+require 'thrift/types/known/any_types'
+require 'json'
+require 'yaml'
+
+module Thrift
+  module Types
+    module Known
+      module Any
+        class CustomYAML
+          class << self
+            def dump(obj)
+              YAML.dump(obj)[4..-1]
+            end
+
+            def load(val)
+              YAML.safe_load(val)
+            end
+          end
+        end
+
+        class MetaCodec
+          def initialize(klass)
+            @klass = klass
+          end
+
+          def encode(obj)
+            @klass.dump(to_hash(obj))
+          end
+
+          def decode(buf, obj)
+            from_hash(obj, @klass.load(buf))
+          end
+
+          private
+
+          def to_hash(obj)
+            to_hash_field(obj, type: Thrift::Types::STRUCT)
+          end
+
+          def to_hash_field(value, field)
+            case field[:type]
+            when Thrift::Types::STRUCT
+              value.struct_fields.values.reduce({}) do |acc, sfield|
+                name = sfield[:name]
+                vv = value.send("#{name}?") ? to_hash_field(value.send(name), sfield) : nil
+                vv.nil? ? acc : acc.merge(name => vv)
+              end
+            when Thrift::Types::LIST
+              value.map { |vv| to_hash_field(vv, field[:element]) }
+            when Thrift::Types::MAP
+              value.reduce({}) do |acc, (k, v)|
+                kv = to_hash_field(k, field[:key])
+                vv = to_hash_field(v, field[:value])
+
+                acc.merge(kv => vv)
+              end
+            else
+              value
+            end
+          end
+
+          def from_hash(obj, hash)
+            return nil if hash.nil?
+
+            obj.struct_fields.values.each do |field|
+              name = field[:name]
+              value = hash[name]
+
+              obj.send("#{name}=", from_value_field(value, field)) if value
+            end
+
+            obj
+          end
+
+          def from_value_field(value, field)
+            case field[:type]
+            when Thrift::Types::STRUCT
+              from_hash(field[:class].new, value)
+            when Thrift::Types::LIST
+              value.map { |vv| from_value_field(vv, field[:element]) }
+            when Thrift::Types::MAP
+              value.reduce({}) do |acc, (k, v)|
+                kv = from_value_field(k, field[:key])
+                vv = from_value_field(v, field[:value])
+                acc.merge(kv => vv)
+              end
+            else
+              value
+            end
+          end
+        end
+
+        class ProtocolCodec
+          def initialize(protocol_factory)
+            @protocol_factory = protocol_factory
+          end
+
+          def encode(obj)
+            Serializer.new(@protocol_factory).serialize(obj)
+          end
+
+          def decode(buf, obj)
+            obj.read(
+              @protocol_factory.get_protocol(MemoryBufferTransport.new(buf))
+            )
+          end
+        end
+
+        DEFAULT_CODEC = ProtocolCodec.new(JsonProtocolFactory.new)
+        JSON_CODEC = MetaCodec.new(JSON)
+        YAML_CODEC = MetaCodec.new(CustomYAML)
+
+        CODECS = {
+          ''     => DEFAULT_CODEC,
+          'json' => JSON_CODEC,
+          'yaml' => YAML_CODEC,
+          'yml'  => YAML_CODEC
+        }
+
+
+        class << self
+          def from_object(obj, codec_key = '')
+            Any.from_object(obj, codec_key)
+          end
+        end
+
+        class Any
+          class TypeNotHandled < StandardError; end
+          class CodecNotHandled < StandardError; end
+
+          class << self
+            def from_object(obj, codec_key = '')
+              struct_def = Thrift::STRUCT_DEFINITIONS.values.find do |v|
+                obj.is_a? v.klass
+              end
+
+              raise TypeNotHandled unless struct_def
+              raise CodecNotHandled unless CODECS[codec_key]
+
+              key = codec_key.eql?('') ? '' : "-#{codec_key}"
+
+              Any.new(
+                type:  "thrift#{key}/#{struct_def.struct_type}",
+                value: CODECS[codec_key].encode(obj)
+              )
+            end
+          end
+
+          def to_object
+            codec_key, struct_type = parse_type
+
+            raise TypeNotHandled unless Thrift::STRUCT_DEFINITIONS[struct_type]
+            raise CodecNotHandled unless CODECS[codec_key]
+
+            res = Thrift::STRUCT_DEFINITIONS[struct_type].klass.new
+            CODECS[codec_key].decode(value, res)
+
+            res
+          end
+
+          private
+
+          def parse_type
+            ts = type.split('/')
+
+            if ts.length != 2 || (ts[0] =~ /^thrift-?/) != 0
+              raise TypeNotHandled.new
+            end
+
+            codec = ts[0][6..-1]
+            codec = codec[1..-1] if codec[0].eql?('-')
+
+            [codec, ts[1]]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/thrift/types/known/any_constants.rb

@@ -0,0 +1,17 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'any_types'
+
+module Thrift
+  module Types
+    module Known
+      module Any
+      end
+    end
+  end
+end

data/lib/thrift/types/known/any_types.rb

@@ -0,0 +1,43 @@
+#
+# Autogenerated by Thrift Compiler (2.3.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Thrift
+  module Types
+    module Known
+      module Any
+        class Any; end
+
+        class Any
+          include ::Thrift::Struct, ::Thrift::Struct_Union
+
+          NAME = 'Any'.freeze
+          NAMESPACE = 'types.known.any'.freeze
+
+          THRIFT_FIELD_INDEX_TYPE = 1
+          THRIFT_FIELD_INDEX_VALUE = 2
+
+          FIELDS = {
+            THRIFT_FIELD_INDEX_TYPE => {type: ::Thrift::Types::STRING, name: 'type'},
+            THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRING, name: 'value', binary: true}
+          }
+
+          def struct_fields; FIELDS; end
+
+          def validate
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field type is unset!') unless @type
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field value is unset!') unless @value
+          end
+
+          ::Thrift::Struct.generate_accessors self
+          ::Thrift.register_struct_type self
+        end
+
+      end
+    end
+  end
+end

data/lib/thrift/types/known/duration.rb

@@ -0,0 +1,27 @@
+require 'thrift/types/known/duration_types'
+
+module Thrift
+  module Types
+    module Known
+      module Duration
+        class << self
+          def from_number(v)
+            Duration.from_number(v)
+          end
+        end
+
+        class Duration
+          class << self
+            def from_number(v)
+              Duration.new(seconds: v.to_i, nanos: ((v % 1) * 1e9).to_i)
+            end
+          end
+
+          def to_number
+            seconds + nanos / 1e9
+          end
+        end
+      end
+    end
+  end
+end