upfluence-thrift 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe021f1ee3ffa17f4e03313559749305b3fe4e5b
-  data.tar.gz: 9a3b75b02146b4ad62ca3924bf8bbd37b75b8cda
+  metadata.gz: 5be267a87cec41d07f9a14ce879abbb6f7de8228
+  data.tar.gz: aaf02c1244cdea7459e76e35514a41e16657364b
 SHA512:
-  metadata.gz: 5a47c37136de837bb54d1f08dd4f1554ed20ed3fb71580913b2a179bf5fa0ba6851eda2204fc891a547e96b6b15e4d73ca275293b88f141f48d6a83e0648dca7
-  data.tar.gz: f3eb8cc5a124809252626eabceea49891f9586fdcc1d72cf9517bcd542045a47b1e62525516f325d822a10406ae5c3f4c19b271667e15cdc5271cf791a46508d
+  metadata.gz: 79ecb2ac671d310e39d579372e14dc8a3854174ba7a8f95f5f1b987547e68a81381f2045ec942995995bfc149512b5c715c039b04ba27105604fb7be6f0401ff
+  data.tar.gz: c3dde03681f60b83e5dcdfdd0aa02f75181f6fd76733aa54ee766a304bdc52c6a9f2e9345ff783ea0e831429ada4f8c2ab9cfbd6ddb51d448fdeab7e6c6c43dc

data/lib/thrift/processor.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

data/lib/thrift/transport/http_client_transport.rb

@@ -26,38 +26,45 @@ require 'stringio'
 
 module Thrift
   class HTTPClientTransport < BaseTransport
+    DEFAULT_HEADERS = { 'Content-Type' => 'application/x-thrift' }.freeze
 
     def initialize(url, opts = {})
       @url = URI url
-      @headers = {'Content-Type' => 'application/x-thrift'}
+      @headers = DEFAULT_HEADERS.merge(opts.fetch(:headers, {}))
       @outbuf = Bytes.empty_byte_buffer
       @ssl_verify_mode = opts.fetch(:ssl_verify_mode, OpenSSL::SSL::VERIFY_PEER)
       @error_logger = opts[:error_logger]
       @retries = opts.fetch(:retries, 1)
+      @open_timeout = opts[:open_timeout]
+      @read_timeout = opts[:read_timeout]
     end
 
     def open?; true end
     def read(sz); @inbuf.read sz end
     def write(buf); @outbuf << Bytes.force_binary_encoding(buf) end
 
-    def add_headers(headers)
-      @headers = @headers.merge(headers)
-    end
-
     def flush
       tries ||= @retries
-      http = Net::HTTP.new @url.host, @url.port
-      http.use_ssl = @url.scheme == 'https'
-      http.verify_mode = @ssl_verify_mode if @url.scheme == 'https'
-      resp = http.post(@url.request_uri, @outbuf, @headers)
-      data = resp.body
-      data = Bytes.force_binary_encoding(data)
-      @inbuf = StringIO.new data
+      resp = http_client.post(@url.request_uri, @outbuf.dup, @headers)
+      resp.value
+      @inbuf = StringIO.new Bytes.force_binary_encoding(resp.body)
     rescue => e
       retry if (tries -= 1) > 0
-      @error_logger.capture_exception(e, extra: { url: @url }) if @error_logger
+      raise TransportException.new(TransportException::UNKNOWN, e.to_s)
     ensure
       @outbuf = Bytes.empty_byte_buffer
     end
+
+    private
+
+    def http_client
+      http = Net::HTTP.new @url.host, @url.port
+      http.use_ssl = @url.scheme == 'https'
+      http.open_timeout = @open_timeout if @open_timeout
+      http.read_timeout = @read_timeout if @read_timeout
+      http.verify_mode = @ssl_verify_mode if @url.scheme == 'https'
+
+      http
+    end
   end
 end

data/test/debug_proto/gen-rb/debug_proto_test_constants.rb

@@ -8,79 +8,6 @@ require 'thrift'
 require 'debug_proto_test_types'
 
 COMPACT_TEST = ::CompactProtoTestStruct.new({
-  %q"byte_boolean_map" => {
-    1 => true,
-    2 => false,
-  },
-  %q"list_byte_map" => {
-    [
-      1,
-      2,
-      3,
-    ] => 1,
-    [
-      0,
-      1,
-    ] => 2,
-    [
-    ] => 0,
-  },
-  %q"set_byte_map" => {
-    Set.new([
-      1,
-      2,
-      3,
-    ]) => 1,
-    Set.new([
-      0,
-      1,
-    ]) => 2,
-    Set.new([
-    ]) => 0,
-  },
-  %q"map_byte_map" => {
-    {
-      1 => 1,
-    } => 1,
-    {
-      2 => 2,
-    } => 2,
-    {
-    } => 0,
-  },
-  %q"byte_map_map" => {
-    0 => {
-    },
-    1 => {
-      1 => 1,
-    },
-    2 => {
-      1 => 1,
-      2 => 2,
-    },
-  },
-  %q"byte_set_map" => {
-    0 => Set.new([
-    ]),
-    1 => Set.new([
-      1,
-    ]),
-    2 => Set.new([
-      1,
-      2,
-    ]),
-  },
-  %q"byte_list_map" => {
-    0 => [
-    ],
-    1 => [
-      1,
-    ],
-    2 => [
-      1,
-      2,
-    ],
-  },
   %q"a_byte" => 127,
   %q"a_i16" => 32000,
   %q"a_i32" => 1000000000,
@@ -254,6 +181,79 @@ COMPACT_TEST = ::CompactProtoTestStruct.new({
     2 => %q"blah",
     3 => %q"loooooooooooooong string",
   },
+  %q"byte_boolean_map" => {
+    1 => true,
+    2 => false,
+  },
+  %q"list_byte_map" => {
+    [
+      1,
+      2,
+      3,
+    ] => 1,
+    [
+      0,
+      1,
+    ] => 2,
+    [
+    ] => 0,
+  },
+  %q"set_byte_map" => {
+    Set.new([
+      1,
+      2,
+      3,
+    ]) => 1,
+    Set.new([
+      0,
+      1,
+    ]) => 2,
+    Set.new([
+    ]) => 0,
+  },
+  %q"map_byte_map" => {
+    {
+      1 => 1,
+    } => 1,
+    {
+      2 => 2,
+    } => 2,
+    {
+    } => 0,
+  },
+  %q"byte_map_map" => {
+    0 => {
+    },
+    1 => {
+      1 => 1,
+    },
+    2 => {
+      1 => 1,
+      2 => 2,
+    },
+  },
+  %q"byte_set_map" => {
+    0 => Set.new([
+    ]),
+    1 => Set.new([
+      1,
+    ]),
+    2 => Set.new([
+      1,
+      2,
+    ]),
+  },
+  %q"byte_list_map" => {
+    0 => [
+    ],
+    1 => [
+      1,
+    ],
+    2 => [
+      1,
+      2,
+    ],
+  },
 })
 
 MYCONST = 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-thrift
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Thrift Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec