fl-thrift_client 0.4.2

data/test/simple_test.rb

@@ -0,0 +1,137 @@
+
+require "#{File.dirname(__FILE__)}/test_helper"
+
+class SimpleTest < Test::Unit::TestCase
+
+  S = ThriftClient::Simple
+  S.make_struct("Example", S::Field.new(:name, S::STRING, 1))
+  S.make_struct("Args")
+  S.make_struct("Retval", S::Field.new(:rv, S::I32, 0))
+
+  def test_definition
+    assert Struct::ST_Example
+    assert Struct::ST_Args
+    assert Struct::ST_Retval
+  end
+
+  ## Encoding
+
+  def test_boolean_encoding
+    assert_equal "\001", S.pack_value(S::BOOL, true)
+    assert_equal "\000", S.pack_value(S::BOOL, false)
+  end
+
+  def test_byte_encoding
+    assert_equal "\xc7", S.pack_value(S::BYTE, 199)
+  end
+
+  def test_i16_encoding
+    assert_equal "\x00\x96", S.pack_value(S::I16, 150)
+  end
+
+  def test_i32_encoding
+    assert_equal "\x00\x96\xb4\x3f", S.pack_value(S::I32, 9876543)
+  end
+
+  def test_i64_encoding
+    assert_equal "\x00\x00\x00\x1c\xbb\xf3\x09\x04", S.pack_value(S::I64, 123412351236)
+  end
+
+  def test_double_encoding
+    assert_equal "\x40\x23\x00\x00\x00\x00\x00\x00", S.pack_value(S::DOUBLE, 9.5)
+  end
+
+  def test_string_encoding
+    assert_equal "\x00\x00\x00\x05hello", S.pack_value(S::STRING, "hello")
+  end
+
+  def test_list_encoding
+    assert_equal "\x08\x00\x00\x00\x03\x00\x00\x00\x17\x00\x00\x00\x16\x00\x00\x00\x15", 
+      S.pack_value(S::ListType.new(S::I32), [ 23, 22, 21 ])
+  end
+
+  def test_map_encoding
+    assert_equal "\x0b\x08\x00\x00\x00\x01\x00\x00\x00\x03cat\x00\x00\x00\x05", 
+      S.pack_value(S::MapType.new(S::STRING, S::I32), "cat" => 5)
+  end
+
+  def test_set_encoding
+    assert_equal "\x08\x00\x00\x00\x01\x00\x00\x00\x04", 
+      S.pack_value(S::SetType.new(S::I32), [ 4 ])
+  end
+
+  def test_struct_encoding
+    assert_equal "\x0b\x00\x01\x00\x00\x00\x06Commie\x00", 
+      S.pack_value(S::StructType.new(Struct::ST_Example), Struct::ST_Example.new("Commie"))
+  end
+
+  def test_request_encoding
+    assert_equal "\x80\x01\x00\x01\x00\x00\x00\x09getHeight\x00\x00\x00\x17\x00", 
+      S.pack_request("getHeight", Struct::ST_Args.new, 23)
+  end
+
+  ## Decoding
+
+  def test_boolean_decoding
+    assert_equal true, S.read_value(StringIO.new("\x01"), S::BOOL)
+    assert_equal false, S.read_value(StringIO.new("\x00"), S::BOOL)
+  end
+
+  def test_byte_decoding
+    assert_equal -57, S.read_value(StringIO.new("\xc7"), S::BYTE)
+  end
+
+  def test_i16_decoding
+    assert_equal 150, S.read_value(StringIO.new("\x00\x96"), S::I16)
+  end
+
+  def test_i32_decoding
+    assert_equal 9876543, S.read_value(StringIO.new("\x00\x96\xb4\x3f"), S::I32)
+  end
+
+  def test_i64_decoding
+    assert_equal 123412351236, 
+      S.read_value(StringIO.new("\x00\x00\x00\x1c\xbb\xf3\x09\x04"), S::I64)
+  end
+
+  def test_double_decoding
+    assert_equal 9.5, 
+      S.read_value(StringIO.new("\x40\x23\x00\x00\x00\x00\x00\x00"), S::DOUBLE)
+  end
+
+  def test_string_decoding
+    assert_equal "hello", S.read_value(StringIO.new("\x00\x00\x00\x05hello"), S::STRING)
+  end
+
+  def test_list_decoding
+    assert_equal [ 23, 22, 21 ], 
+      S.read_value(StringIO.new("\x08\x00\x00\x00\x03\x00\x00\x00\x17\x00\x00\x00\x16\x00\x00\x00\x15"), 
+      S::ListType.new(S::I32))
+  end
+
+  def test_map_decoding
+    assert_equal({ "cat" => 5 }, 
+      S.read_value(StringIO.new("\x0b\x08\x00\x00\x00\x01\x00\x00\x00\x03cat\x00\x00\x00\x05"), 
+      S::MapType.new(S::STRING, S::I32)))
+  end
+
+  def test_set_decoding
+    assert_equal [ 4 ], 
+      S.read_value(StringIO.new("\x08\x00\x00\x00\x01\x00\x00\x00\x04"), 
+      S::ListType.new(S::I32))
+  end
+
+  def test_struct_decoding
+    assert_equal Struct::ST_Example.new("Commie"), 
+      S.read_value(StringIO.new("\x0b\x00\x01\x00\x00\x00\x06Commie\x00"), 
+      S::StructType.new(Struct::ST_Example))
+  end
+
+  def test_response_decoding
+    assert_equal [ "getHeight", 255, 1 ], 
+      S.read_response(
+      StringIO.new("\x80\x01\x00\x02\x00\x00\x00\x09getHeight\x00\x00\x00\xff\x08\x00\x00\x00\x00\x00\x01\x00"),
+      Struct::ST_Retval)
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+
+require 'test/unit'
+require 'benchmark'
+$LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
+require 'thrift_client'
+require 'thrift_client/simple'
+
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__)) 
+require 'greeter/greeter'
+require 'greeter/server'
+
+begin; require 'ruby-debug'; rescue LoadError; end

data/test/thrift_client_http_test.rb

@@ -0,0 +1,54 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+require "thrift/server/mongrel_http_server"
+
+class ThriftClientHTTPTest < Test::Unit::TestCase
+
+  def setup
+    @servers = ["http://127.0.0.1:1461/greeter", "http://127.0.0.1:1462/greeter", "http://127.0.0.1:1463/greeter"]
+    @socket = 1461
+    @timeout = 0.2
+    @options = {:protocol_extra_params => [false]}
+    @pid = Process.fork do
+      Signal.trap("INT") { exit }
+      Greeter::HTTPServer.new(@servers.last).serve
+    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
+    Process.kill("INT", @pid)
+    Process.wait
+  end
+
+  def test_bad_uri
+    assert_raises URI::InvalidURIError do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "127.0.0.1:1463", @options).greeting("someone")
+    end
+  end
+
+  def test_bad_uri_no_http
+    assert_raises ArgumentError do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "//127.0.0.1:1463", @options).greeting("someone")
+    end
+  end
+
+  def test_valid_server
+    assert_nothing_raised do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, "http://127.0.0.1:1463/greeter", @options).greeting("someone")
+    end
+  end
+  
+  def test_non_random_fall_through
+    @servers = ["http://127.0.0.1:1463/greeter", "http://127.0.0.1:1461/greeter", "http://127.0.0.1:1462/greeter"]
+    assert_nothing_raised do
+      @options.merge!({ :protocol => Thrift::BinaryProtocol, :transport => Thrift::HTTPClientTransport })
+      ThriftClient.new(Greeter::Client, @servers, @options.merge(:randomize_server_list => false)).greeting("someone")
+    end
+  end
+
+end

data/test/thrift_client_test.rb

@@ -0,0 +1,166 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+class ThriftClientTest < 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]}
+    @pid = Process.fork do
+      Signal.trap("INT") { exit }
+      Greeter::Server.new("1463").serve
+    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
+    Process.kill("INT", @pid)
+    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")
+    end
+  end
+
+  def test_non_random_fall_through
+    assert_nothing_raised do
+      ThriftClient.new(Greeter::Client, @servers, @options.merge(:randomize_server_list => false)).greeting("someone")
+    end
+  end
+
+  def test_dont_raise
+    assert_nothing_raised do
+      ThriftClient.new(Greeter::Client, @servers.first, @options.merge(:raise => false)).greeting("someone")
+    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
+  end
+
+  def test_defaults_dont_override_no_method_error
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:raise => false, :defaults => {:Missing => 2}))
+    assert_raises(NoMethodError) { client.Missing }
+  end
+
+  def test_random_fall_through
+    assert_nothing_raised do
+      10.times do
+        client = ThriftClient.new(Greeter::Client, @servers, @options)
+        client.greeting("someone")
+        client.disconnect!
+      end
+    end
+  end
+
+  def test_lazy_connection
+    assert_nothing_raised do
+      ThriftClient.new(Greeter::Client, @servers[0,2])
+    end
+  end
+
+  def test_no_servers_eventually_raise
+    client = ThriftClient.new(Greeter::Client, @servers[0,2], @options)
+    assert_raises(ThriftClient::NoServersAvailable) do
+      client.greeting("someone")
+      client.disconnect!
+    end
+  end
+
+  def test_framed_transport_timeout
+    stub_server(@socket) do |socket|
+      measurement = Benchmark.measure do
+        assert_raises(Thrift::TransportException) do
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+            @options.merge(:timeout => @timeout)
+          ).greeting("someone")
+        end
+      end
+      assert((measurement.real > @timeout), "#{measurement.real} < #{@timeout}")
+    end
+  end
+
+  def test_buffered_transport_timeout
+    stub_server(@socket) do |socket|
+      measurement = Benchmark.measure do
+        assert_raises(Thrift::TransportException) do
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+            @options.merge(:timeout => @timeout, :transport_wrapper => Thrift::BufferedTransport)
+          ).greeting("someone")
+        end
+      end
+      assert((measurement.real > @timeout), "#{measurement.real} < #{@timeout}")
+    end
+  end
+
+  def test_buffered_transport_timeout_override
+    # FIXME Large timeout values always are applied twice for some bizarre reason
+    log_timeout = @timeout * 4
+    stub_server(@socket) do |socket|
+      measurement = Benchmark.measure do
+        assert_raises(Thrift::TransportException) do
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+            @options.merge(:timeout => @timeout, :timeout_overrides => {:greeting => log_timeout}, :transport_wrapper => Thrift::BufferedTransport)
+          ).greeting("someone")
+        end
+      end
+      assert((measurement.real > log_timeout), "#{measurement.real} < #{log_timeout}")
+    end
+  end
+
+  def test_retry_period
+    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_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
+
+    # 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
+
+  private
+
+  def stub_server(port)
+    socket = TCPServer.new('127.0.0.1', port)
+    Thread.new { socket.accept }
+    yield socket
+  ensure
+    socket.close
+  end
+end

data/thrift_client.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{fl-thrift_client}
+  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-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"]
+  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.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"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+  end
+end

metadata

@@ -0,0 +1,112 @@
+--- !ruby/object:Gem::Specification 
+name: fl-thrift_client
+version: !ruby/object:Gem::Version 
+  hash: 11
+  prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 2
+  version: 0.4.2
+platform: ruby
+authors: 
+- Evan Weaver
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-04-08 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: A Thrift client wrapper that encapsulates some common failover behavior.
+email: ""
+executables: []
+
+extensions: []
+
+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
+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
+has_rdoc: true
+homepage: http://blog.evanweaver.com/files/doc/fauna/thrift_client/
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Thrift_client
+- --main
+- README.rdoc
+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
+      version: "0.8"
+requirements: []
+
+rubyforge_project: fauna
+rubygems_version: 1.3.9.3
+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
+- test/thrift_client_test.rb