thrift_client 0.4.4 → 0.4.5

data/CHANGELOG

@@ -1,10 +1,12 @@
-v0.4.4 Default to 0 retries rather than the number of servers.
+v0.4.5. Fix broken retries.
 
-v0.4.3 Bug fixes: handle_exception could be called more than once. Integer types are read signed.
+v0.4.4. Default to 0 retries rather than the number of servers.
 
-v0.4.2 Allow per-method overrides of retries. Fix several bugs with EventMachine.
+v0.4.3. Bug fixes: handle_exception could be called more than once. Integer types are read signed.
 
-v0.4.1 Making ThriftClient decoratable. Able to add new functionality a class definition.
+v0.4.2. Allow per-method overrides of retries. Fix several bugs with EventMachine.
+
+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:

data/Manifest

@@ -21,3 +21,4 @@ test/simple_test.rb
 test/test_helper.rb
 test/thrift_client_http_test.rb
 test/thrift_client_test.rb
+thrift_client.gemspec

data/lib/thrift_client/abstract_thrift_client.rb

@@ -153,7 +153,7 @@ class AbstractThriftClient
       disconnect_on_error!
       tries ||= (@options[:retry_overrides][method_name.to_sym] || @retries) + 1
       tries -= 1
-      tries >= 0 ? raise : retry
+      tries > 0 ? retry : raise
     end
 
     def send_rpc(method_name, *args)

data/test/thrift_client_test.rb

@@ -59,6 +59,25 @@ class ThriftClientTest < Test::Unit::TestCase
     assert_equal 1, times_called
   end
 
+  def test_retries_correct_number_of_times
+    stub_server(@socket) do |socket|
+      opts = @options.merge(:timeout => @timeout, :retries => 4, :server_retry_period => nil)
+      client = ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}", opts)
+      times_called = 0
+
+      singleton_class = (class << client; self end)
+
+      # disconnect_on_error! is called every time a server related
+      # connection error happens. it will be called every try (so, retries + 1)
+      singleton_class.send :define_method, :disconnect_on_error! do |*args|
+        times_called += 1; super
+      end
+
+      assert_raises(Thrift::TransportException) { client.greeting("someone") }
+      assert_equal opts[:retries] + 1, times_called
+    end
+  end
+
   def test_dont_raise_with_defaults
     client = ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false, :defaults => {:greeting => 1}))
     assert_equal 1, client.greeting

data/thrift_client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2010-07-23}
+  s.date = %q{2010-07-28}
   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/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"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Evan Weaver
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -07:00
+date: 2010-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency