bindata 0.6.0 → 0.7.0

data/spec/stringz_spec.rb

@@ -3,20 +3,20 @@
 require File.expand_path(File.dirname(__FILE__)) + '/spec_common'
 require 'bindata/stringz'
 
-context "An empty Stringz data object" do
-  setup do
+describe "An empty Stringz data object" do
+  before(:each) do
     @str = BinData::Stringz.new
   end
 
-  specify "should include the zero byte in num_bytes total" do
+  it "should include the zero byte in num_bytes total" do
     @str.num_bytes.should eql(1)
   end
 
-  specify "should not append the zero byte terminator to the value" do
+  it "should not append the zero byte terminator to the value" do
     @str.value.should eql("")
   end
 
-  specify "should write the zero byte terminator" do
+  it "should write the zero byte terminator" do
     io = StringIO.new
     @str.write(io)
     io.rewind
@@ -24,21 +24,21 @@ context "An empty Stringz data object" do
   end
 end
 
-context "A Stringz data object with value set" do
-  setup do
+describe "A Stringz data object with value set" do
+  before(:each) do
     @str = BinData::Stringz.new
     @str.value = "abcd"
   end
 
-  specify "should include the zero byte in num_bytes total" do
+  it "should include the zero byte in num_bytes total" do
     @str.num_bytes.should eql(5)
   end
 
-  specify "should not append the zero byte terminator to the value" do
+  it "should not append the zero byte terminator to the value" do
     @str.value.should eql("abcd")
   end
 
-  specify "should write the zero byte terminator" do
+  it "should write the zero byte terminator" do
     io = StringIO.new
     @str.write(io)
     io.rewind
@@ -46,102 +46,102 @@ context "A Stringz data object with value set" do
   end
 end
 
-context "Reading with a Stringz data object" do
-  setup do
+describe "Reading with a Stringz data object" do
+  before(:each) do
     @str = BinData::Stringz.new
   end
 
-  specify "should stop at the first zero byte" do
+  it "should stop at the first zero byte" do
     io = StringIO.new("abcd\0xyz\0")
     @str.read(io)
     @str.value.should eql("abcd")
     io.read(1).should eql("x")
   end
 
-  specify "should handle a zero length string" do
+  it "should handle a zero length string" do
     io = StringIO.new("\0abcd")
     @str.read(io)
     @str.value.should eql("")
     io.read(1).should eql("a")
   end
 
-  specify "should fail if no zero byte is found" do
+  it "should fail if no zero byte is found" do
     io = StringIO.new("abcd")
     lambda {@str.read(io) }.should raise_error(EOFError)
   end
 end
 
-context "Setting the value of a Stringz data object" do
-  setup do
+describe "Setting the value of a Stringz data object" do
+  before(:each) do
     @str = BinData::Stringz.new
   end
 
-  specify "should include the zero byte in num_bytes total" do
+  it "should include the zero byte in num_bytes total" do
     @str.value = "abcd"
     @str.num_bytes.should eql(5)
   end
 
-  specify "should accept empty strings" do
+  it "should accept empty strings" do
     @str.value = ""
     @str.value.should eql("")
   end
 
-  specify "should accept strings that aren't zero terminated" do
+  it "should accept strings that aren't zero terminated" do
     @str.value = "abcd"
     @str.value.should eql("abcd")
   end
 
-  specify "should accept strings that are zero terminated" do
+  it "should accept strings that are zero terminated" do
     @str.value = "abcd\0"
     @str.value.should eql("abcd")
   end
 
-  specify "should accept up to the first zero byte" do
+  it "should accept up to the first zero byte" do
     @str.value = "abcd\0xyz\0"
     @str.value.should eql("abcd")
   end
 end
 
-context "A Stringz data object with max_length" do
-  setup do
+describe "A Stringz data object with max_length" do
+  before(:each) do
     @str = BinData::Stringz.new(:max_length => 5)
   end
 
-  specify "should read less than max_length" do
+  it "should read less than max_length" do
     io = StringIO.new("abc\0xyz")
     @str.read(io)
     @str.value.should eql("abc")
   end
 
-  specify "should read exactly max_length" do
+  it "should read exactly max_length" do
     io = StringIO.new("abcd\0xyz")
     @str.read(io)
     @str.value.should eql("abcd")
   end
 
-  specify "should read no more than max_length" do
+  it "should read no more than max_length" do
     io = StringIO.new("abcdefg\0xyz")
     @str.read(io)
     @str.value.should eql("abcd")
     io.read(1).should eql("f")
   end
 
-  specify "should accept values less than max_length" do
+  it "should accept values less than max_length" do
     @str.value = "abc"
     @str.value.should eql("abc")
   end
 
-  specify "should accept values exactly max_length" do
+  it "should accept values exactly max_length" do
     @str.value = "abcd"
     @str.value.should eql("abcd")
   end
 
-  specify "should trim values greater than max_length" do
+  it "should trim values greater than max_length" do
     @str.value = "abcde"
     @str.value.should eql("abcd")
   end
 
-  specify "should write values less than max_length" do
+  it "should write values less than max_length" do
     io = StringIO.new
     @str.value = "abc"
     @str.write(io)
@@ -149,7 +149,7 @@ context "A Stringz data object with max_length" do
     io.read.should eql("abc\0")
   end
 
-  specify "should write values exactly max_length" do
+  it "should write values exactly max_length" do
     io = StringIO.new
     @str.value = "abcd"
     @str.write(io)

data/spec/struct_spec.rb

@@ -3,8 +3,8 @@
 require File.expand_path(File.dirname(__FILE__)) + '/spec_common'
 require 'bindata'
 
-context "A Struct with hidden fields" do
-  context_setup do
+describe "A Struct with hidden fields" do
+  before(:all) do
     eval <<-END
       class TestStruct < BinData::Struct
         hide :b, 'c'
@@ -17,11 +17,11 @@ context "A Struct with hidden fields" do
     @obj = TestStruct.new
   end
 
-  specify "should only show fields that aren't hidden" do
+  it "should only show fields that aren't hidden" do
     @obj.field_names.should == ["a", "d"]
   end
 
-  specify "should be able to access hidden fields directly" do
+  it "should be able to access hidden fields directly" do
     @obj.b.should eql(10)
     @obj.c = 15
     @obj.c.should eql(15)
@@ -29,14 +29,14 @@ context "A Struct with hidden fields" do
     @obj.should respond_to?(:b=)
   end
 
-  specify "should not include hidden fields in snapshot" do
+  it "should not include hidden fields in snapshot" do
     @obj.b = 5
     @obj.snapshot.should == {"a" => 0, "d" => 5}
   end
 end
 
-context "Defining a Struct" do
-  specify "should fail on non registered types" do
+describe "Defining a Struct" do
+  it "should fail on non registered types" do
     lambda {
       eval <<-END
         class BadType < BinData::Struct
@@ -46,7 +46,7 @@ context "Defining a Struct" do
     }.should raise_error(TypeError)
   end
 
-  specify "should fail on duplicate names" do
+  it "should fail on duplicate names" do
     lambda {
       eval <<-END
         class DuplicateName < BinData::Struct
@@ -58,7 +58,7 @@ context "Defining a Struct" do
     }.should raise_error(SyntaxError)
   end
 
-  specify "should fail when field name shadows an existing method" do
+  it "should fail when field name shadows an existing method" do
     lambda {
       eval <<-END
         class ExistingName < BinData::Struct
@@ -72,7 +72,7 @@ context "Defining a Struct" do
     }.should raise_error(NameError)
   end
 
-  specify "should fail on unknown endian" do
+  it "should fail on unknown endian" do
     lambda {
       eval <<-END
         class BadEndian < BinData::Struct
@@ -83,27 +83,27 @@ context "Defining a Struct" do
   end
 end
 
-context "A Struct with multiple fields" do
-  setup do
+describe "A Struct with multiple fields" do
+  before(:each) do
     fields = [ [:int8, :a], [:int8, :b] ]
     @obj = BinData::Struct.new(:fields => fields) 
     @obj.a = 1
     @obj.b = 2
   end
 
-  specify "should return num_bytes" do
+  it "should return num_bytes" do
     @obj.num_bytes(:a).should eql(1)
     @obj.num_bytes(:b).should eql(1)
     @obj.num_bytes.should     eql(2)
   end
 
-  specify "should clear" do
+  it "should clear" do
     @obj.a = 6
     @obj.clear
     @obj.clear?.should be_true
   end
 
-  specify "should clear individual elements" do
+  it "should clear individual elements" do
     @obj.a = 6
     @obj.b = 7
     @obj.clear(:a)
@@ -111,7 +111,7 @@ context "A Struct with multiple fields" do
     @obj.clear?(:b).should be_false
   end
 
-  specify "should write ordered" do
+  it "should write ordered" do
     io = StringIO.new
     @obj.write(io)
 
@@ -119,7 +119,7 @@ context "A Struct with multiple fields" do
     io.read.should eql("\x01\x02")
   end
 
-  specify "should read ordered" do
+  it "should read ordered" do
     io = StringIO.new "\x03\x04"
     @obj.read(io)
 
@@ -127,24 +127,24 @@ context "A Struct with multiple fields" do
     @obj.b.should eql(4)
   end
 
-  specify "should return a snapshot" do
+  it "should return a snapshot" do
     snap = @obj.snapshot
     snap.a.should eql(1)
     snap.b.should eql(2)
     snap.should == { "a" => 1, "b" => 2 }
   end
 
-  specify "should return field_names" do
+  it "should return field_names" do
     @obj.field_names.should == ["a", "b"]
   end
   
-  specify "should fail on unknown method call" do
+  it "should fail on unknown method call" do
     lambda { @obj.does_not_exist }.should raise_error(NoMethodError)
   end
 end
 
-context "A Struct with a value method" do
-  context_setup do
+describe "A Struct with a value method" do
+  before(:all) do
     eval <<-END
       class StructWithValue < BinData::Struct
         int8 :a
@@ -158,21 +158,21 @@ context "A Struct with a value method" do
     @obj = StructWithValue.new
   end
 
-  specify "should be single value object" do
+  it "should be single value object" do
     @obj.should be_a_single_value
   end
 
-  specify "should have no field names" do
+  it "should have no field names" do
     @obj.field_names.should be_empty
   end
 
-  specify "should not respond to field accesses" do
+  it "should not respond to field accesses" do
     @obj.should_not respond_to?(:a)
   end
 end
 
-context "A Struct with nested structs" do
-  context_setup do
+describe "A Struct with nested structs" do
+  before(:all) do
     eval <<-END
       class StructInner1 < BinData::Struct
         int8 :w, :initial_value => 3
@@ -193,26 +193,26 @@ context "A Struct with nested structs" do
     @obj = StructOuter.new
   end
 
-  specify "should included nested field names" do
+  it "should included nested field names" do
     @obj.field_names.should == ["a", "b", "y", "z"]
   end
 
-  specify "should access nested fields" do
+  it "should access nested fields" do
     @obj.a.should   eql(6)
     @obj.b.w.should eql(3)
     @obj.b.x.should eql(6)
     @obj.y.should   eql(3)
   end
 
-  specify "should return correct offset of" do
+  it "should return correct offset of" do
     @obj.offset_of("b").should eql(1)
     @obj.offset_of("y").should eql(3)
     @obj.offset_of("z").should eql(4)
   end
 end
 
-context "A Struct with an endian defined" do
-  context_setup do
+describe "A Struct with an endian defined" do
+  before(:all) do
     eval <<-END
       class StructWithEndian < BinData::Struct
         endian :little
@@ -227,7 +227,7 @@ context "A Struct with an endian defined" do
     @obj = StructWithEndian.new
   end
 
-  specify "should use correct endian" do
+  it "should use correct endian" do
     @obj.a = 1
     @obj.b = 2.0
     @obj.c[0] = 3

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: bindata
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-03-28 00:00:00 +08:00
+  version: 0.7.0
+date: 2007-08-27 00:00:00 +08:00
 summary: A declarative way to read and write binary file formats
 require_paths: 
 - lib