thrift_client 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,4 +1,7 @@
-v0.5.0 Add support for wrapping exception, so that Thrift::Foo can become Greeter::Foo.
+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.
 

data/Rakefile

@@ -7,7 +7,7 @@ Echoe.new("thrift_client") do |p|
   p.project = "fauna"
   p.summary = "A Thrift client wrapper that encapsulates some common failover behavior."
   p.rubygems_version = ">= 0.8"
-  p.dependencies = ['thrift ~>0.2.0']
+  p.dependencies = ['thrift ~>0.5.0']
   p.ignore_pattern = /^(vendor\/thrift)/
   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
   p.url = "http://blog.evanweaver.com/files/doc/fauna/thrift_client/"

data/lib/thrift_client.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift', '~>0.2.0'
+gem 'thrift', '~>0.5.0'
 require 'thrift'
 
 require 'rubygems'

data/lib/thrift_client/abstract_thrift_client.rb

@@ -148,7 +148,7 @@ class AbstractThriftClient
   end
 
   def disconnect_on_error!
-    @current_server.mark_down!
+    @current_server.mark_down! if @current_server
     disconnect!
   end
 

data/test/greeter/greeter.rb

@@ -55,10 +55,9 @@ module Greeter
   # HELPER FUNCTIONS AND STRUCTURES
 
   class Greeting_args
-    include ::Thrift::Struct
+    include ::Thrift::Struct, ::Thrift::Struct_Union
     NAME = 1
 
-    ::Thrift::Struct.field_accessor self, :name
     FIELDS = {
       NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}
     }
@@ -68,13 +67,13 @@ module Greeter
     def validate
     end
 
+    ::Thrift::Struct.generate_accessors self
   end
 
   class Greeting_result
-    include ::Thrift::Struct
+    include ::Thrift::Struct, ::Thrift::Struct_Union
     SUCCESS = 0
 
-    ::Thrift::Struct.field_accessor self, :success
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'}
     }
@@ -84,13 +83,13 @@ module Greeter
     def validate
     end
 
+    ::Thrift::Struct.generate_accessors self
   end
 
   class Yo_args
-    include ::Thrift::Struct
+    include ::Thrift::Struct, ::Thrift::Struct_Union
     NAME = 1
 
-    ::Thrift::Struct.field_accessor self, :name
     FIELDS = {
       NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}
     }
@@ -100,10 +99,11 @@ module Greeter
     def validate
     end
 
+    ::Thrift::Struct.generate_accessors self
   end
 
   class Yo_result
-    include ::Thrift::Struct
+    include ::Thrift::Struct, ::Thrift::Struct_Union
 
     FIELDS = {
 
@@ -114,6 +114,7 @@ module Greeter
     def validate
     end
 
+    ::Thrift::Struct.generate_accessors self
   end
 
 end

data/test/multiple_working_servers_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 class MultipleWorkingServersTest < Test::Unit::TestCase
   def setup

data/test/simple_test.rb

@@ -1,5 +1,4 @@
-
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 class SimpleTest < Test::Unit::TestCase
 

data/test/thrift_client_http_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 require "thrift/server/mongrel_http_server"
 
 class ThriftClientHTTPTest < Test::Unit::TestCase
@@ -43,4 +43,4 @@ class ThriftClientHTTPTest < Test::Unit::TestCase
     end
   end
 
-end
+end

data/test/thrift_client_test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/test_helper"
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 class ThriftClientTest < Test::Unit::TestCase
 
@@ -49,7 +49,7 @@ class ThriftClientTest < Test::Unit::TestCase
       # disconnect_on_error! is called every time a server related
       # connection error happens. it will be called every try (so, retries + 1)
       singleton_class.send :define_method, :disconnect_on_error! do |*args|
-        times_called += 1; super
+        times_called += 1; super *args
       end
 
       assert_raises(Greeter::Client::TransportException) { client.greeting("someone") }

data/thrift_client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   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 = %q{2010-09-22}
+  s.date = %q{2010-12-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"]
@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<thrift>, ["~> 0.5.0"])
     else
-      s.add_dependency(%q<thrift>, ["~> 0.2.0"])
+      s.add_dependency(%q<thrift>, ["~> 0.5.0"])
     end
   else
-    s.add_dependency(%q<thrift>, ["~> 0.2.0"])
+    s.add_dependency(%q<thrift>, ["~> 0.5.0"])
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King, Jeff Hodges
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -07:00
+date: 2010-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 11
         segments: 
         - 0
-        - 2
+        - 5
         - 0
-        version: 0.2.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 description: A Thrift client wrapper that encapsulates some common failover behavior.