thrift_client 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+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

data/Manifest

@@ -21,4 +21,3 @@ 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

@@ -26,6 +26,10 @@ class AbstractThriftClient
     end
   end
 
+  def inspect
+    "<#{self.class}(#{client_class}) @current_server=#{@current_server}>"
+  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.
@@ -85,12 +89,13 @@ class AbstractThriftClient
       :randomize_server_list => true,
       :retries => nil,
       :server_retry_period => 1,
-      :server_max_requests => nil
+      :server_max_requests => nil,
+      :retry_overrides => {}
     }.freeze
 
     def initialize(client_class, servers, options = {})
       super
-      @options = RETRYING_DEFAULTS.merge(@options)
+      @options = RETRYING_DEFAULTS.merge(@options) # @options is set by super
       @retries = options[:retries] || @server_list.size
       @request_count = 0
       @max_requests = @options[:server_max_requests]
@@ -146,7 +151,7 @@ class AbstractThriftClient
       super
     rescue *@options[:exception_classes] => e
       disconnect_on_error!
-      tries ||= @retries
+      tries ||= (@options[:retry_overrides][method_name.to_sym] || @retries)
       tries -= 1
       tries == 0 ? handle_exception(e, method_name, args) : retry
     end

data/test/thrift_client_test.rb

@@ -21,6 +21,11 @@ class ThriftClientTest < Test::Unit::TestCase
     Process.wait
   end
 
+  def test_inspect
+    client = ThriftClient.new(Greeter::Client, @servers.last, @options)
+    assert_equal "<ThriftClient(Greeter::Client) @current_server=127.0.0.1:1463>", client.inspect
+  end
+
   def test_live_server
     assert_nothing_raised do
       ThriftClient.new(Greeter::Client, @servers.last, @options).greeting("someone")

data/thrift_client.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2010-03-30}
+  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
+  s.date = %q{2010-04-08}
   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"]
@@ -15,7 +16,8 @@ Gem::Specification.new do |s|
   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.6}
+  s.rubygems_version = %q{1.3.5}
+  s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   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"]
 

metadata

@@ -1,34 +1,48 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain: []
+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-----
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: A Thrift client wrapper that encapsulates some common failover behavior.
 email: ""
 executables: []
@@ -92,21 +106,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.