thrift 0.4.0 → 0.5.0

data/Rakefile

@@ -82,7 +82,7 @@ begin
     p.summary = "Ruby libraries for Thrift (a language-agnostic RPC system)"
     p.url = "http://incubator.apache.org/thrift/"
     p.include_rakefile = true
-    p.version = "0.4.0"
+    p.version = "0.5.0"
     p.rubygems_version = ">= 1.2.0"
   end
 

data/lib/thrift/struct.rb

@@ -21,7 +21,7 @@ require 'set'
 
 module Thrift
   module Struct
-    def initialize(d={})
+    def initialize(d={}, &block)
       # get a copy of the default values to work on, removing defaults in favor of arguments
       fields_with_defaults = fields_with_default_values.dup
       
@@ -50,6 +50,8 @@ module Thrift
           instance_variable_set("@#{name}", (default_value.dup rescue default_value))
         end
       end
+      
+      yield self if block_given?
     end
 
     def fields_with_default_values

data/lib/thrift/transport/socket.rb

@@ -97,12 +97,13 @@ module Thrift
           data = @handle.readpartial(sz)
         else
           # it's possible to interrupt select for something other than the timeout
-          # so we need to ensure we've waited long enough
+          # so we need to ensure we've waited long enough, but not too long
           start = Time.now
-          rd = nil # scoping
-          loop do
-            rd, = IO.select([@handle], nil, nil, @timeout)
-            break if (rd and not rd.empty?) or Time.now - start >= @timeout
+          timespent = 0
+          rd = loop do
+            rd, = IO.select([@handle], nil, nil, @timeout - timespent)
+            timespent = Time.now - start
+            break rd if (rd and not rd.empty?) or timespent >= @timeout
           end
           if rd.nil? or rd.empty?
             raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out reading #{sz} bytes from #{@desc}")

data/spec/socket_spec_shared.rb

@@ -91,7 +91,7 @@ shared_examples_for "a socket" do
   it "should raise an error when read times out" do
     @socket.timeout = 0.5
     @socket.open
-    IO.should_receive(:select).with([@handle], nil, nil, 0.5).at_least(1).times.and_return(nil)
+    IO.should_receive(:select).once {sleep(0.5); nil}
     lambda { @socket.read(17) }.should raise_error(Thrift::TransportException) { |e| e.type.should == Thrift::TransportException::TIMED_OUT }
   end
 

data/spec/struct_spec.rb

@@ -31,13 +31,22 @@ class ThriftStructSpec < Spec::ExampleGroup
     end
 
     it "should initialize all fields to defaults" do
-      struct = Foo.new
-      struct.simple.should == 53
-      struct.words.should == "words"
-      struct.hello.should == Hello.new(:greeting => 'hello, world!')
-      struct.ints.should == [1, 2, 2, 3]
-      struct.complex.should be_nil
-      struct.shorts.should == Set.new([5, 17, 239])
+      validate_default_arguments(Foo.new)
+    end
+
+    it "should initialize all fields to defaults and accept a block argument" do
+      Foo.new do |f|
+        validate_default_arguments(f)
+      end
+    end
+
+    def validate_default_arguments(object)
+      object.simple.should == 53
+      object.words.should == "words"
+      object.hello.should == Hello.new(:greeting => 'hello, world!')
+      object.ints.should == [1, 2, 2, 3]
+      object.complex.should be_nil
+      object.shorts.should == Set.new([5, 17, 239])
     end
 
     it "should not share default values between instances" do

data/thrift.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thrift}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2.0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Ballard, Kevin Clark, Mark Slee"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-10-13}
   s.description = %q{Ruby libraries for Thrift (a language-agnostic RPC system)}
   s.email = ["kevin@sb.org", "kevin.clark@gmail.com", "mcslee@facebook.com"]
   s.extensions = ["ext/extconf.rb"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thrift
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kevin Ballard, Kevin Clark, Mark Slee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: []