upfluence-thrift 1.0.10 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0585c5dcf84ea7d019dfe7391d031ad89b8f51ed
-  data.tar.gz: 3569d6e14d9d6e2eac720b4569398c9e7b9ae537
+SHA256:
+  metadata.gz: eb0c6edc7181a95e78d4f3d1da97bf55cff534a6c4f3784c998bbefa1fc0df1c
+  data.tar.gz: c225382fb7a4bc1a0c4896f74a970c669eaf7cac96414b6c7e1be3d1dc7e66e5
 SHA512:
-  metadata.gz: 0c580dc31d5b3c8f31befb3baef6e3bc4e285698de536c35714f3a5c21d7f0b13bf42976f85945f0bd792381f6626ef2830d8c24fac9b5eeee1d509e14918704
-  data.tar.gz: f4a193a77d42cd34efc2366dda0a70c1da5fb4d24433fe70fc0f38c39ef4679e432a99fbc6319dd609bd1228cd48554061975d68f1c4ffaba391817a4d1ce8ee
+  metadata.gz: 9bfbd290bda69a9ca7102791fd2291e35902691598be71d1a1429dd16329ef9dad76a38d363e76098ee2b88af7ce8df93927b0f0458f41b93b8e4ec133b227b7
+  data.tar.gz: ffbb8d16a28268f9cb6cc82fa089e9bb06f96aefb3097077923478e4547fbc5cec43b2b640e0a790434e5ed41422236405c75bb835c5e2ac7735352e0dae182b

data/lib/thrift.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,28 +6,30 @@
 # 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.
-# 
+#
 # Contains some contributions under the Thrift Software License.
 # Please see doc/old-thrift-license.txt in the Thrift distribution for
 # details.
 
 $:.unshift File.dirname(__FILE__)
 
+require 'thrift/definition'
 require 'thrift/bytes'
 require 'thrift/core_ext'
 require 'thrift/exceptions'
 require 'thrift/types'
 require 'thrift/processor'
 require 'thrift/multiplexed_processor'
+require 'thrift/middleware'
 require 'thrift/client'
 require 'thrift/struct'
 require 'thrift/union'

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/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

@@ -6,36 +6,45 @@
 # 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
   module Processor
-    def initialize(handler)
+    def initialize(handler, middlewares = [])
       @handler = handler
+      @middleware = Middleware.wrap(middlewares)
     end
 
     def process(iprot, oprot)
-      name, type, seqid  = iprot.read_message_begin
+      name, _type, seqid = iprot.read_message_begin
       if respond_to?("process_#{name}")
-        send("process_#{name}", seqid, iprot, oprot)
+        begin
+          send("process_#{name}", seqid, iprot, oprot)
+        rescue => e
+          write_exception(e, oprot, name, seqid)
+        end
         true
       else
         iprot.skip(Types::STRUCT)
         iprot.read_message_end
-        x = ApplicationException.new(ApplicationException::UNKNOWN_METHOD, 'Unknown function '+name)
-        oprot.write_message_begin(name, MessageTypes::EXCEPTION, seqid)
-        x.write(oprot)
-        oprot.write_message_end
-        oprot.trans.flush
+        write_exception(
+          ApplicationException.new(
+            ApplicationException::UNKNOWN_METHOD,
+            'Unknown function ' + name,
+          ),
+          oprot,
+          name,
+          seqid
+        )
         false
       end
     end
@@ -47,6 +56,21 @@ module Thrift
       args
     end
 
+    def write_exception(exception, oprot, name, seqid)
+      oprot.write_message_begin(name, MessageTypes::EXCEPTION, seqid)
+
+      unless exception.is_a? ApplicationException
+        exception = ApplicationException.new(
+          ApplicationException::INTERNAL_ERROR,
+          "Internal error processing #{name}: #{exception.class}: #{exception}"
+        )
+      end
+
+      exception.write(oprot)
+      oprot.write_message_end
+      oprot.trans.flush
+    end
+
     def write_result(result, oprot, name, seqid)
       oprot.write_message_begin(name, MessageTypes::REPLY, seqid)
       result.write(oprot)

data/lib/thrift/protocol/json_protocol.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-# 
+#
 # 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
@@ -469,7 +469,7 @@ module Thrift
     end
 
     def write_string(str)
-      write_json_string(str)
+      write_json_string(Bytes.convert_to_utf8_byte_buffer(str))
     end
 
     def write_binary(str)
@@ -753,7 +753,7 @@ module Thrift
     end
 
     def read_string
-      read_json_string
+      Bytes.convert_to_string(read_json_string)
     end
 
     def read_binary

data/lib/thrift/server/rack_application.rb

@@ -21,37 +21,48 @@ require 'rack'
 
 module Thrift
   class RackApplication
-    THRIFT_HEADER = "application/x-thrift"
+    THRIFT_HEADER = 'application/x-thrift'.freeze
 
     def self.for(path, processor, protocol_factory)
       Rack::Builder.new do
         map path do
-          run lambda { |env|
-            request = Rack::Request.new(env)
-            if RackApplication.valid_thrift_request?(request)
-              RackApplication.successful_request(request, processor, protocol_factory)
-            else
-              RackApplication.failed_request
-            end
-          }
+          run Thrift::RackApplication.new(processor, protocol_factory)
         end
       end
     end
 
-    def self.successful_request(rack_request, processor, protocol_factory)
-      response = Rack::Response.new([], 200, {'Content-Type' => THRIFT_HEADER})
-      transport = IOStreamTransport.new rack_request.body, response
-      protocol = protocol_factory.get_protocol transport
-      processor.process protocol, protocol
-      response
+    def initialize(processor, protocol_factory)
+      @processor = processor
+      @protocol_factory = protocol_factory
+      @headers = { 'Content-Type' => THRIFT_HEADER }
     end
 
-    def self.failed_request
-      Rack::Response.new(['Not Found'], 404, {'Content-Type' => THRIFT_HEADER})
+    def call(env)
+      req = Rack::Request.new(env)
+
+      if valid_thrift_request?(req)
+        successful_request(req)
+      else
+        failed_request
+      end
+    end
+
+    def successful_request(req)
+      resp = Rack::Response.new([], 200, @headers)
+      transport = IOStreamTransport.new req.body, resp
+      protocol = @protocol_factory.get_protocol transport
+
+      @processor.process protocol, protocol
+
+      [resp.status, resp.headers, resp.body]
+    end
+
+    def failed_request
+      [404, @headers, 'Not found']
     end
 
-    def self.valid_thrift_request?(rack_request)
-      rack_request.post? && rack_request.env["CONTENT_TYPE"] == THRIFT_HEADER
+    def valid_thrift_request?(req)
+      req.post? && req.env['CONTENT_TYPE'] == THRIFT_HEADER
     end
   end
 end

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|