thrift_client 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.1 Making ThriftClient decoratable. Able to add new functionality a class definition.
+
 v0.4.0. Add new EventMachine transport.  This requires two layers of transport
 configurability: 
   options[:transport] for EventMachine or Socket transports

data/Manifest

@@ -4,6 +4,7 @@ Manifest
 README.rdoc
 Rakefile
 lib/thrift_client.rb
+lib/thrift_client/abstract_thrift_client.rb
 lib/thrift_client/connection.rb
 lib/thrift_client/connection/base.rb
 lib/thrift_client/connection/factory.rb
@@ -15,7 +16,9 @@ lib/thrift_client/thrift.rb
 test/greeter/greeter.rb
 test/greeter/greeter.thrift
 test/greeter/server.rb
+test/multiple_working_servers_test.rb
 test/simple_test.rb
 test/test_helper.rb
 test/thrift_client_http_test.rb
 test/thrift_client_test.rb
+thrift_client.gemspec

data/README.rdoc

@@ -7,7 +7,7 @@ A Thrift client wrapper that encapsulates some common failover behavior.
 
 Copyright 2009 Twitter, Inc. See included LICENSE file.
 
-The public certificate for this gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem].
+The public certificate for this gem is here[http://blog.evanweaver.com/files/evan_weaver-original-public_cert.pem].
 
 == Features
 

data/lib/thrift_client/abstract_thrift_client.rb

@@ -0,0 +1,212 @@
+class AbstractThriftClient
+
+  DEFAULTS = {
+    :protocol => Thrift::BinaryProtocol,
+    :protocol_extra_params => [],
+    :transport => Thrift::Socket,
+    :transport_wrapper => Thrift::FramedTransport,
+    :raise => true,
+    :defaults => {}
+  }.freeze
+
+  attr_reader :client, :client_class, :current_server, :server_list, :options, :client_methods
+
+  def initialize(client_class, servers, options = {})
+    @options = DEFAULTS.merge(options)
+    @client_class = client_class
+    @server_list = Array(servers)
+    @current_server = @server_list.first
+
+    @client_methods = []
+    @client_class.instance_methods.each do |method_name|
+      if method_name =~ /^recv_(.*)$/
+        instance_eval("def #{$1}(*args); handled_proxy(:'#{$1}', *args); end", __FILE__, __LINE__)
+        @client_methods << $1
+      end
+    end
+  end
+
+  # Force the client to connect to the server. Not necessary to be
+  # called as the connection will be made on the first RPC method
+  # call.
+  def connect!
+    @connection = Connection::Factory.create(@options[:transport], @options[:transport_wrapper], @current_server, @options[:timeout])
+    @connection.connect!
+    @client = @client_class.new(@options[:protocol].new(@connection.transport, *@options[:protocol_extra_params]))
+  rescue Thrift::TransportException, Errno::ECONNREFUSED => e
+    @transport.close rescue nil
+    raise e
+  end
+
+  def disconnect!
+    @connection.close rescue nil
+    @client = nil
+    @current_server = nil
+  end
+
+  private
+  def handled_proxy(method_name, *args)
+    proxy(method_name, *args)
+  rescue Exception => e
+    handle_exception(e, method_name, args)
+  end
+
+  def proxy(method_name, *args)
+    connect! unless @client
+    send_rpc(method_name, *args)
+  end
+
+  def send_rpc(method_name, *args)
+    @client.send(method_name, *args)
+  end
+
+  def disconnect_on_error!
+    @connection.close rescue nil
+    @client = nil
+    @current_server = nil
+  end
+
+  def handle_exception(e, method_name, args=nil)
+    raise e if @options[:raise]
+    @options[:defaults][method_name.to_sym]
+  end
+
+  module RetryingThriftClient
+    DISCONNECT_ERRORS = [
+                         IOError,
+                         Thrift::Exception,
+                         Thrift::ProtocolException,
+                         Thrift::ApplicationException,
+                         Thrift::TransportException
+                        ].freeze
+
+    RETRYING_DEFAULTS = {
+      :exception_classes => DISCONNECT_ERRORS,
+      :randomize_server_list => true,
+      :retries => nil,
+      :server_retry_period => 1,
+      :server_max_requests => nil
+    }.freeze
+
+    def initialize(client_class, servers, options = {})
+      super
+      @options = RETRYING_DEFAULTS.merge(@options)
+      @retries = options[:retries] || @server_list.size
+      @request_count = 0
+      @max_requests = @options[:server_max_requests]
+      @retry_period = @options[:server_retry_period]
+      rebuild_live_server_list!
+    end
+
+    def connect!
+      @current_server = next_server
+      super
+    rescue Thrift::TransportException, Errno::ECONNREFUSED
+      retry
+    end
+
+    def disconnect!
+      # Keep live servers in the list if we have a retry period. Otherwise,
+      # always eject, because we will always re-add them.
+      if @retry_period && @current_server
+        @live_server_list.unshift(@current_server)
+      end
+
+      super()
+      @request_count = 0
+    end
+
+    private
+
+    def next_server
+      if @retry_period
+        rebuild_live_server_list! if Time.now > @last_rebuild + @retry_period
+        raise ThriftClient::NoServersAvailable, "No live servers in #{@server_list.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
+      elsif @live_server_list.empty?
+        rebuild_live_server_list!
+      end
+      @live_server_list.pop
+    end
+
+    def rebuild_live_server_list!
+      @last_rebuild = Time.now
+      if @options[:randomize_server_list]
+        @live_server_list = @server_list.sort_by { rand }
+      else
+        @live_server_list = @server_list.dup
+      end
+    end
+
+    def handled_proxy(method_name, *args)
+      disconnect_on_max! if @max_requests and @request_count >= @max_requests
+      super
+    end
+
+    def proxy(method_name, *args)
+      super
+    rescue *@options[:exception_classes] => e
+      disconnect_on_error!
+      tries ||= @retries
+      tries -= 1
+      tries == 0 ? handle_exception(e, method_name, args) : retry
+    end
+
+    def send_rpc(method_name, *args)
+      @request_count += 1
+      super
+    end
+
+    def disconnect_on_max!
+      @live_server_list.push(@current_server)
+      disconnect_on_error!
+    end
+
+    def disconnect_on_error!
+      super
+      @request_count = 0
+    end
+
+  end
+
+  module TimingOutThriftClient
+    TIMINGOUT_DEFAULTS = {
+      :timeout => 1,
+      :timeout_overrides => {}
+    }.freeze
+
+    def initialize(client_class, servers, options = {})
+      super
+      @options = TIMINGOUT_DEFAULTS.merge(@options)
+    end
+
+    def connect!
+      super
+      set_method_timeouts!
+    end
+
+    private
+    def set_method_timeouts!
+      return unless has_timeouts?
+      @client_methods.each do |method_name|
+        @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
+      end
+    end
+
+    def has_timeouts?
+      @has_timeouts ||= has_timeouts!
+    end
+
+    def has_timeouts!
+      @options[:timeout_overrides].any? && transport_can_timeout?
+    end
+
+    def transport_can_timeout?
+      if (@options[:transport_wrapper] || @options[:transport]).method_defined?(:timeout=)
+        true
+      else
+        warn "ThriftClient: Timeout overrides have no effect with with transport type #{(@options[:transport_wrapper] || @options[:transport])}"
+        false
+      end
+    end
+  end
+end

data/lib/thrift_client/connection/base.rb

@@ -2,12 +2,11 @@ module Connection
   class Base
     attr_accessor :transport, :server
 
-    def initialize(transport, transport_wrapper, server, timeout, error_hash)
+    def initialize(transport, transport_wrapper, server, timeout)
       @transport = transport
       @transport_wrapper = transport_wrapper
       @server = server
       @timeout = timeout
-      @error_type = error_hash[:handles_error]
     end
 
     def connect!
@@ -17,4 +16,4 @@ module Connection
     def close
     end
   end
-end
+end

data/lib/thrift_client/connection/factory.rb

@@ -2,10 +2,10 @@ module Connection
   class Factory
     def self.create(transport, transport_wrapper, server, timeout)
       if transport == Thrift::HTTPClientTransport
-        Connection::HTTP.new(transport, transport_wrapper, server, timeout, :handles_error => Errno::ECONNREFUSED)
+        Connection::HTTP.new(transport, transport_wrapper, server, timeout)
       else
-        Connection::Socket.new(transport, transport_wrapper, server, timeout, :handles_error => Thrift::TransportException)
+        Connection::Socket.new(transport, transport_wrapper, server, timeout)
       end
     end
   end
-end
+end

data/lib/thrift_client/connection/socket.rb

@@ -19,4 +19,4 @@ module Connection
       [host, port]
     end
   end
-end
+end

data/lib/thrift_client/event_machine.rb

@@ -17,7 +17,16 @@ module Thrift
     end
 
     def open
+      fiber = Fiber.current
       @connection = EventMachineConnection.connect(@host, @port, @timeout)
+      @connection.callback do
+        fiber.resume
+      end
+      @connection.errback do
+        fiber.resume
+      end
+      Fiber.yield
+      @connection
     end
 
     def close
@@ -56,7 +65,6 @@ module Thrift
     def initialize(host, port=9090)
       @host, @port = host, port
       @index = 0
-      @reconnecting = false
       @connected = false
       @buf = ''
     end
@@ -69,6 +77,7 @@ module Thrift
     end
 
     def blocking_read(size)
+      raise IOError, "lost connection to #{@host}:#{@port}" unless @connected
       trap do
         if can_read?(size)
           yank(size)
@@ -103,20 +112,15 @@ module Thrift
     end
 
     def connection_completed
-      @reconnecting = false
       @connected = true
       succeed
     end
 
     def unbind
-      # If we disconnect, try to reconnect
-      if @connected or !@reconnecting
-        EM.add_timer(1) { 
-          # XXX Connect timeout?
-          reconnect @host, @port 
-        }
+      if @connected
         @connected = false
-        @reconnecting = true
+      else
+        fail
       end
     end
 

data/lib/thrift_client.rb

@@ -10,34 +10,14 @@ end
 require 'rubygems'
 require 'thrift_client/thrift'
 require 'thrift_client/connection'
+require 'thrift_client/abstract_thrift_client'
 
-class ThriftClient
-
+class ThriftClient < AbstractThriftClient
+  # This error is for backwards compatibility only. If defined in
+  # RetryingThriftClient instead, causes the test suite will break.
   class NoServersAvailable < StandardError; end
-
-  DEFAULTS = {
-    :protocol => Thrift::BinaryProtocol,
-    :protocol_extra_params => [],
-    :transport => Thrift::Socket,
-    :transport_wrapper => Thrift::FramedTransport,
-    :randomize_server_list => true,
-    :exception_classes => [
-      IOError,
-      Thrift::Exception,
-      Thrift::ProtocolException,
-      Thrift::ApplicationException,
-      Thrift::TransportException,
-      NoServersAvailable],
-    :raise => true,
-    :retries => nil,
-    :server_retry_period => 1,
-    :server_max_requests => nil,
-    :timeout => 1,
-    :timeout_overrides => {},
-    :defaults => {}
-  }.freeze
-
-  attr_reader :client, :client_class, :current_server, :server_list, :options
+  include RetryingThriftClient
+  include TimingOutThriftClient
 
 =begin rdoc
 Create a new ThriftClient instance. Accepts an internal Thrift client class (such as CassandraRb::Client), a list of servers with ports, and optional parameters.
@@ -48,6 +28,7 @@ Valid optional parameters are:
 <tt>:protocol_extra_params</tt>:: An array of additional parameters to pass to the protocol initialization call. Defaults to <tt>[]</tt>.
 <tt>:transport</tt>:: Which Thrift transport to use. Defaults to <tt>Thrift::FramedTransport</tt>.
 <tt>:randomize_server_list</tt>:: Whether to connect to the servers randomly, instead of in order. Defaults to <tt>true</tt>.
+<tt>:exception_classes</tt>:: Which exceptions to catch and retry when sending a request. Defaults to <tt>[IOError, Thrift::Exception, Thrift::ProtocolException, Thrift::ApplicationException, Thrift::TransportException, NoServersAvailable]</tt>
 <tt>:raise</tt>:: Whether to reraise errors if no responsive servers are found. Defaults to <tt>true</tt>.
 <tt>:retries</tt>:: How many times to retry a request. Defaults to the number of servers defined.
 <tt>:server_retry_period</tt>:: How many seconds to wait before trying to reconnect after marking all servers as down. Defaults to <tt>1</tt>. Set to <tt>nil</tt> to retry endlessly.
@@ -59,100 +40,6 @@ Valid optional parameters are:
 =end rdoc
 
   def initialize(client_class, servers, options = {})
-    @options = DEFAULTS.merge(options)
-    @client_class = client_class
-    @server_list = Array(servers)
-    @retries = options[:retries] || @server_list.size
-
-    if @options[:timeout_overrides].any?
-      if (@options[:transport_wrapper] || @options[:transport]).method_defined?(:timeout=)
-        @set_timeout = true
-      else
-        warn "ThriftClient: Timeout overrides have no effect with with transport type #{(@options[:transport_wrapper] || @options[:transport])}"
-      end
-    end
-
-    @request_count = 0
-    @max_requests = @options[:server_max_requests]
-    @retry_period = @options[:server_retry_period]
-    rebuild_live_server_list!
-
-    @client_class.instance_methods.each do |method_name|
-      if method_name =~ /^recv_(.*)$/
-        instance_eval("def #{$1}(*args); proxy(:'#{$1}', *args); end")
-      end
-    end
-  end
-
-  # Force the client to connect to the server.
-  def connect!
-    @current_server = next_server
-    @connection = Connection::Factory.create(@options[:transport], @options[:transport_wrapper], @current_server, @options[:timeout])
-    @connection.connect!
-    @client = @client_class.new(@options[:protocol].new(@connection.transport, *@options[:protocol_extra_params]))
-  rescue Thrift::TransportException, Errno::ECONNREFUSED
-    @transport.close rescue nil
-    retry
-  end
-
-  # Force the client to disconnect from the server.
-  def disconnect!(keep = true)
-    @connection.close rescue nil
-
-    # Keep live servers in the list if we have a retry period. Otherwise,
-    # always eject, because we will always re-add them.
-    if keep and @retry_period and @current_server
-      @live_server_list.unshift(@current_server)
-    end
-
-    @request_count = 0
-    @client = nil
-    @current_server = nil
-  end
-
-  private
-
-  def next_server
-    if @retry_period
-      rebuild_live_server_list! if Time.now > @last_rebuild + @retry_period
-      raise NoServersAvailable, "No live servers in #{@server_list.inspect} since #{@last_rebuild.inspect}." if @live_server_list.empty?
-    elsif @live_server_list.empty?
-      rebuild_live_server_list!
-    end
-    @live_server_list.pop
-  end
-
-  def rebuild_live_server_list!
-    @last_rebuild = Time.now
-    if @options[:randomize_server_list]
-      @live_server_list = @server_list.sort_by { rand }
-    else
-      @live_server_list = @server_list.dup
-    end
-  end
-
-  def proxy(method_name, *args)
-    disconnect! if @max_requests and @request_count >= @max_requests
-    connect! unless @client
-
-    set_timeout!(method_name) if @set_timeout
-    @request_count += 1
-    @client.send(method_name, *args)
-  rescue NoServersAvailable => e
-    handle_exception(e, method_name, args)
-  rescue *@options[:exception_classes] => e
-    disconnect!(false)
-    tries ||= @retries
-    tries -= 1
-    tries == 0 ? handle_exception(e, method_name, args) : retry
-  end
-
-  def set_timeout!(method_name)
-    @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
-  end
-
-  def handle_exception(e, method_name, args=nil)
-    raise e if @options[:raise]
-    @options[:defaults][method_name.to_sym]
+    super
   end
 end

data/test/multiple_working_servers_test.rb

@@ -0,0 +1,112 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+class MultipleWorkingServersTest < Test::Unit::TestCase
+  def setup
+    @servers = ["127.0.0.1:1461", "127.0.0.1:1462", "127.0.0.1:1463"]
+    @socket = 1461
+    @timeout = 0.2
+    @options = {:protocol_extra_params => [false]}
+    @pids = []
+    @servers.each do |s|
+      @pids << Process.fork do
+        Signal.trap("INT") { exit }
+        Greeter::Server.new(s.split(':').last).serve
+      end
+    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
+  end
+
+  def teardown
+    @pids.each do |pid|
+      Process.kill("INT", pid)
+      Process.wait(pid)
+    end
+  end
+
+  def test_server_creates_new_client_that_can_talk_to_all_servers_after_disconnect
+    client = ThriftClient.new(Greeter::Client, @servers, @options)
+    client.greeting("someone")
+    internal_client = client.client
+    client.greeting("someone")
+    assert_equal internal_client, client.client # Sanity check
+
+    client.disconnect!
+    client.greeting("someone")
+    internal_client = client.client
+    client.greeting("someone")
+    assert_equal internal_client, client.client
+    internal_client = client.client
+    client.greeting("someone")
+    assert_equal internal_client, client.client
+
+    # Moves on to the second server
+    assert_nothing_raised {
+      client.greeting("someone")
+      client.greeting("someone")
+    }
+  end
+
+  def test_server_doesnt_max_out_after_explicit_disconnect
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
+    client.greeting("someone")
+    internal_client = client.client
+    client.greeting("someone")
+    assert_equal internal_client, client.client # Sanity check
+
+    client.disconnect!
+
+    client.greeting("someone")
+    internal_client = client.client
+    client.greeting("someone")
+    assert_equal internal_client, client.client, "ThriftClient should not have reset the internal client if the counter was reset on disconnect"
+  end
+
+  def test_server_disconnect_doesnt_drop_servers_with_retry_period
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2, :retry_period => 1))
+    3.times {
+      client.greeting("someone")
+      internal_client = client.client
+      client.greeting("someone")
+      assert_equal internal_client, client.client # Sanity check
+
+      client.disconnect!
+
+      client.greeting("someone")
+      internal_client = client.client
+      client.greeting("someone")
+      assert_equal internal_client, client.client, "ThriftClient should not have reset the internal client if the counter was reset on disconnect"
+    }
+  end
+
+
+  def test_server_max_requests
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
+
+    client.greeting("someone")
+    internal_client = client.client
+
+    client.greeting("someone")
+    assert_equal internal_client, client.client
+
+    # This next call maxes out the requests for that "client" object
+    # and moves on to the next.
+    client.greeting("someone")
+    assert_not_equal internal_client, new_client = client.client
+
+    # And here we should still have the same client as the last one...
+    client.greeting("someone")
+    assert_equal new_client, client.client
+
+    # Until we max it out, too.
+    client.greeting("someone")
+    assert_not_equal new_client, client.client
+    assert_not_nil client.client
+
+    new_new_client = client.client
+    # And we should still have one server left
+    client.greeting("someone")
+    assert_equal new_new_client, client.client
+  end
+end

data/test/thrift_client_test.rb

@@ -121,13 +121,31 @@ class ThriftClientTest < Test::Unit::TestCase
     assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
   end
 
-  def test_server_max_requests
+  def test_client_with_retry_period_drops_servers
+    client = ThriftClient.new(Greeter::Client, @servers[0,2], @options.merge(:server_retry_period => 1))
+    assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
+    sleep 1.1
+    assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
+  end
+
+  def test_server_max_requests_with_downed_servers
     client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
     client.greeting("someone")
     internal_client = client.client
     client.greeting("someone")
     assert_equal internal_client, client.client
-    client.greeting("someone") 
+
+    # This next call maxes out the requests for that "client" object
+    # and moves on to the next.
+    client.greeting("someone")
+    assert_not_equal internal_client, new_client = client.client
+
+    # And here we should still have the same client as the last one...
+    client.greeting("someone")
+    assert_equal new_client, client.client
+
+    # Until we max it out, too.
+    client.greeting("someone")
     assert_not_equal internal_client, client.client
   end
 
@@ -140,4 +158,4 @@ class ThriftClientTest < Test::Unit::TestCase
   ensure
     socket.close
   end
-end
+end

data/thrift_client.gemspec

@@ -2,24 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-03-30}
   s.description = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb", "test/greeter/greeter.rb", "test/greeter/greeter.thrift", "test/greeter/server.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb", "thrift_client.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/thrift_client.rb", "lib/thrift_client/abstract_thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/abstract_thrift_client.rb", "lib/thrift_client/connection.rb", "lib/thrift_client/connection/base.rb", "lib/thrift_client/connection/factory.rb", "lib/thrift_client/connection/http.rb", "lib/thrift_client/connection/socket.rb", "lib/thrift_client/event_machine.rb", "lib/thrift_client/simple.rb", "lib/thrift_client/thrift.rb", "test/greeter/greeter.rb", "test/greeter/greeter.thrift", "test/greeter/server.rb", "test/multiple_working_servers_test.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb", "thrift_client.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/thrift_client/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.5}
-  s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
-  s.test_files = ["test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb"]
+  s.test_files = ["test/multiple_working_servers_test.rb", "test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_http_test.rb", "test/thrift_client_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,48 +1,34 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ0wCwYDVQQDDARyeWFu
-  MRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMTAwMTA4MTc1MDM0WhcNMTEwMTA4MTc1MDM0WjBBMQ0wCwYDVQQDDARy
-  eWFuMRswGQYKCZImiZPyLGQBGRYLdGhlcnlhbmtpbmcxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLPp+0PtRT3qCI
-  02sMsADSn7Uf1GpyXUtk4Fb94LqUO6Scl91YDmbFMpjzrQwQvBYMIVreWcwSish6
-  nip6WEk9lqXcOeDmex/qY2/FVXG8ffqjFHiNiN9vpWrWj5VMICequ+ftzWLKsPIS
-  DGJ4o+Z6wEYRuirgaRPCYAUDPglsaqctJ56wPuycryMe5+ApSkOS9iLWMprQKEAq
-  j2R2OBV0dSARdbtzuKwrP7sLDo7uPa0egFBUlcZ+nujGr4LvmpryB8scNRNmZK1w
-  1rEI7O06CbULj08qYxEhnKmFE7LbBoN/HrmvZLVQK5mWuiZQhtmJuhBfStJsaDux
-  5tBEkYZVAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBSnLarDEo5eBE2arSMrBdOOhtrnPTANBgkqhkiG9w0BAQUFAAOCAQEANER07s4K
-  Pvc1DSduliRDMUax/VSfLzDTtTAQwuSAPDrWAYXKugcJtOZOXjDbGL7c5zoWmy9u
-  Fn5vEVdm/93J+84D/IMaaof3BwX/NNEYH01CeZEIGMfc5AFFha7dabzP/uiPpb/c
-  GSvomC9IzyN37+eWwOS16cC+5XnBT6KRCaXYg2Fh6WpTgde67OVgXr4Q58HXlaZ+
-  /2BB3wq9lZ4JskvlpYpYnlPAUyiyc6R2Mjts1pURz5nkW4SuS7Kd1KCOOyr1McDH
-  VP12sTSjJclmI17BjDGQpAF0n9v5ExhJxWpeOjeBUPQsOin3ypEM1KkckLmOKvH6
-  zyKMYVRO0z/58g==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-02-18 00:00:00 -08:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: A Thrift client wrapper that encapsulates some common failover behavior.
 email: ""
 executables: []
@@ -54,6 +40,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - lib/thrift_client.rb
+- lib/thrift_client/abstract_thrift_client.rb
 - lib/thrift_client/connection.rb
 - lib/thrift_client/connection/base.rb
 - lib/thrift_client/connection/factory.rb
@@ -69,6 +56,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/thrift_client.rb
+- lib/thrift_client/abstract_thrift_client.rb
 - lib/thrift_client/connection.rb
 - lib/thrift_client/connection/base.rb
 - lib/thrift_client/connection/factory.rb
@@ -80,6 +68,7 @@ files:
 - test/greeter/greeter.rb
 - test/greeter/greeter.thrift
 - test/greeter/server.rb
+- test/multiple_working_servers_test.rb
 - test/simple_test.rb
 - test/test_helper.rb
 - test/thrift_client_http_test.rb
@@ -103,22 +92,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      - 8
       version: "0.8"
-  version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.
 test_files: 
+- test/multiple_working_servers_test.rb
 - test/simple_test.rb
 - test/test_helper.rb
 - test/thrift_client_http_test.rb

metadata.gz.sig

@@ -1,3 +0,0 @@
-w�
-� ����_e�@j	~C�q�Kv�)�y k�4����1հ��o�M�_��3,^�&ȯ0i��-ħ�Ve�`�D�x5&��
-9b�KŮ��c4�uX�Z�m{��U��:'�ٟG�֔�%9�D��0�u���-v�Ma��ֹ��͗"n����t�pN�1֊�2�3�E�\u����֕�ʹ��Q�<I�Ky��}{A�