thrift_rack 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876f5fc8e1e40102b3b671b45ec6f44ea366d78c
-  data.tar.gz: eb386aa0c5b51076749a6377de75809ec36860ac
+  metadata.gz: e40a0428d460166190b44aff02be27ee45ee56f6
+  data.tar.gz: 36b6e37828a570654e93b1659e098e0ea38e01f0
 SHA512:
-  metadata.gz: 99daba9a46421d7f4b4f10ff96bbdc7378a0df5e9df55517e3cff22aa7e6b325e611397b5af0364525ffbf342ccaa8e53b09eb2c8ecef7d4cfe661c718872aeb
-  data.tar.gz: fee0cd1ad4c527402d242c22f291e72e6be9e9cd456b7375b3d841758ec51128d51b6dcf79b57c0ceaeed0c300108fc3ec322865f8364a638890f61b622308d5
+  metadata.gz: 7d0703322c68962056f3bb648390d031d6cb58e4a9bff4f6a202ac0e025a32dcbb382ed3e61b346f39e338dbf94d8e7d15dfcba96d79064710e83aaa404fd3d9
+  data.tar.gz: 008c47be652f5609dacf18b036a7b0dcb32ce645e3743223b7836952f2cb71dfeea4439e178295355cc69762704881e2d1e8fcda9eb6064341c0cca977e08655

data/lib/thrift_rack/client.rb

@@ -1,11 +1,10 @@
-require 'thrift'
 require 'securerandom'
 class ThriftRack
   class Client
     def initialize(url, client_klass, request_id = nil)
       @request_id = request_id || "no-request"
       @url = url
-      @transport = ThriftRack::TransportPool.get(url)
+      @transport = ThriftRack::HttpClientTransport.new(ThriftRack::ExconPool.get(url), URI(url).path)
       protocol = protocol_factory.get_protocol(@transport)
       @client = client_klass.new(protocol)
     end

data/lib/thrift_rack/{transport_pool.rb → excon_pool.rb}

@@ -1,6 +1,6 @@
 require 'connection_pool'
 class ThriftRack
-  class TransportPool
+  class ExconPool
     class << self
       def pool
         @pool ||= {}
@@ -9,7 +9,7 @@ class ThriftRack
       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) {ThriftRack::HttpCLientTransport.new(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

data/lib/thrift_rack/http_client_transport.rb

@@ -1,15 +1,27 @@
+require 'thrift'
 require 'excon'
 require "stringio"
 Excon.defaults[:ssl_verify_peer] = false
 class ThriftRack
-  class HttpCLientTransport < Thrift::HTTPClientTransport
-    def initialize(url, opts = {})
-      super
-      @client = Excon.new(url, persistent: true)
+  class HttpClientTransport < Thrift::BaseTransport
+    def initialize(client, path, opts = {})
+      @headers = {'Content-Type' => 'application/x-thrift'}
+      @outbuf = Thrift::Bytes.empty_byte_buffer
+      @client = client
+      @path = path
     end
 
+    def open?; true end
+    def read(sz); @inbuf.read sz end
+    def write(buf); @outbuf << Thrift::Bytes.force_binary_encoding(buf) end
+
+    def add_headers(headers)
+      @headers = @headers.merge(headers)
+    end
+
+
     def flush
-      resp = @client.post(body: @outbuf, headers: @headers, idempotent: true)
+      resp = @client.post(path: @path, body: @outbuf, headers: @headers, idempotent: true)
       data = resp.body
       data = Thrift::Bytes.force_binary_encoding(data)
       @inbuf = StringIO.new data

data/lib/thrift_rack/version.rb

@@ -1,3 +1,3 @@
 class ThriftRack
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/thrift_rack.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrift_rack
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - xuxiangyang
@@ -14,98 +14,98 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thrift
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.62.0
   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
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: thrift http rakc server
@@ -115,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -126,12 +126,12 @@ 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
 - lib/thrift_rack/ping.rb
 - lib/thrift_rack/server.rb
-- lib/thrift_rack/transport_pool.rb
 - lib/thrift_rack/version.rb
 - thrift_rack.gemspec
 homepage: https://github.com/xuxiangyang/thrift_rack
@@ -144,17 +144,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: thrift http rakc server