thrift_client 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.4.4 Default to 0 retries rather than the number of servers.
+
 v0.4.3 Bug fixes: handle_exception could be called more than once. Integer types are read signed.
 
 v0.4.2 Allow per-method overrides of retries. Fix several bugs with EventMachine.

data/lib/thrift_client/abstract_thrift_client.rb

@@ -87,7 +87,7 @@ class AbstractThriftClient
     RETRYING_DEFAULTS = {
       :exception_classes => DISCONNECT_ERRORS,
       :randomize_server_list => true,
-      :retries => nil,
+      :retries => 0,
       :server_retry_period => 1,
       :server_max_requests => nil,
       :retry_overrides => {}
@@ -96,7 +96,7 @@ class AbstractThriftClient
     def initialize(client_class, servers, options = {})
       super
       @options = RETRYING_DEFAULTS.merge(@options) # @options is set by super
-      @retries = options[:retries] || @server_list.size
+      @retries = @options[:retries]
       @request_count = 0
       @max_requests = @options[:server_max_requests]
       @retry_period = @options[:server_retry_period]
@@ -151,9 +151,9 @@ class AbstractThriftClient
       super
     rescue *@options[:exception_classes] => e
       disconnect_on_error!
-      tries ||= (@options[:retry_overrides][method_name.to_sym] || @retries)
+      tries ||= (@options[:retry_overrides][method_name.to_sym] || @retries) + 1
       tries -= 1
-      tries == 0 ? raise : retry
+      tries >= 0 ? raise : retry
     end
 
     def send_rpc(method_name, *args)

data/lib/thrift_client/connection.rb

@@ -1,5 +1,4 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + "/connection")
-require "base"
-require "socket"
-require "http"
-require "factory"
+require "thrift_client/connection/base"
+require "thrift_client/connection/socket"
+require "thrift_client/connection/http"
+require "thrift_client/connection/factory"

data/thrift_client.gemspec

@@ -2,12 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.cert_chain = ["/Users/freels/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-07-23}
   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"]
@@ -16,8 +15,7 @@ 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.signing_key = %q{/Users/freels/.gemkeys/gem-private_key.pem}
+  s.rubygems_version = %q{1.3.7}
   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"]
 
@@ -25,7 +23,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thrift>, [">= 0"])
     else
       s.add_dependency(%q<thrift>, [">= 0"])

metadata

@@ -1,50 +1,32 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Evan Weaver
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARtYXR0
-  MRYwFAYKCZImiZPyLGQBGRYGZnJlZWxzMRQwEgYKCZImiZPyLGQBGRYEbmFtZTAe
-  Fw0xMDA1MTAyMjA0NTVaFw0xMTA1MTAyMjA0NTVaMD0xDTALBgNVBAMMBG1hdHQx
-  FjAUBgoJkiaJk/IsZAEZFgZmcmVlbHMxFDASBgoJkiaJk/IsZAEZFgRuYW1lMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuolq5fjVtDVlUMy690FYuonn
-  Ww1PNQrx/xP/lKHXIuw0N1r53Rs3+u331Z2lxgNTf7xpCm28TaY7MHLQJeCsCuiW
-  xRS1lDZc/D6gSbF1R8NrjX5Z2GkYhWwWq1JCqncGEMu9L2S7w3JEm1uAp9+Slf79
-  FRDf8YsxolMo9kvIE9I7E+38tpfgB7V2kl7BWWGkqX+xpF6hYZJ8rJm07PFFPMC9
-  mS2VSMShvJHLKpfu94Ud4WP9z05qX8sq+2TWkKHxp5GKndHsGDfWLgLExcw+FHK2
-  aSMVczp3gJjX9/Oz5cUDvplwUmuSgdZPG/OloA5THH9yP+uHssJHmveV5eokswID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUK1mG9LJ8
-  oj7zMsGt3a72q8M7JqIwDQYJKoZIhvcNAQEFBQADggEBAHnGX2oDk+SQXrFGa/jO
-  IXmx3pl4PxriRAdUnJJNKSEopGYh/mr/Mu2XDv4eW4GgBZbqvzuPWavsVYFIQwKK
-  Sz4FylZ9fxpcY3mWsz31IwrjYkZ6U43DP/pIw6Sv0iw2xhZwJPt09jZexs2KaH6l
-  Non+q//rdf1avbcuWNBeSJIK03s7C4pS3lKfRfF/9KsuIbDFvbwNKC00uiXmokSP
-  UdFLVl8y27MG7seE2788E6WaHrLWNhN+/dReDiOA5VjrkPI2lfHRqXDnaZTjvCir
-  5Cd6/wLNizaHOQCmp6VxpCuDA67P+TzXCvR7ElyQ2ErG2IHeSAoB/57bxToe40Rz
-  1LE=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -110,16 +92,20 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 27
       segments: 
       - 0
       - 8
@@ -127,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.