thrift_client 0.9.2 → 0.9.3

data/lib/thrift_client/abstract_thrift_client.rb

@@ -35,6 +35,17 @@ class AbstractThriftClient
 
   attr_reader :last_client, :client, :client_class, :current_server, :server_list, :options, :client_methods
 
+  def self.create_wrapped_exception_classes(client_class, wrapped_exception_classes = DEFAULT_WRAPPED_ERRORS)
+    wrapped_exception_classes.map do |exception_klass|
+      name = exception_klass.to_s.split('::').last
+      begin
+        client_class.const_get(name)
+      rescue NameError
+        client_class.const_set(name, Class.new(exception_klass))
+      end
+    end
+  end
+
   def initialize(client_class, servers, options = {})
     @options = DEFAULTS.merge(options)
     @options[:server_retry_period] ||= 0
@@ -55,14 +66,7 @@ class AbstractThriftClient
       end
     end
     @request_count = 0
-    @options[:wrapped_exception_classes].each do |exception_klass|
-      name = exception_klass.to_s.split('::').last
-      begin
-        @client_class.const_get(name)
-      rescue NameError
-        @client_class.const_set(name, Class.new(exception_klass))
-      end
-    end
+    self.class.create_wrapped_exception_classes(@client_class, @options[:wrapped_exception_classes])
   end
 
   # Adds a callback that will be invoked at a certain time. The valid callback types are:

data/test/greeter/server.rb

@@ -33,8 +33,8 @@ module Greeter
       uri = URI.parse(uri)
       handler = Greeter::Handler.new
       processor = Greeter::Processor.new(handler)
-      path = uri.path[1..-1]
-      @server = Thrift::MongrelHTTPServer.new(processor, :port => uri.port, :ip => uri.host, :path => path)
+      path = uri.path
+      @server = Thrift::ThinHTTPServer.new(processor, :port => uri.port, :ip => uri.host, :path => path)
     end
 
     def serve

data/test/thrift_client_http_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require "thrift/server/mongrel_http_server"
 
 class ThriftClientHTTPTest < Test::Unit::TestCase
 
@@ -14,7 +13,7 @@ class ThriftClientHTTPTest < Test::Unit::TestCase
     end
     # Need to give the child process a moment to open the listening socket or
     # we get occasional "could not connect" errors in tests.
-    sleep 0.05
+    sleep 0.20
   end
 
   def teardown

data/test/thrift_client_test.rb

@@ -26,6 +26,13 @@ class ThriftClientTest < Test::Unit::TestCase
     assert_equal "<ThriftClient(Greeter::Client) @current_server=127.0.0.1:1463>", client.inspect
   end
 
+  def test_create_wrapped_exception_classes
+    client = Module.new
+    ThriftClient.create_wrapped_exception_classes(client, [Thrift::TransportException])
+    assert client.const_defined?(:TransportException)
+    assert client.const_get(:TransportException).new.is_a?(Thrift::TransportException)
+  end
+
   def test_live_server
     assert_nothing_raised do
       ThriftClient.new(Greeter::Client, @servers.last, @options).greeting("someone")

metadata

@@ -1,81 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thrift_client
-version: !ruby/object:Gem::Version 
-  hash: 63
+version: !ruby/object:Gem::Version
+  version: 0.9.3
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Evan Weaver
 - Ryan King
 - Jeff Hodges
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-08-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thrift
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongrel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3622799061
-        segments: 
-        - 1
-        - 2
-        - 0
-        - pre
-        - 2
-        version: 1.2.0.pre2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/thrift_client/abstract_thrift_client.rb
 - lib/thrift_client/connection/base.rb
 - lib/thrift_client/connection/factory.rb
@@ -95,39 +102,31 @@ files:
 - test/thrift_client_http_test.rb
 - test/thrift_client_test.rb
 homepage: https://github.com/twitter/thrift_client
-licenses: []
-
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.
-test_files: 
+test_files:
 - test/greeter/greeter.rb
 - test/greeter/server.rb
 - test/multiple_working_servers_test.rb