thrift_client 0.4.5 → 0.4.6

data/CHANGELOG

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

data/lib/thrift_client/abstract_thrift_client.rb

@@ -19,7 +19,7 @@ class AbstractThriftClient
 
     @client_methods = []
     @client_class.instance_methods.each do |method_name|
-      if method_name =~ /^recv_(.*)$/
+      if method_name != 'send_message' && method_name =~ /^send_(.*)$/
         instance_eval("def #{$1}(*args); handled_proxy(:'#{$1}', *args); end", __FILE__, __LINE__)
         @client_methods << $1
       end
@@ -55,8 +55,11 @@ class AbstractThriftClient
     handle_exception(e, method_name, args)
   end
 
+  def post_connect(method_name); end
+
   def proxy(method_name, *args)
     connect! unless @client
+    post_connect(method_name)
     send_rpc(method_name, *args)
   end
 
@@ -184,17 +187,10 @@ class AbstractThriftClient
       @options = TIMINGOUT_DEFAULTS.merge(@options)
     end
 
-    def connect!
-      super
-      set_method_timeouts!
-    end
-
     private
-    def set_method_timeouts!
+    def post_connect(method_name)
       return unless has_timeouts?
-      @client_methods.each do |method_name|
-        @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
-      end
+      @client.timeout = @options[:timeout_overrides][method_name.to_sym] || @options[:timeout]
     end
 
     def has_timeouts?

data/test/greeter/greeter.rb

@@ -25,6 +25,13 @@ module Greeter
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'greeting failed: unknown result')
     end
 
+    def yo(name)
+      send_yo(name)
+    end
+
+    def send_yo(name)
+      send_message('yo', Yo_args, :name => name)
+    end
   end
 
   class Processor
@@ -37,6 +44,12 @@ module Greeter
       write_result(result, oprot, 'greeting', seqid)
     end
 
+    def process_yo(seqid, iprot, oprot)
+      args = read_args(iprot, Yo_args)
+      @handler.yo(args.name)
+      return
+    end
+
   end
 
   # HELPER FUNCTIONS AND STRUCTURES
@@ -73,5 +86,35 @@ module Greeter
 
   end
 
+  class Yo_args
+    include ::Thrift::Struct
+    NAME = 1
+
+    ::Thrift::Struct.field_accessor self, :name
+    FIELDS = {
+      NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+  end
+
+  class Yo_result
+    include ::Thrift::Struct
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+  end
+
 end
 

data/test/greeter/greeter.thrift

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

data/test/greeter/server.rb

@@ -3,6 +3,10 @@ module Greeter
     def greeting(name)
       "hello there #{name}!"
     end
+
+    def yo(name)
+      #whee
+    end
   end
 
   class Server

data/test/thrift_client_test.rb

@@ -4,7 +4,7 @@ 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
+    @port = 1461
     @timeout = 0.2
     @options = {:protocol_extra_params => [false]}
     @pid = Process.fork do
@@ -60,9 +60,9 @@ class ThriftClientTest < Test::Unit::TestCase
   end
 
   def test_retries_correct_number_of_times
-    stub_server(@socket) do |socket|
+    stub_server(@port) do |socket|
       opts = @options.merge(:timeout => @timeout, :retries => 4, :server_retry_period => nil)
-      client = ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}", opts)
+      client = ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}", opts)
       times_called = 0
 
       singleton_class = (class << client; self end)
@@ -113,10 +113,10 @@ class ThriftClientTest < Test::Unit::TestCase
   end
 
   def test_framed_transport_timeout
-    stub_server(@socket) do |socket|
+    stub_server(@port) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
             @options.merge(:timeout => @timeout)
           ).greeting("someone")
         end
@@ -126,10 +126,10 @@ class ThriftClientTest < Test::Unit::TestCase
   end
 
   def test_buffered_transport_timeout
-    stub_server(@socket) do |socket|
+    stub_server(@port) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
             @options.merge(:timeout => @timeout, :transport_wrapper => Thrift::BufferedTransport)
           ).greeting("someone")
         end
@@ -141,10 +141,10 @@ class ThriftClientTest < Test::Unit::TestCase
   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|
+    stub_server(@port) do |socket|
       measurement = Benchmark.measure do
         assert_raises(Thrift::TransportException) do
-          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@socket}",
+          ThriftClient.new(Greeter::Client, "127.0.0.1:#{@port}",
             @options.merge(:timeout => @timeout, :timeout_overrides => {:greeting => log_timeout}, :transport_wrapper => Thrift::BufferedTransport)
           ).greeting("someone")
         end
@@ -167,6 +167,13 @@ class ThriftClientTest < Test::Unit::TestCase
     assert_raises(ThriftClient::NoServersAvailable) { client.greeting("someone") }
   end
 
+  def test_oneway_method
+    client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
+    assert_nothing_raised do
+      response = client.yo("dude")
+    end
+  end
+
   def test_server_max_requests_with_downed_servers
     client = ThriftClient.new(Greeter::Client, @servers, @options.merge(:server_max_requests => 2))
     client.greeting("someone")

data/thrift_client.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   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-28}
+  s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
+  s.date = %q{2010-08-02}
   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,6 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   s.rubygems_version = %q{1.3.7}
+  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,21 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 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-07-28 00:00:00 -07:00
+date: 2010-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency