thrift_client 0.8.2 → 0.8.3

data/lib/thrift_client/abstract_thrift_client.rb

@@ -33,15 +33,17 @@ class AbstractThriftClient
     :cached_connections => false
   }
 
-  attr_reader :client, :client_class, :current_server, :server_list, :options, :client_methods
+  attr_reader :last_client, :client, :client_class, :current_server, :server_list, :options, :client_methods
 
   def initialize(client_class, servers, options = {})
     @options = DEFAULTS.merge(options)
     @options[:server_retry_period] ||= 0
+
     @client_class = client_class
     @server_list = Array(servers).collect do |s|
-      Server.new(s, @options[:cached_connections])
+      Server.new(s, @client_class, @options)
     end.sort_by { rand }
+
     @current_server = @server_list.first
 
     @callbacks = {}
@@ -92,11 +94,8 @@ class AbstractThriftClient
   # call.
   def connect!
     @current_server = next_live_server
-    @current_server.open(@options[:transport],
-                         @options[:transport_wrapper],
-                         @options[:connect_timeout],
-                         @options[:timeout])
-    @client = @client_class.new(@options[:protocol].new(@current_server, *@options[:protocol_extra_params]))
+    @client = @current_server.client
+    @last_client = @client
     do_callbacks(:post_connect, self)
   rescue IOError, Thrift::TransportException
     disconnect!(true)
@@ -136,8 +135,20 @@ class AbstractThriftClient
     raise ThriftClient::NoServersAvailable, "No live servers in #{@server_list.inspect}."
   end
 
+  def ensure_socket_alignment
+    incomplete = true
+    result = yield
+    incomplete = false
+    result
+  # Thrift exceptions get read off the wire. We can consider them complete requests
+  rescue Thrift::Exception => e
+    incomplete = false
+    raise e
+  ensure
+    disconnect! if incomplete
+  end
+
   def handled_proxy(method_name, *args)
-    disconnect! if @options[:server_max_requests] && @request_count >= @options[:server_max_requests]
     begin
       connect! unless @client
       if has_timeouts?
@@ -145,7 +156,7 @@ class AbstractThriftClient
       end
       @request_count += 1
       do_callbacks(:before_method, method_name)
-      @client.send(method_name, *args)
+      ensure_socket_alignment { @client.send(method_name, *args) }
     rescue *@options[:exception_class_overrides] => e
       raise_or_default(e, method_name)
     rescue *@options[:exception_classes] => e
@@ -159,6 +170,8 @@ class AbstractThriftClient
       end
     rescue Exception => e
       raise_or_default(e, method_name)
+    ensure
+      disconnect! if @options[:server_max_requests] && @request_count >= @options[:server_max_requests]
     end
   end
 

data/lib/thrift_client/connection/http.rb

@@ -1,14 +1,23 @@
 module ThriftHelpers
   module Connection
     class HTTP < Base
-      def connect!
+      def initialize(*args)
+        super *args
+
         uri = parse_server(@server)
         @transport = Thrift::HTTPClientTransport.new(@server)
+      end
+
+      def connect!
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = uri.scheme == "https"
         http.get(uri.path)
       end
 
+      def open?
+        true
+      end
+
       private
       def parse_server(server)
         uri = URI.parse(server)

data/lib/thrift_client/connection/socket.rb

@@ -1,14 +1,19 @@
 module ThriftHelpers
   module Connection
     class Socket < Base
+      def initialize(*args)
+        super *args
+
+        host, port = parse_server(@server)
+        @transport = @transport.new(host, port.to_i, @timeout)
+        @transport = @transport_wrapper.new(@transport) if @transport_wrapper
+      end
+
       def close
         @transport.close
       end
 
       def connect!
-        host, port = parse_server(@server)
-        @transport = @transport.new(*[host, port.to_i, @timeout])
-        @transport = @transport_wrapper.new(@transport) if @transport_wrapper
         @transport.open
       end
 

data/lib/thrift_client/server.rb

@@ -4,10 +4,13 @@ module ThriftHelpers
   class Server
     class ServerMarkedDown < StandardError; end
 
-    def initialize(connection_string, cached = true)
+    def initialize(connection_string, client_class, options = {})
       @connection_string = connection_string
-      @connection = nil
-      @cached = cached
+      @client_class = client_class
+      @options = options
+
+      @cached = @options.has_key?(:cached_connections) ? @options[:cached_connections] : true
+
       @marked_down_til = nil
     end
 
@@ -28,37 +31,42 @@ module ThriftHelpers
       @connection_string
     end
 
-    def open(trans, wrap, conn_timeout, trans_timeout)
-      if down?
-        raise ServerMarkedDown, "marked down until #{@marked_down_til}"
-      end
+    def connection
+      @connection ||= Connection::Factory.create(
+        @options[:transport], @options[:transport_wrapper],
+        @connection_string, @options[:connect_timeout])
+    end
 
-      if @connection.nil? || (@cached && !@connection.open?)
-        @connection = Connection::Factory.create(trans, wrap, @connection_string, conn_timeout)
-        @connection.connect!
-      end
+    def connect!
+      return if open?
 
-      if wrap || trans.respond_to?(:timeout=)
-        timeout = trans_timeout
-      end
+      self.timeout = @options[:connect_timeout]
+      connection.connect!
+      self.timeout = @options[:timeout]
+    end
 
-      self
+    def client
+      @client ||= begin
+        connect!
+
+        @client_class.new(
+          @options[:protocol].new(self, *@options[:protocol_extra_params]))
+      end
     end
 
     def open?
-      @connection && @connection.open?
+      connection.open?
     end
 
     def close(teardown = false)
       if teardown || !@cached
-        @connection.close rescue nil #TODO
-        @connection = nil
+        connection.close if open?
+        @client = nil
       end
     end
 
     def transport
-      return nil unless @connection
-      @connection.transport
+      connection.transport
     end
 
     module TransportInterface
@@ -88,7 +96,7 @@ module ThriftHelpers
       end
 
       def timeout=(timeout)
-        transport.timeout = timeout
+        transport.timeout = timeout if transport.respond_to?(:timeout=)
       end
 
       def timeout

data/lib/thrift_client.rb

@@ -24,6 +24,7 @@ Valid optional parameters are:
 <tt>:timeout</tt>:: Specify the default timeout in seconds. Defaults to <tt>1</tt>.
 <tt>:connect_timeout</tt>:: Specify the connection timeout in seconds. Defaults to <tt>0.1</tt>.
 <tt>:timeout_overrides</tt>:: Specify additional timeouts on a per-method basis, in seconds. Only works with <tt>Thrift::BufferedTransport</tt>.
+<tt>:cached_connections</tt>:: Cache connections between requests. Trades connect() costs for open sockets. Defaults to <tt>false</tt>.
 <tt>:defaults</tt>:: Specify default values to return on a per-method basis, if <tt>:raise</tt> is set to false.
 =end rdoc
 

data/test/multiple_working_servers_test.rb

@@ -28,18 +28,18 @@ class MultipleWorkingServersTest < Test::Unit::TestCase
   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
+    last_client = client.last_client
     client.greeting("someone")
-    assert_equal internal_client, client.client # Sanity check
+    assert_equal last_client, client.last_client # Sanity check
 
     client.disconnect!
     client.greeting("someone")
-    internal_client = client.client
+    last_client = client.last_client
     client.greeting("someone")
-    assert_equal internal_client, client.client
-    internal_client = client.client
+    assert_equal last_client, client.last_client
+    last_client = client.last_client
     client.greeting("someone")
-    assert_equal internal_client, client.client
+    assert_equal last_client, client.last_client
 
     # Moves on to the second server
     assert_nothing_raised {
@@ -51,32 +51,32 @@ class MultipleWorkingServersTest < Test::Unit::TestCase
   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
+    last_client = client.last_client
     client.greeting("someone")
-    assert_equal internal_client, client.client # Sanity check
+    assert_equal last_client, client.last_client # Sanity check
 
     client.disconnect!
 
     client.greeting("someone")
-    internal_client = client.client
+    last_client = client.last_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"
+    assert_equal last_client, client.last_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
+      last_client = client.last_client
       client.greeting("someone")
-      assert_equal internal_client, client.client # Sanity check
+      assert_equal last_client, client.last_client # Sanity check
 
       client.disconnect!
 
       client.greeting("someone")
-      internal_client = client.client
+      last_client = client.last_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"
+      assert_equal last_client, client.last_client, "ThriftClient should not have reset the internal client if the counter was reset on disconnect"
     }
   end
 
@@ -85,28 +85,28 @@ class MultipleWorkingServersTest < Test::Unit::TestCase
     client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
 
     client.greeting("someone")
-    internal_client = client.client
+    last_client = client.last_client
 
     client.greeting("someone")
-    assert_equal internal_client, client.client
+    assert_equal last_client, client.last_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
+    assert_not_equal last_client, new_client = client.last_client
 
     # And here we should still have the same client as the last one...
     client.greeting("someone")
-    assert_equal new_client, client.client
+    assert_equal new_client, client.last_client
 
     # Until we max it out, too.
     client.greeting("someone")
-    assert_not_equal new_client, client.client
-    assert_not_nil client.client
+    assert_not_equal new_client, client.last_client
+    assert_not_nil client.last_client
 
-    new_new_client = client.client
+    new_new_client = client.last_client
     # And we should still have one server left
     client.greeting("someone")
-    assert_equal new_new_client, client.client
+    assert_equal new_new_client, client.last_client
   end
 end

data/test/thrift_client_test.rb

@@ -247,22 +247,22 @@ class ThriftClientTest < Test::Unit::TestCase
   def test_server_max_requests_with_downed_servers
     client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2, :retries => 2))
     client.greeting("someone")
-    internal_client = client.client
+    last_client = client.last_client
     client.greeting("someone")
-    assert_equal internal_client, client.client
+    assert_equal last_client, client.last_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
+    assert_not_equal last_client, new_client = client.last_client
 
     # And here we should still have the same client as the last one...
     client.greeting("someone")
-    assert_equal new_client, client.client
+    assert_equal new_client, client.last_client
 
     # Until we max it out, too.
     client.greeting("someone")
-    assert_not_equal internal_client, client.client
+    assert_not_equal last_client, client.last_client
   end
 
   private

metadata

@@ -1,110 +1,123 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: thrift_client
-version: !ruby/object:Gem::Version
-  version: 0.8.2
+version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 3
+  version: 0.8.3
 platform: ruby
-authors:
-- Evan Weaver, Ryan King, Jeff Hodges
+authors: 
+- Evan Weaver
+- Ryan King
+- Jeff Hodges
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thrift
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mongrel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-description: A Thrift client wrapper that encapsulates some common failover behavior.
-email: ''
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -3814261918
+        segments: 
+        - 1
+        - 2
+        - 0
+        - pre
+        - 2
+        version: 1.2.0.pre2
+  type: :development
+  version_requirements: *id002
+description: 
+email: 
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- CHANGELOG
-- LICENSE
-- README.rdoc
-- lib/thrift_client.rb
+
+extra_rdoc_files: []
+
+files: 
 - 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/server.rb
-- lib/thrift_client/simple.rb
-- lib/thrift_client/thrift.rb
-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/server.rb
 - lib/thrift_client/simple.rb
 - lib/thrift_client/thrift.rb
+- lib/thrift_client.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
-homepage: http://fauna.github.com/fauna/thrift_client/
+homepage: https://github.com/twitter/thrift_client
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Thrift_client
-- --main
-- README.rdoc
-require_paths:
+rdoc_options: []
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0.8'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: fauna
-rubygems_version: 1.8.23
+
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.
-test_files:
-- test/thrift_client_http_test.rb
-- test/thrift_client_test.rb
-- test/test_helper.rb
+test_files: 
+- test/greeter/greeter.rb
+- 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

data/CHANGELOG

@@ -1,74 +0,0 @@
-v0.8.2 Connect errors now mark servers down for _server_retry_period_.
-Added support for cached connections to amortize connection costs.
-
-v0.8.1 Fixed permissions?
-
-v0.8.0 Update to thrift 0.8.0
-
-v0.7.1 Added support for :before_method and :on_exception callback types.
-Added support for registering multiple callbacks of a given type.
-
-v0.7.0 Updated thrift gem dependency to 0.7.0
-
-v0.6.3 Document the :connect_timeout option.
-Add support for specifying client-side timeouts when using FramedTransport
-set transport timeout after connection is established
-Add a method `add_callback` allowing a client to register a block that is invoked at a certain event.
-Fixup socket timeouts.
-
-
-
-v0.6.2 Remove lingering thrift v0.5.0 reference.
-
-v0.6.1 Add connect timeout. Bump thrift dependency to ~> v0.6.0.
-
-v0.6.0 Fix bug where we'd try to mark the current server down when we didn't have a current server.
-Upgrade to thrift 0.5.
-
-v0.5.0 Add support for wrapping exceptions, so that Thrift::Foo can become Greeter::Foo.
-Make server_retry_period work the way you expect.
-Better bookkeeping around marking servers as dead.
-
-v0.4.7 fix thrift gem dependency
-
-v0.4.6 Add support for oneway methods.
-
-v0.4.5. Fix broken retries.
-
-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.
-
-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
-  options[:transport_wrapper] for optional Buffered or Framed Transport.
-Clients will need to update their options to ensure they don't conflict with this change. (mperham)
-Revert global timeouts. (ryanking)
-Add support for HTTPClientTransport (Chris Sepic)
-
-v0.3.3. Allow for a timeout over all requests in a call.
-
-v0.3.2. Fix connection close bug (nkallen, mattknox).
-
-v0.3.1. Add ability to reset connection after N requests.
-
-v0.3. Change default timeout semantics; hash default was too sneaky. Fix bug.
-
-v0.2.2. Fix connect bug.
-
-v0.2.1. Don't turn off strict_read by default; allow override.
-
-v0.2. Add ThriftClient::Simple (Robey).
-
-v0.1.3. Define methods explicitly.
-
-v0.1.2. Support default responses.
-
-v0.1.1. Support server_retry_period.
-
-v0.1. First release.

data/LICENSE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/Manifest

@@ -1,25 +0,0 @@
-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/server.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

data/README.rdoc

@@ -1,60 +0,0 @@
-
-thrift_client
-
-A Thrift client wrapper that encapsulates some common failover behavior.
-
-== License
-
-Copyright 2009 Twitter, Inc. See included LICENSE file.
-
-The public certificate for this gem is here[http://blog.evanweaver.com/files/evan_weaver-original-public_cert.pem].
-
-== Features
-
-* Transparent connection management
-* Configurable failover and retry backoff
-* Ruby 1.9 compatibility
-* ThriftClient::Simple class, for working without generated bindings.
-
-The Github source repository is {here}[http://github.com/fauna/thrift_client/]. Patches and contributions are very welcome.
-
-== Usage
-
-Instantiate a client:
-
-  client = ThriftClient.new(CassandraRb::Client, '127.0.0.1:9160', :retries => 2)
-
-You can then make calls to the server via the <tt>client</tt> instance as if was your internal Thrift client. The connection will be opened lazily and methods will be proxied through.
-
-  client.get_string_list_property("keyspaces")
-
-On failures, the client will try the remaining servers in the list before giving up. See ThriftClient for more.
-
-== Timeouts
-
-Timeouts are enforced per-try, so if you have a timeout of n and do m retries, the total time it could take is n*m.
-
-== Connection Handling
-
-The library will shuffle the host list then work its way down this list, only moving to the next host if it received an error or you've doing more than server_max_requests requests with that host (defaults to 0 which means there's no limit).
-
-Servers that throw an error get marked as dead and will only be retried every server_retry_period seconds (at that time all dead servers are retried, no matter long they've been marked as dead).
-
-== Installation
-
-You need Ruby 1.8 or 1.9. If you have those, just run:
-
-  sudo gem install thrift_client
-
-== Contributing
-
-To contribute changes:
-
-1. Fork the project
-2. make your change, adding tests
-3. send a pull request to fauna and ryanking
-
-== Reporting problems
-
-The Github issue tracker is {here}[http://github.com/fauna/thrift_client/issues].
-

data/Rakefile

@@ -1,14 +0,0 @@
-
-require 'rubygems'
-require 'echoe'
-
-Echoe.new("thrift_client") do |p|
-  p.author = ["Evan Weaver", "Ryan King", "Jeff Hodges"]
-  p.project = "fauna"
-  p.summary = "A Thrift client wrapper that encapsulates some common failover behavior."
-  p.rubygems_version = ">= 0.8"
-  p.dependencies = ['thrift ~>0.8.0']
-  p.ignore_pattern = /^(vendor\/thrift)/
-  p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
-  p.spec_pattern = "spec/*_spec.rb"
-end

data/test/greeter/greeter.thrift

@@ -1,4 +0,0 @@
-service Greeter {
-  string greeting(1:string name)
-  oneway void yo(1:string name)
-}

data/thrift_client.gemspec

@@ -1,33 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "thrift_client"
-  s.version = "0.8.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Evan Weaver, Ryan King, Jeff Hodges"]
-  s.date = "2012-09-11"
-  s.description = "A Thrift client wrapper that encapsulates some common failover behavior."
-  s.email = ""
-  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/server.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/server.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 = "http://fauna.github.com/fauna/thrift_client/"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "fauna"
-  s.rubygems_version = "1.8.23"
-  s.summary = "A Thrift client wrapper that encapsulates some common failover behavior."
-  s.test_files = ["test/thrift_client_http_test.rb", "test/thrift_client_test.rb", "test/test_helper.rb", "test/multiple_working_servers_test.rb", "test/simple_test.rb"]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, ["~> 0.8.0"])
-    else
-      s.add_dependency(%q<thrift>, ["~> 0.8.0"])
-    end
-  else
-    s.add_dependency(%q<thrift>, ["~> 0.8.0"])
-  end
-end