thrift_rack 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773b0e6d88aa7f1985166dc435f1a86e060a37a9
-  data.tar.gz: 6086c1097e403a8d0b9a7905a714f2f36e2562e8
+  metadata.gz: 3112a7bb184974829cabffede052e726282e26b6
+  data.tar.gz: f465453942e1f42e97d056c93c094f66a751af42
 SHA512:
-  metadata.gz: 2846261de0e9c65282acd06787d01cb167a2523afa544cf395ad089b643769c5c138e033cf1b0eac327ca75502b416d07860867da673711982809ed5e9490a0d
-  data.tar.gz: 933c12c2164c69cd3dcf42507c81edfe0e882435139ebd87620826fabaa875dd4eb950477f855e57dfcc90f0ff92803951180b75decb196defd6b4090e088759
+  metadata.gz: 59862634376d053336d96e7d36c4af4286a7802764ebb638d90e5aaa0b0fb261e1fbdd78d9bfaf03335f377b9cb3d3a22d4951b0e1cedf5d56f63696c7c69d68
+  data.tar.gz: eeaa115cc611531979398ff94ff098eba40e58aea256dde0e1f0707c7c88d345fb210fda06f8712aa10ba26f7fde2f6ad32a906e0d2af82d12d0e83e1c635d00

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    thrift_rack (0.1.9)
-      connection_pool (~> 2.2.1)
-      excon (~> 0.62.0)
+    thrift_rack (0.2.0)
       rack (>= 2.0)
       thrift (~> 0.10.0)
+      typhoeus (> 1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    connection_pool (2.2.1)
-    excon (0.62.0)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.23)
     method_source (0.9.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
@@ -20,6 +20,8 @@ GEM
     rack (2.0.5)
     rake (10.5.0)
     thrift (0.10.0.0)
+    typhoeus (1.3.0)
+      ethon (>= 0.9.0)
 
 PLATFORMS
   ruby

data/lib/thrift_rack.rb

@@ -5,7 +5,6 @@ require "thrift_rack/client"
 require 'thrift_rack/ping'
 require 'thrift_rack/format_check'
 require 'thrift_rack/http_client_transport'
-require 'thrift_rack/excon_pool'
 
 require 'rack'
 require 'thrift'

data/lib/thrift_rack/client.rb

@@ -4,7 +4,7 @@ class ThriftRack
     def initialize(url, client_klass, request_id = nil)
       @request_id = request_id || "no-request"
       @url = url
-      @transport = ThriftRack::HttpClientTransport.new(ThriftRack::ExconPool.get(url), URI(url).path)
+      @transport = ThriftRack::HttpClientTransport.new(url)
       protocol = protocol_factory.get_protocol(@transport)
       @client = client_klass.new(protocol)
     end
@@ -55,15 +55,7 @@ class ThriftRack
     end
 
     class << self
-      attr_accessor :app_name, :pool_size, :pool_timeout
-
-      def pool_size
-        @pool_size || 128
-      end
-
-      def pool_timeout
-        @pool_timeout || 3
-      end
+      attr_accessor :app_name
     end
   end
 end

data/lib/thrift_rack/http_client_transport.rb

@@ -1,15 +1,13 @@
 require 'thrift'
-require 'excon'
 require "stringio"
-Excon.defaults[:ssl_verify_peer] = false
+require 'typhoeus'
 class ThriftRack
   class HttpClientTransport < Thrift::BaseTransport
     class RespCodeError < StandardError; end
-    def initialize(client, path, opts = {})
+    def initialize(url, opts = {})
       @headers = {'Content-Type' => 'application/x-thrift'}
       @outbuf = Thrift::Bytes.empty_byte_buffer
-      @client = client
-      @path = path
+      @url = url
     end
 
     def open?; true end
@@ -22,9 +20,9 @@ class ThriftRack
 
 
     def flush
-      resp = @client.post(path: @path, body: @outbuf, headers: @headers, idempotent: true)
+      resp = Typhoeus.post(@url, body: @outbuf, headers: @headers, ssl_verifypeer: false)
       data = resp.body
-      raise RespCodeError.new("#{resp.status} on #{@path} with body #{data}") unless resp.status == 200
+      raise RespCodeError.new("#{resp.code} on #{@url} with body #{data}") unless resp.code == 200
       data = Thrift::Bytes.force_binary_encoding(data)
       @inbuf = StringIO.new data
     ensure

data/lib/thrift_rack/version.rb

@@ -1,3 +1,3 @@
 class ThriftRack
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/thrift_rack.gemspec

@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rack", ">= 2.0"
   spec.add_dependency "thrift", '~> 0.10.0'
-  spec.add_dependency "excon", "~> 0.62.0"
-  spec.add_dependency "connection_pool", "~> 2.2.1"
+  spec.add_dependency 'typhoeus', '> 1.1'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift_rack
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - xuxiangyang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.62.0
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +112,6 @@ files:
 - lib/config.ru
 - lib/thrift_rack.rb
 - lib/thrift_rack/client.rb
-- lib/thrift_rack/excon_pool.rb
 - lib/thrift_rack/format_check.rb
 - lib/thrift_rack/http_client_transport.rb
 - lib/thrift_rack/logger.rb

data/lib/thrift_rack/excon_pool.rb

@@ -1,16 +0,0 @@
-require 'connection_pool'
-class ThriftRack
-  class ExconPool
-    class << self
-      def pool
-        @pool ||= {}
-      end
-
-      def get(url)
-        @pool ||= {}
-        uri = URI(url)
-        @pool["#{uri.host}:#{uri.port}"] ||= ConnectionPool::Wrapper.new(size: ThriftRack::Client.pool_size, timeout: ThriftRack::Client.pool_timeout) {Excon.new("#{uri.scheme}://#{uri.host}:#{uri.port}", persistent: true)}
-      end
-    end
-  end
-end