thrift_client 0.1.3 → 0.2.1

data/CHANGELOG

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

data/README

@@ -14,6 +14,7 @@ The public certificate for this gem is here[http://rubyforge.org/frs/download.ph
 * 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.
 

data/Rakefile

@@ -12,5 +12,6 @@ Echoe.new("thrift_client") do |p|
   p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
   p.url = "http://blog.evanweaver.com/files/doc/fauna/thrift_client/"
   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+  p.spec_pattern = "spec/*_spec.rb"
 end
 

data/lib/thrift_client.rb

@@ -9,6 +9,7 @@ class ThriftClient
 
   DEFAULTS = {
     :protocol => Thrift::BinaryProtocol,
+    :protocol_extra_params => [],
     :transport => Thrift::FramedTransport,
     :randomize_server_list => true,
     :exception_classes => [
@@ -33,6 +34,7 @@ Create a new ThriftClient instance. Accepts an internal Thrift client class (suc
 Valid optional parameters are:
 
 <tt>:protocol</tt>:: Which Thrift protocol to use. Defaults to <tt>Thrift::BinaryProtocol</tt>.
+<tt>:protocol_extra_params</tt>:: An array of additional parameters to pass to the protocol initialization call. Defaults to <tt>[]</tt>.
 <tt>:transport</tt>:: Which Thrift transport to use. Defaults to <tt>Thrift::FramedTransport</tt>.
 <tt>:randomize_server_list</tt>:: Whether to connect to the servers randomly, instead of in order. Defaults to <tt>true</tt>.
 <tt>:raise</tt>:: Whether to reraise errors if no responsive servers are found. Defaults to <tt>true</tt>.
@@ -69,7 +71,7 @@ Valid optional parameters are:
     @transport = @options[:transport].new(
       Thrift::Socket.new(server.first, server.last.to_i, @options[:timeouts].default))
     @transport.open
-    @client = @client_class.new(@options[:protocol].new(@transport, false))
+    @client = @client_class.new(@options[:protocol].new(@transport, *@options[:protocol_extra_params]))
   end
 
   # Force the client to disconnect from the server.

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

@@ -2,5 +2,6 @@
 require 'test/unit'
 $LOAD_PATH << "#{File.expand_path(File.dirname(__FILE__))}/../lib"
 require 'thrift_client'
+require 'thrift_client/simple'
 require 'scribe'
 begin; require 'ruby-debug'; rescue LoadError; end

data/test/thrift_client_test.rb

@@ -4,45 +4,46 @@ class ThriftClientTest < Test::Unit::TestCase
   def setup
     @entry = [ScribeThrift::LogEntry.new(:message => "something", :category => "thrift_client")]
     @servers = ["127.0.0.1:1461", "127.0.0.1:1462", "127.0.0.1:1463"]
+    @options = {:protocol_extra_params => [false]}
   end
 
   def test_live_server
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers.last).Log(@entry)
+      ThriftClient.new(ScribeThrift::Client, @servers.last, @options).Log(@entry)
     end
   end
 
   def test_non_random_fall_through
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers, :randomize_server_list => false).Log(@entry)
+      ThriftClient.new(ScribeThrift::Client, @servers, @options).Log(@entry)
     end
   end
 
   def test_dont_raise
     assert_nothing_raised do
-      ThriftClient.new(ScribeThrift::Client, @servers.first, :raise => false).Log(@entry)
+      ThriftClient.new(ScribeThrift::Client, @servers.first, @options.merge(:raise => false)).Log(@entry)
     end
   end
   
   def test_dont_raise_with_defaults
-    client = ThriftClient.new(ScribeThrift::Client, @servers.first, :raise => false,  :defaults => {:Log => 1})
+    client = ThriftClient.new(ScribeThrift::Client, @servers.first, @options.merge(:raise => false, :defaults => {:Log => 1}))
     assert_equal 1, client.Log(@entry)
   end
   
   def test_defaults_dont_override_no_method_error
-    client = ThriftClient.new(ScribeThrift::Client, @servers, :raise => false,  :defaults => {:Missing => 2})
+    client = ThriftClient.new(ScribeThrift::Client, @servers, @options.merge(:raise => false, :defaults => {:Missing => 2}))
     assert_raises(NoMethodError) { client.Missing(@entry) }  
   end
 
   def test_random_server_list
     @lists = []
-    @lists << ThriftClient.new(ScribeThrift::Client, @servers).server_list while @lists.size < 10
+    @lists << ThriftClient.new(ScribeThrift::Client, @servers, @options).server_list while @lists.size < 10
     assert @lists.uniq.size > 1
   end
   
   def test_random_fall_through
     assert_nothing_raised do
-      10.times { ThriftClient.new(ScribeThrift::Client, @servers).Log(@entry) }
+      10.times { ThriftClient.new(ScribeThrift::Client, @servers, @options).Log(@entry) }
     end
   end
 
@@ -54,12 +55,12 @@ class ThriftClientTest < Test::Unit::TestCase
 
   def test_no_servers_eventually_raise
     assert_raises(Thrift::TransportException) do
-      ThriftClient.new(ScribeThrift::Client, @servers[0,2]).Log(@entry)
+      ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options).Log(@entry)
     end
   end
 
   def test_retry_period
-    client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], :server_retry_period => 1)
+    client = ThriftClient.new(ScribeThrift::Client, @servers[0,2], @options.merge(:server_retry_period => 1))
     assert_raises(Thrift::TransportException) { client.Log(@entry) }
     assert_raises(ThriftClient::NoServersAvailable) { client.Log(@entry) }
     sleep 1

data/thrift_client.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift_client}
-  s.version = "0.1.3"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2009-10-28}
   s.description = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb", "test/test_helper.rb", "test/thrift_client_test.rb", "thrift_client.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/thrift_client.rb", "lib/thrift_client/thrift.rb", "test/test_helper.rb", "test/thrift_client_test.rb", "thrift_client.gemspec", "test/simple_test.rb"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/thrift_client/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Thrift_client", "--main", "README"]
   s.require_paths = ["lib"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.4}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A Thrift client wrapper that encapsulates some common failover behavior.}
-  s.test_files = ["test/test_helper.rb", "test/thrift_client_test.rb"]
+  s.test_files = ["test/simple_test.rb", "test/test_helper.rb", "test/thrift_client_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thrift_client
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,5 +100,6 @@ signing_key:
 specification_version: 3
 summary: A Thrift client wrapper that encapsulates some common failover behavior.
 test_files: 
+- test/simple_test.rb
 - test/test_helper.rb
 - test/thrift_client_test.rb

metadata.gz.sig

@@ -1 +1,3 @@
-z���]�H7���=_�i~���Pl:Em�P:�ގ
���?�2U�ix���a�qyY����\B�
��S
�R#e0�a��h0{"��Q��t��JJ�,��^
��*+yI}�2�����׫����{<�9FV�MV�؁�c&��-��|�w�Jk	-�d���� ���$Ҿ�/�q�������η	D�S2���.����x��<�.X�������l�Uн�����f�\"�=I�C������f
gMW
+�Q1He�����H
�)����8�2'X+0'�?�1(O/�0�˪v������9G�0u%����
+�����d�U��bǷ��=��
+^đ��