bindata 1.4.3 → 1.4.4

data/spec/int_spec.rb

@@ -3,21 +3,21 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_common"))
 require 'bindata'
 
-share_examples_for "All Integers" do
+shared_examples "All Integers" do
 
-  it "should have correct num_bytes" do
+  it "have correct num_bytes" do
     all_classes do |int_class|
       int_class.new.num_bytes.should == @nbytes
     end
   end
 
-  it "should have a sensible value of zero" do
+  it "have a sensible value of zero" do
     all_classes do |int_class|
       int_class.new.should be_zero
     end
   end
 
-  it "should avoid underflow" do
+  it "avoid underflow" do
     all_classes do |int_class|
       subject = int_class.new
       subject.assign(min_value - 1)
@@ -26,7 +26,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should avoid overflow" do
+  it "avoid overflow" do
     all_classes do |int_class|
       subject = int_class.new
       subject.assign(max_value + 1)
@@ -35,7 +35,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should assign values" do
+  it "assign values" do
     all_classes do |int_class|
       subject = int_class.new
       test_int = gen_test_int
@@ -45,7 +45,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should assign values from other int objects" do
+  it "assign values from other int objects" do
     all_classes do |int_class|
       src = int_class.new
       src.assign(gen_test_int)
@@ -56,7 +56,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should symmetrically read and write a +ve number" do
+  it "symmetrically read and write a +ve number" do
     all_classes do |int_class|
       subject = int_class.new
       subject.assign(gen_test_int)
@@ -65,7 +65,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should symmetrically read and write a -ve number" do
+  it "symmetrically read and write a -ve number" do
     all_classes do |int_class|
       if @signed
         subject = int_class.new
@@ -76,7 +76,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should convert a +ve number to string" do
+  it "convert a +ve number to string" do
     all_classes do |int_class|
       val = gen_test_int
 
@@ -87,7 +87,7 @@ share_examples_for "All Integers" do
     end
   end
 
-  it "should convert a -ve number to string" do
+  it "convert a -ve number to string" do
     all_classes do |int_class|
       if @signed
         val = -gen_test_int
@@ -156,7 +156,7 @@ share_examples_for "All Integers" do
 end
 
 describe "All signed big endian integers" do
-  it_should_behave_like "All Integers"
+  include_examples "All Integers"
 
   before(:all) do
     @endian = :big
@@ -166,7 +166,7 @@ describe "All signed big endian integers" do
 end
 
 describe "All unsigned big endian integers" do
-  it_should_behave_like "All Integers"
+  include_examples "All Integers"
 
   before(:all) do
     @endian = :big
@@ -176,7 +176,7 @@ describe "All unsigned big endian integers" do
 end
 
 describe "All signed little endian integers" do
-  it_should_behave_like "All Integers"
+  include_examples "All Integers"
 
   before(:all) do
     @endian = :little
@@ -186,7 +186,7 @@ describe "All signed little endian integers" do
 end
 
 describe "All unsigned little endian integers" do
-  it_should_behave_like "All Integers"
+  include_examples "All Integers"
 
   before(:all) do
     @endian = :little
@@ -196,21 +196,21 @@ describe "All unsigned little endian integers" do
 end
 
 describe "Custom defined integers" do
-  it "should fail unless bits are a multiple of 8" do
-    lambda {
+  it "fail unless bits are a multiple of 8" do
+    expect {
       BinData::Uint7le
-    }.should raise_error
+    }.to raise_error
 
-    lambda {
+    expect {
       BinData::Uint7be
-    }.should raise_error
+    }.to raise_error
 
-    lambda {
+    expect {
       BinData::Int7le
-    }.should raise_error
+    }.to raise_error
 
-    lambda {
+    expect {
       BinData::Int7be
-    }.should raise_error
+    }.to raise_error
   end
 end

data/spec/io_spec.rb

@@ -30,17 +30,17 @@ describe BinData::IO, "reading from non seekable stream" do
     Process.wait
   end
 
-  it "should always have an offset of 0" do
+  it "always has an offset of 0" do
     @io.readbytes(10)
     @io.offset.should == 0
   end
 
-  it "should seek" do
+  it "seeks correctly" do
     @io.seekbytes(4999)
     @io.readbytes(5).should == "abbbb"
   end
 
-  it "should return zero for num bytes remaining" do
+  it "returns zero for num bytes remaining" do
     @io.num_bytes_remaining.should == 0
   end
 end
@@ -49,21 +49,21 @@ describe BinData::IO, "when reading" do
   let(:stream) { StringIO.new "abcdefghij" }
   let(:io) { BinData::IO.new(stream) }
 
-  it "should wrap strings in StringIO" do
+  it "wraps strings in StringIO" do
     io.raw_io.class.should == StringIO
   end
 
-  it "should not wrap IO objects" do
+  it "does not wrap IO objects" do
     io.raw_io.should == stream
   end
 
-  it "should raise error when io is BinData::IO" do
-    lambda {
+  it "raises error when io is BinData::IO" do
+    expect {
       BinData::IO.new(BinData::IO.new(""))
-    }.should raise_error(ArgumentError)
+    }.to raise_error(ArgumentError)
   end
 
-  it "should return correct offset" do
+  it "returns correct offset" do
     stream.seek(3, IO::SEEK_CUR)
 
     io.offset.should == 0
@@ -71,33 +71,33 @@ describe BinData::IO, "when reading" do
     io.offset.should == 4
   end
 
-  it "should seek" do
+  it "seeks correctly" do
     io.seekbytes(2)
     io.readbytes(4).should == "cdef"
   end
 
-  it "should read all bytes" do
+  it "reads all bytes" do
     io.read_all_bytes.should == "abcdefghij"
   end
 
-  it "should return number of bytes remaining" do
+  it "returns number of bytes remaining" do
     stream_length = io.num_bytes_remaining
 
     io.readbytes(4)
     io.num_bytes_remaining.should == stream_length - 4
   end
 
-  it "should raise error when reading at eof" do
+  it "raises error when reading at eof" do
     io.seekbytes(10)
-    lambda {
+    expect {
       io.readbytes(3)
-    }.should raise_error(EOFError)
+    }.to raise_error(EOFError)
   end
 
-  it "should raise error on short reads" do
-    lambda {
+  it "raises error on short reads" do
+    expect {
       io.readbytes(20)
-    }.should raise_error(IOError)
+    }.to raise_error(IOError)
   end
 end
 
@@ -105,23 +105,23 @@ describe BinData::IO, "when writing" do
   let(:stream) { StringIO.new }
   let(:io) { BinData::IO.new(stream) }
 
-  it "should not wrap IO objects" do
+  it "does not wrap IO objects" do
     io.raw_io.should == stream
   end
 
-  it "should raise error when io is BinData::IO" do
-    lambda {
+  it "raises error when io is BinData::IO" do
+    expect {
       BinData::IO.new(BinData::IO.new(""))
-    }.should raise_error(ArgumentError)
+    }.to raise_error(ArgumentError)
   end
 
-  it "should write" do
+  it "writes correctly" do
     io.writebytes("abcd")
 
     stream.value.should == "abcd"
   end
 
-  it "should flush" do
+  it "flushes" do
     io.writebytes("abcd")
     io.flush
 
@@ -135,40 +135,40 @@ describe BinData::IO, "reading bits in big endian" do
   let(:b3) { 0b0110_1010 }
   let(:io) { BinData::IO.new([b1, b2, b3].pack("CCC")) }
 
-  it "should read a bitfield less than 1 byte" do
+  it "reads a bitfield less than 1 byte" do
     io.readbits(3, :big).should == 0b111
   end
 
-  it "should read a bitfield more than 1 byte" do
+  it "reads a bitfield more than 1 byte" do
     io.readbits(10, :big).should == 0b1111_1010_11
   end
 
-  it "should read a bitfield more than 2 bytes" do
+  it "reads a bitfield more than 2 bytes" do
     io.readbits(17, :big).should == 0b1111_1010_1100_1110_0
   end
 
-  it "should read two bitfields totalling less than 1 byte" do
+  it "reads two bitfields totalling less than 1 byte" do
     io.readbits(5, :big).should == 0b1111_1
     io.readbits(2, :big).should == 0b01
   end
 
-  it "should read two bitfields totalling more than 1 byte" do
+  it "reads two bitfields totalling more than 1 byte" do
     io.readbits(6, :big).should == 0b1111_10
     io.readbits(8, :big).should == 0b10_1100_11
   end
 
-  it "should read two bitfields totalling more than 2 bytes" do
+  it "reads two bitfields totalling more than 2 bytes" do
     io.readbits(7, :big).should == 0b1111_101
     io.readbits(12, :big).should == 0b0_1100_1110_011
   end
 
-  it "should ignore unused bits when reading bytes" do
+  it "ignores unused bits when reading bytes" do
     io.readbits(3, :big).should == 0b111
     io.readbytes(1).should == [b2].pack("C")
     io.readbits(2, :big).should == 0b01
   end
 
-  it "should reset read bits to realign stream to next byte" do
+  it "resets read bits to realign stream to next byte" do
     io.readbits(3, :big).should == 0b111
     io.reset_read_bits
     io.readbits(3, :big).should == 0b110
@@ -181,40 +181,40 @@ describe BinData::IO, "reading bits in little endian" do
   let(:b3) { 0b0110_1010 }
   let(:io) { BinData::IO.new([b1, b2, b3].pack("CCC")) }
 
-  it "should read a bitfield less than 1 byte" do
+  it "reads a bitfield less than 1 byte" do
     io.readbits(3, :little).should == 0b010
   end
 
-  it "should read a bitfield more than 1 byte" do
+  it "reads a bitfield more than 1 byte" do
     io.readbits(10, :little).should == 0b10_1111_1010
   end
 
-  it "should read a bitfield more than 2 bytes" do
+  it "reads a bitfield more than 2 bytes" do
     io.readbits(17, :little).should == 0b0_1100_1110_1111_1010
   end
 
-  it "should read two bitfields totalling less than 1 byte" do
+  it "reads two bitfields totalling less than 1 byte" do
     io.readbits(5, :little).should == 0b1_1010
     io.readbits(2, :little).should == 0b11
   end
 
-  it "should read two bitfields totalling more than 1 byte" do
+  it "reads two bitfields totalling more than 1 byte" do
     io.readbits(6, :little).should == 0b11_1010
     io.readbits(8, :little).should == 0b00_1110_11
   end
 
-  it "should read two bitfields totalling more than 2 bytes" do
+  it "reads two bitfields totalling more than 2 bytes" do
     io.readbits(7, :little).should == 0b111_1010
     io.readbits(12, :little).should == 0b010_1100_1110_1
   end
 
-  it "should ignore unused bits when reading bytes" do
+  it "ignores unused bits when reading bytes" do
     io.readbits(3, :little).should == 0b010
     io.readbytes(1).should == [b2].pack("C")
     io.readbits(2, :little).should == 0b10
   end
 
-  it "should reset read bits to realign stream to next byte" do
+  it "resets read bits to realign stream to next byte" do
     io.readbits(3, :little).should == 0b010
     io.reset_read_bits
     io.readbits(3, :little).should == 0b110
@@ -245,40 +245,40 @@ end
 describe BinData::IO, "writing bits in big endian" do
   let(:io) { BitWriterHelper.new }
 
-  it "should write a bitfield less than 1 byte" do
+  it "writes a bitfield less than 1 byte" do
     io.writebits(0b010, 3, :big)
     io.value.should == [0b0100_0000].pack("C")
   end
 
-  it "should write a bitfield more than 1 byte" do
+  it "writes a bitfield more than 1 byte" do
     io.writebits(0b10_1001_1101, 10, :big)
     io.value.should == [0b1010_0111, 0b0100_0000].pack("CC")
   end
 
-  it "should write a bitfield more than 2 bytes" do
+  it "writes a bitfield more than 2 bytes" do
     io.writebits(0b101_1000_0010_1001_1101, 19, :big)
     io.value.should == [0b1011_0000, 0b0101_0011, 0b1010_0000].pack("CCC")
   end
 
-  it "should write two bitfields totalling less than 1 byte" do
+  it "writes two bitfields totalling less than 1 byte" do
     io.writebits(0b1_1001, 5, :big)
     io.writebits(0b00, 2, :big)
     io.value.should == [0b1100_1000].pack("C")
   end
 
-  it "should write two bitfields totalling more than 1 byte" do
+  it "writes two bitfields totalling more than 1 byte" do
     io.writebits(0b01_0101, 6, :big)
     io.writebits(0b001_1001, 7, :big)
     io.value.should == [0b0101_0100, 0b1100_1000].pack("CC")
   end
 
-  it "should write two bitfields totalling more than 2 bytes" do
+  it "writes two bitfields totalling more than 2 bytes" do
     io.writebits(0b01_0111, 6, :big)
     io.writebits(0b1_0010_1001_1001, 13, :big)
     io.value.should == [0b0101_1110, 0b0101_0011, 0b0010_0000].pack("CCC")
   end
 
-  it "should pad unused bits when writing bytes" do
+  it "pads unused bits when writing bytes" do
     io.writebits(0b101, 3, :big)
     io.writebytes([0b1011_1111].pack("C"))
     io.writebits(0b01, 2, :big)
@@ -290,40 +290,40 @@ end
 describe BinData::IO, "writing bits in little endian" do
   let(:io) { BitWriterHelper.new }
 
-  it "should write a bitfield less than 1 byte" do
+  it "writes a bitfield less than 1 byte" do
     io.writebits(0b010, 3, :little)
     io.value.should == [0b0000_0010].pack("C")
   end
 
-  it "should write a bitfield more than 1 byte" do
+  it "writes a bitfield more than 1 byte" do
     io.writebits(0b10_1001_1101, 10, :little)
     io.value.should == [0b1001_1101, 0b0000_0010].pack("CC")
   end
 
-  it "should write a bitfield more than 2 bytes" do
+  it "writes a bitfield more than 2 bytes" do
     io.writebits(0b101_1000_0010_1001_1101, 19, :little)
     io.value.should == [0b1001_1101, 0b1000_0010, 0b0000_0101].pack("CCC")
   end
 
-  it "should write two bitfields totalling less than 1 byte" do
+  it "writes two bitfields totalling less than 1 byte" do
     io.writebits(0b1_1001, 5, :little)
     io.writebits(0b00, 2, :little)
     io.value.should == [0b0001_1001].pack("C")
   end
 
-  it "should write two bitfields totalling more than 1 byte" do
+  it "writes two bitfields totalling more than 1 byte" do
     io.writebits(0b01_0101, 6, :little)
     io.writebits(0b001_1001, 7, :little)
     io.value.should == [0b0101_0101, 0b0000_0110].pack("CC")
   end
 
-  it "should write two bitfields totalling more than 2 bytes" do
+  it "writes two bitfields totalling more than 2 bytes" do
     io.writebits(0b01_0111, 6, :little)
     io.writebits(0b1_0010_1001_1001, 13, :little)
     io.value.should == [0b0101_0111, 0b1010_0110, 0b0000_0100].pack("CCC")
   end
 
-  it "should pad unused bits when writing bytes" do
+  it "pads unused bits when writing bytes" do
     io.writebits(0b101, 3, :little)
     io.writebytes([0b1011_1111].pack("C"))
     io.writebits(0b01, 2, :little)
@@ -333,7 +333,7 @@ describe BinData::IO, "writing bits in little endian" do
 end
 
 describe BinData::IO, "with changing endian" do
-  it "should not mix different endianess when reading" do
+  it "does not mix different endianess when reading" do
     b1 = 0b0110_1010
     b2 = 0b1110_0010
     str = [b1, b2].pack("CC")
@@ -343,7 +343,7 @@ describe BinData::IO, "with changing endian" do
     io.readbits(4, :little).should == 0b0010
   end
 
-  it "should not mix different endianess when writing" do
+  it "does not mix different endianess when writing" do
     io = BitWriterHelper.new
     io.writebits(0b110, 3, :big)
     io.writebits(0b010, 3, :little)