cosmos 3.2.1 → 3.3.0

data/spec/packets/structure_item_spec.rb

@@ -17,177 +17,177 @@ module Cosmos
   describe StructureItem do
 
     describe "name=" do
-      it "should create new structure items" do
-        StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, nil).name.should eql "TEST"
+      it "creates new structure items" do
+        expect(StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, nil).name).to eql "TEST"
       end
 
-      it "should complain about non String names" do
+      it "complains about non String names" do
         expect { StructureItem.new(nil, 0, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "name must be a String but is a NilClass")
         expect { StructureItem.new(5, 0, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "name must be a String but is a Fixnum")
       end
 
-      it "should complain about blank names" do
+      it "complains about blank names" do
         expect { StructureItem.new("", 0, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "name must contain at least one character")
       end
     end
 
     describe "endianness=" do
-      it "should accept BIG_ENDIAN and LITTLE_ENDIAN" do
-        StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, nil).endianness.should eql :BIG_ENDIAN
-        StructureItem.new("test", 0, 8, :UINT, :LITTLE_ENDIAN, nil).endianness.should eql :LITTLE_ENDIAN
+      it "accepts BIG_ENDIAN and LITTLE_ENDIAN" do
+        expect(StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, nil).endianness).to eql :BIG_ENDIAN
+        expect(StructureItem.new("test", 0, 8, :UINT, :LITTLE_ENDIAN, nil).endianness).to eql :LITTLE_ENDIAN
       end
 
-      it "should complain about bad endianness" do
+      it "complains about bad endianness" do
         expect { StructureItem.new("test", 0, 8, :UINT, :BLAH, nil) }.to raise_error(ArgumentError, "TEST: unknown endianness: BLAH - Must be :BIG_ENDIAN or :LITTLE_ENDIAN")
       end
     end
 
     describe "data_type=" do
-      it "should accept INT, UINT, FLOAT, STRING, BLOCK, and DERIVED data types" do
+      it "accepts INT, UINT, FLOAT, STRING, BLOCK, and DERIVED data types" do
         %w(INT UINT FLOAT STRING BLOCK).each do |type|
-          StructureItem.new("test", 0, 32, type.to_sym, :BIG_ENDIAN, nil).data_type.should eql type.to_sym
+          expect(StructureItem.new("test", 0, 32, type.to_sym, :BIG_ENDIAN, nil).data_type).to eql type.to_sym
         end
-        StructureItem.new("test", 0, 0, :DERIVED, :BIG_ENDIAN, nil).data_type.should eql :DERIVED
+        expect(StructureItem.new("test", 0, 0, :DERIVED, :BIG_ENDIAN, nil).data_type).to eql :DERIVED
       end
 
-      it "should complain about bad data types" do
+      it "complains about bad data types" do
         expect { StructureItem.new("test", 0, 0, :UNKNOWN, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: unknown data_type: UNKNOWN - Must be :INT, :UINT, :FLOAT, :STRING, :BLOCK, or :DERIVED")
       end
     end
 
     describe "overflow=" do
-      it "should accept ERROR, ERROR_ALLOW_HEX, TRUNCATE and SATURATE overflow types" do
+      it "accepts ERROR, ERROR_ALLOW_HEX, TRUNCATE and SATURATE overflow types" do
         %w(ERROR ERROR_ALLOW_HEX TRUNCATE SATURATE).each do |type|
-          StructureItem.new("test", 0, 32, :INT, :BIG_ENDIAN, nil, type.to_sym).overflow.should eql type.to_sym
+          expect(StructureItem.new("test", 0, 32, :INT, :BIG_ENDIAN, nil, type.to_sym).overflow).to eql type.to_sym
         end
       end
 
-      it "should complain about bad overflow types" do
+      it "complains about bad overflow types" do
         expect { StructureItem.new("test", 0, 32, :INT, :BIG_ENDIAN, nil, :UNKNOWN) }.to raise_error(ArgumentError, "TEST: unknown overflow type: UNKNOWN - Must be :ERROR, :ERROR_ALLOW_HEX, :TRUNCATE, or :SATURATE")
       end
     end
 
     describe "bit_offset=" do
-      it "should compain about bad bit offsets types" do
+      it "compains about bad bit offsets types" do
         expect { StructureItem.new("test", nil, 8, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_offset must be a Fixnum")
       end
 
-      it "should complain about unaligned bit offsets" do
+      it "complains about unaligned bit offsets" do
         %w(FLOAT STRING BLOCK).each do |type|
           expect { StructureItem.new("test", 1, 32, type.to_sym, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_offset for :FLOAT, :STRING, and :BLOCK items must be byte aligned")
         end
       end
 
-      it "should complain about non zero DERIVED bit offsets" do
+      it "complains about non zero DERIVED bit offsets" do
         expect { StructureItem.new("test", 8, 0, :DERIVED, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: DERIVED items must have bit_offset of zero")
       end
     end
 
     describe "bit_size=" do
-      it "should complain about bad bit sizes types" do
+      it "complains about bad bit sizes types" do
         expect { StructureItem.new("test", 0, nil, :UINT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size must be a Fixnum")
       end
 
-      it "should complain about 0 size INT, UINT, and FLOAT" do
+      it "complains about 0 size INT, UINT, and FLOAT" do
         %w(INT UINT FLOAT).each do |type|
           expect { StructureItem.new("test", 0, 0, type.to_sym, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size cannot be negative or zero for :INT, :UINT, and :FLOAT items: 0")
         end
       end
 
-      it "should complain about bad float bit sizes" do
+      it "complains about bad float bit sizes" do
         expect { StructureItem.new("test", 0, 8, :FLOAT, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: bit_size for FLOAT items must be 32 or 64. Given: 8")
       end
 
-      it "should create 32 and 64 bit floats" do
-        StructureItem.new("test", 0, 32, :FLOAT, :BIG_ENDIAN, nil).bit_size.should eql 32
-        StructureItem.new("test", 0, 64, :FLOAT, :BIG_ENDIAN, nil).bit_size.should eql 64
+      it "creates 32 and 64 bit floats" do
+        expect(StructureItem.new("test", 0, 32, :FLOAT, :BIG_ENDIAN, nil).bit_size).to eql 32
+        expect(StructureItem.new("test", 0, 64, :FLOAT, :BIG_ENDIAN, nil).bit_size).to eql 64
       end
 
-      it "should complain about non zero DERIVED bit sizes" do
+      it "complains about non zero DERIVED bit sizes" do
         expect { StructureItem.new("test", 0, 8, :DERIVED, :BIG_ENDIAN, nil) }.to raise_error(ArgumentError, "TEST: DERIVED items must have bit_size of zero")
       end
     end
 
     describe "array_size=" do
-      it "should complain about bad array size types" do
+      it "complains about bad array size types" do
         expect { StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, "") }.to raise_error(ArgumentError, "TEST: array_size must be a Fixnum")
       end
 
-      it "should complain about array size != multiple of bit size" do
+      it "complains about array size != multiple of bit size" do
         expect { StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, 10) }.to raise_error(ArgumentError, "TEST: array_size must be a multiple of bit_size")
       end
 
-      it "should not complain about array size != multiple of bit size with negative array size" do
+      it "does not complain about array size != multiple of bit size with negative array size" do
         expect { StructureItem.new("test", 0, 32, :UINT, :BIG_ENDIAN, -8) }.not_to raise_error
       end
     end
 
     describe "<=>" do
-      it "should sort items according to positive bit offset" do
+      it "sorts items according to positive bit offset" do
         si1 = StructureItem.new("si1", 0, 8, :UINT, :BIG_ENDIAN, nil)
         si2 = StructureItem.new("si2", 8, 8, :UINT, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_truthy
-        (si1 == si2).should be_falsey
-        (si1 > si2).should be_falsey
+        expect(si1 < si2).to be_truthy
+        expect(si1 == si2).to be_falsey
+        expect(si1 > si2).to be_falsey
 
         si2 = StructureItem.new("si2", 0, 8, :UINT, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_falsey
-        (si1 == si2).should be_truthy
-        (si1 > si2).should be_falsey
+        expect(si1 < si2).to be_falsey
+        expect(si1 == si2).to be_truthy
+        expect(si1 > si2).to be_falsey
       end
 
-      it "should sort items with 0 bit offset according to bit size" do
+      it "sorts items with 0 bit offset according to bit size" do
         si1 = StructureItem.new("si1", 0, 8, :UINT, :BIG_ENDIAN, nil)
         si2 = StructureItem.new("si2", 0, 0, :BLOCK, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_falsey
-        (si1 == si2).should be_falsey
-        (si1 > si2).should be_truthy
+        expect(si1 < si2).to be_falsey
+        expect(si1 == si2).to be_falsey
+        expect(si1 > si2).to be_truthy
       end
 
-      it "should sort items according to negative bit offset" do
+      it "sorts items according to negative bit offset" do
         si1 = StructureItem.new("si1", -8, 8, :UINT, :BIG_ENDIAN, nil)
         si2 = StructureItem.new("si2", -16, 8, :UINT, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_falsey
-        (si1 == si2).should be_falsey
-        (si1 > si2).should be_truthy
+        expect(si1 < si2).to be_falsey
+        expect(si1 == si2).to be_falsey
+        expect(si1 > si2).to be_truthy
 
         si2 = StructureItem.new("si2", -8, 8, :UINT, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_falsey
+        expect(si1 < si2).to be_falsey
         # si1 == si2 even though they have different names and sizes
-        (si1 == si2).should be_truthy
-        (si1 > si2).should be_falsey
+        expect(si1 == si2).to be_truthy
+        expect(si1 > si2).to be_falsey
       end
 
-      it "should sort items according to mixed bit offset" do
+      it "sorts items according to mixed bit offset" do
         si1 = StructureItem.new("si1", 16, 8, :UINT, :BIG_ENDIAN, nil)
         si2 = StructureItem.new("si2", -8, 8, :UINT, :BIG_ENDIAN, nil)
-        (si1 < si2).should be_truthy
-        (si1 == si2).should be_falsey
-        (si1 > si2).should be_falsey
+        expect(si1 < si2).to be_truthy
+        expect(si1 == si2).to be_falsey
+        expect(si1 > si2).to be_falsey
       end
     end
 
     describe "clone" do
-      it "should duplicate the entire structure item " do
+      it "duplicates the entire structure item " do
         si1 = StructureItem.new("si1", -8, 1, :UINT, :LITTLE_ENDIAN, nil)
         si2 = si1.clone
-        (si1 == si2).should be_truthy
+        expect(si1 == si2).to be_truthy
       end
     end
 
     describe "to_hash" do
-      it "should create a Hash" do
+      it "creates a Hash" do
         item = StructureItem.new("test", 0, 8, :UINT, :BIG_ENDIAN, 16)
         hash = item.to_hash
-        hash.keys.length.should eql 7
-        hash.keys.should include('name','bit_offset','bit_size','data_type','endianness','array_size', 'overflow')
-        hash["name"].should eql "TEST"
-        hash["bit_offset"].should eql 0
-        hash["bit_size"].should eql 8
-        hash["data_type"].should eql :UINT
-        hash["endianness"].should eql :BIG_ENDIAN
-        hash["array_size"].should eql 16
-        hash["overflow"].should eql :ERROR
+        expect(hash.keys.length).to eql 7
+        expect(hash.keys).to include('name','bit_offset','bit_size','data_type','endianness','array_size', 'overflow')
+        expect(hash["name"]).to eql "TEST"
+        expect(hash["bit_offset"]).to eql 0
+        expect(hash["bit_size"]).to eql 8
+        expect(hash["data_type"]).to eql :UINT
+        expect(hash["endianness"]).to eql :BIG_ENDIAN
+        expect(hash["array_size"]).to eql 16
+        expect(hash["overflow"]).to eql :ERROR
       end
     end
 

data/spec/packets/structure_spec.rb

@@ -17,20 +17,20 @@ module Cosmos
   describe Structure do
 
     describe "initialize" do
-      it "should complain about non string buffers" do
+      it "complains about non string buffers" do
         expect { Structure.new(:BIG_ENDIAN, Array.new) }.to raise_error(TypeError, "wrong argument type Array (expected String)")
       end
 
-      it "should complain about unrecognized data types" do
+      it "complains about unrecognized data types" do
         expect { Structure.new(:BLAH) }.to raise_error(ArgumentError, "Unrecognized endianness: BLAH - Must be :BIG_ENDIAN or :LITTLE_ENDIAN")
       end
 
-      it "should create BIG_ENDIAN structures" do
-        Structure.new(:BIG_ENDIAN).default_endianness.should eql :BIG_ENDIAN
+      it "creates BIG_ENDIAN structures" do
+        expect(Structure.new(:BIG_ENDIAN).default_endianness).to eql :BIG_ENDIAN
       end
 
-      it "should create LITTLE_ENDIAN structures" do
-        Structure.new(:LITTLE_ENDIAN).default_endianness.should eql :LITTLE_ENDIAN
+      it "creates LITTLE_ENDIAN structures" do
+        expect(Structure.new(:LITTLE_ENDIAN).default_endianness).to eql :LITTLE_ENDIAN
       end
     end # describe "initialize"
 
@@ -46,16 +46,16 @@ module Cosmos
     describe "rename_item" do
       it "renames a previously defined item" do
         s = Structure.new
-        s.items["test1"].should be_nil
-        s.sorted_items[0].should be_nil
+        expect(s.items["test1"]).to be_nil
+        expect(s.sorted_items[0]).to be_nil
         s.define_item("test1", 0, 8, :UINT)
-        s.items["TEST1"].should_not be_nil
-        s.sorted_items[0].should_not be_nil
-        s.sorted_items[0].name.should eql "TEST1"
+        expect(s.items["TEST1"]).not_to be_nil
+        expect(s.sorted_items[0]).not_to be_nil
+        expect(s.sorted_items[0].name).to eql "TEST1"
         s.rename_item("TEST1", "TEST2")
-        s.items["TEST1"].should be_nil
-        s.items["TEST2"].should_not be_nil
-        s.sorted_items[0].name.should eql "TEST2"
+        expect(s.items["TEST1"]).to be_nil
+        expect(s.items["TEST2"]).not_to be_nil
+        expect(s.sorted_items[0].name).to eql "TEST2"
       end
     end
 
@@ -64,32 +64,32 @@ module Cosmos
         @s = Structure.new
       end
 
-      it "should add item to items and sorted_items" do
-        @s.items["test1"].should be_nil
-        @s.sorted_items[0].should be_nil
+      it "adds item to items and sorted_items" do
+        expect(@s.items["test1"]).to be_nil
+        expect(@s.sorted_items[0]).to be_nil
         @s.define_item("test1", 0, 8, :UINT)
-        @s.items["TEST1"].should_not be_nil
-        @s.sorted_items[0].should_not be_nil
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.defined_length.should eql 1
-        @s.fixed_size.should be true
+        expect(@s.items["TEST1"]).not_to be_nil
+        expect(@s.sorted_items[0]).not_to be_nil
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.defined_length).to eql 1
+        expect(@s.fixed_size).to be true
       end
 
       it "adds items with negative bit offsets" do
         @s.define_item("test1", -8, 8, :UINT)
-        @s.defined_length.should eql 1
+        expect(@s.defined_length).to eql 1
         @s.define_item("test2", 0, 4, :UINT)
-        @s.defined_length.should eql 2
+        expect(@s.defined_length).to eql 2
         @s.define_item("test3", 4, 4, :UINT)
-        @s.defined_length.should eql 2
+        expect(@s.defined_length).to eql 2
         @s.define_item("test4", 16, 0, :BLOCK)
-        @s.defined_length.should eql 3
+        expect(@s.defined_length).to eql 3
         @s.define_item("test5", -16, 8, :UINT)
-        @s.defined_length.should eql 4
-        @s.fixed_size.should be false
+        expect(@s.defined_length).to eql 4
+        expect(@s.fixed_size).to be false
       end
 
-      it "should add item with negative offset" do
+      it "adds item with negative offset" do
         expect { @s.define_item("test11", -64, 8, :UINT, 128) }.to raise_error(ArgumentError, "TEST11: Can't define an item with array_size 128 greater than negative bit_offset -64")
         expect { @s.define_item("test10", -64, 8, :UINT, -64) }.to raise_error(ArgumentError, "TEST10: Can't define an item with negative array_size -64 and negative bit_offset -64")
         expect { @s.define_item("test9", -64, -64, :BLOCK) }.to raise_error(ArgumentError, "TEST9: Can't define an item with negative bit_size -64 and negative bit_offset -64")
@@ -97,43 +97,43 @@ module Cosmos
         expect { @s.define_item("test7", 0, 0, :BLOCK, 64) }.to raise_error(ArgumentError, "TEST7: bit_size cannot be negative or zero for array items")
         expect { @s.define_item("test6", -24, 32, :UINT) }.to raise_error(ArgumentError, "TEST6: Can't define an item with bit_size 32 greater than negative bit_offset -24")
         @s.define_item("test5", -16, 8, :UINT)
-        @s.defined_length.should eql 2
+        expect(@s.defined_length).to eql 2
         @s.define_item("test1", -8, 8, :UINT)
-        @s.defined_length.should eql 2
+        expect(@s.defined_length).to eql 2
         @s.define_item("test2", 0, 4, :UINT)
-        @s.defined_length.should eql 3
+        expect(@s.defined_length).to eql 3
         @s.define_item("test3", 4, 4, :UINT)
-        @s.defined_length.should eql 3
+        expect(@s.defined_length).to eql 3
         @s.define_item("test4", 8, 0, :BLOCK)
-        @s.defined_length.should eql 3
-        @s.fixed_size.should be false
+        expect(@s.defined_length).to eql 3
+        expect(@s.fixed_size).to be false
       end
 
-      it "should recalulate sorted_items when adding multiple items" do
+      it "recalulates sorted_items when adding multiple items" do
         @s.define_item("test1", 8, 32, :UINT)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.defined_length.should eql 5
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.defined_length).to eql 5
         @s.define_item("test2", 0, 8, :UINT)
-        @s.sorted_items[0].name.should eql "TEST2"
-        @s.defined_length.should eql 5
+        expect(@s.sorted_items[0].name).to eql "TEST2"
+        expect(@s.defined_length).to eql 5
         @s.define_item("test3", 16, 8, :UINT)
-        @s.sorted_items[-1].name.should eql "TEST3"
-        @s.defined_length.should eql 5
-        @s.fixed_size.should be true
+        expect(@s.sorted_items[-1].name).to eql "TEST3"
+        expect(@s.defined_length).to eql 5
+        expect(@s.fixed_size).to be true
       end
 
-      it "should overwrite existing items" do
+      it "overwrites existing items" do
         @s.define_item("test1", 0, 8, :UINT)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.items["TEST1"].bit_size.should eql 8
-        @s.items["TEST1"].data_type.should eql :UINT
-        @s.defined_length.should eql 1
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.items["TEST1"].bit_size).to eql 8
+        expect(@s.items["TEST1"].data_type).to eql :UINT
+        expect(@s.defined_length).to eql 1
         @s.define_item("test1", 0, 16, :INT)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.items["TEST1"].bit_size.should eql 16
-        @s.items["TEST1"].data_type.should eql :INT
-        @s.defined_length.should eql 2
-        @s.fixed_size.should be true
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.items["TEST1"].bit_size).to eql 16
+        expect(@s.items["TEST1"].data_type).to eql :INT
+        expect(@s.defined_length).to eql 2
+        expect(@s.fixed_size).to be true
       end
     end # describe "define_item"
 
@@ -143,53 +143,53 @@ module Cosmos
       end
 
       it "adds the item to items and sorted_items" do
-        @s.items["test1"].should be_nil
-        @s.sorted_items[0].should be_nil
+        expect(@s.items["test1"]).to be_nil
+        expect(@s.sorted_items[0]).to be_nil
         si = StructureItem.new("test1",0,8,:UINT,:BIG_ENDIAN)
         @s.define(si)
-        @s.items["TEST1"].should_not be_nil
-        @s.sorted_items[0].should_not be_nil
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.defined_length.should eql 1
-        @s.fixed_size.should be true
+        expect(@s.items["TEST1"]).not_to be_nil
+        expect(@s.sorted_items[0]).not_to be_nil
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.defined_length).to eql 1
+        expect(@s.fixed_size).to be true
       end
 
       it "allows items to be defined on top of each other" do
-        @s.items["test1"].should be_nil
-        @s.sorted_items[0].should be_nil
+        expect(@s.items["test1"]).to be_nil
+        expect(@s.sorted_items[0]).to be_nil
         si = StructureItem.new("test1",0,8,:UINT,:BIG_ENDIAN)
         @s.define(si)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.items["TEST1"].bit_offset.should eql 0
-        @s.items["TEST1"].bit_size.should eql 8
-        @s.items["TEST1"].data_type.should eql :UINT
-        @s.defined_length.should eql 1
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.items["TEST1"].bit_offset).to eql 0
+        expect(@s.items["TEST1"].bit_size).to eql 8
+        expect(@s.items["TEST1"].data_type).to eql :UINT
+        expect(@s.defined_length).to eql 1
         si = StructureItem.new("test2",0,16,:INT,:BIG_ENDIAN)
         @s.define(si)
-        @s.sorted_items[1].name.should eql "TEST2"
-        @s.items["TEST2"].bit_offset.should eql 0
-        @s.items["TEST2"].bit_size.should eql 16
-        @s.items["TEST2"].data_type.should eql :INT
-        @s.defined_length.should eql 2
+        expect(@s.sorted_items[1].name).to eql "TEST2"
+        expect(@s.items["TEST2"].bit_offset).to eql 0
+        expect(@s.items["TEST2"].bit_size).to eql 16
+        expect(@s.items["TEST2"].data_type).to eql :INT
+        expect(@s.defined_length).to eql 2
         buffer = "\x01\x02"
-        @s.read_item(@s.get_item("test1"), :RAW, buffer).should eql 1
-        @s.read_item(@s.get_item("test2"), :RAW, buffer).should eql 258
+        expect(@s.read_item(@s.get_item("test1"), :RAW, buffer)).to eql 1
+        expect(@s.read_item(@s.get_item("test2"), :RAW, buffer)).to eql 258
       end
 
-      it "should overwrite existing items" do
+      it "overwrites existing items" do
         si = StructureItem.new("test1",0,8,:UINT,:BIG_ENDIAN)
         @s.define(si)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.items["TEST1"].bit_size.should eql 8
-        @s.items["TEST1"].data_type.should eql :UINT
-        @s.defined_length.should eql 1
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.items["TEST1"].bit_size).to eql 8
+        expect(@s.items["TEST1"].data_type).to eql :UINT
+        expect(@s.defined_length).to eql 1
         si = StructureItem.new("test1",0,16,:INT,:BIG_ENDIAN)
         @s.define(si)
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.items["TEST1"].bit_size.should eql 16
-        @s.items["TEST1"].data_type.should eql :INT
-        @s.defined_length.should eql 2
-        @s.fixed_size.should be true
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.items["TEST1"].bit_size).to eql 16
+        expect(@s.items["TEST1"].data_type).to eql :INT
+        expect(@s.defined_length).to eql 2
+        expect(@s.fixed_size).to be true
       end
     end
 
@@ -198,34 +198,34 @@ module Cosmos
         @s = Structure.new
       end
 
-      it "should append an item to items" do
+      it "appends an item to items" do
         @s.define_item("test1", 0, 8, :UINT)
         @s.append_item("test2", 16, :UINT)
-        @s.items["TEST2"].bit_size.should eql 16
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.sorted_items[1].name.should eql "TEST2"
-        @s.defined_length.should eql 3
+        expect(@s.items["TEST2"].bit_size).to eql 16
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.sorted_items[1].name).to eql "TEST2"
+        expect(@s.defined_length).to eql 3
       end
 
-      it "should append an item after an array item " do
+      it "appends an item after an array item " do
         @s.define_item("test1", 0, 8, :UINT, 16)
-        @s.items["TEST1"].bit_size.should eql 8
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.sorted_items[1].should be_nil
-        @s.defined_length.should eql 2
+        expect(@s.items["TEST1"].bit_size).to eql 8
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.sorted_items[1]).to be_nil
+        expect(@s.defined_length).to eql 2
         @s.append_item("test2", 16, :UINT)
-        @s.items["TEST2"].bit_size.should eql 16
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.sorted_items[1].name.should eql "TEST2"
-        @s.defined_length.should eql 4
+        expect(@s.items["TEST2"].bit_size).to eql 16
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.sorted_items[1].name).to eql "TEST2"
+        expect(@s.defined_length).to eql 4
       end
 
-      it "should complain if appending after a variably sized item" do
+      it "complains if appending after a variably sized item" do
         @s.define_item("test1", 0, 0, :BLOCK)
         expect { @s.append_item("test2", 8, :UINT) }.to raise_error(ArgumentError, "Can't append an item after a variably sized item")
       end
 
-      it "should complain if appending after a variably sized array" do
+      it "complains if appending after a variably sized array" do
         @s.define_item("test1", 0, 8, :UINT, -8)
         expect { @s.append_item("test2", 8, :UINT) }.to raise_error(ArgumentError, "Can't append an item after a variably sized item")
       end
@@ -241,13 +241,13 @@ module Cosmos
         item = StructureItem.new("test2", 0, 16, :UINT, :BIG_ENDIAN)
         @s.append(item)
         # Bit offset should change because we appended the item
-        @s.items["TEST2"].bit_offset.should eql 8
-        @s.sorted_items[0].name.should eql "TEST1"
-        @s.sorted_items[1].name.should eql "TEST2"
-        @s.defined_length.should eql 3
+        expect(@s.items["TEST2"].bit_offset).to eql 8
+        expect(@s.sorted_items[0].name).to eql "TEST1"
+        expect(@s.sorted_items[1].name).to eql "TEST2"
+        expect(@s.defined_length).to eql 3
       end
 
-      it "should complain if appending after a variably sized item" do
+      it "complains if appending after a variably sized item" do
         @s.define_item("test1", 0, 0, :BLOCK)
         expect { @s.append(@item) }.to raise_error(ArgumentError, "Can't append an item after a variably sized item")
       end
@@ -259,11 +259,11 @@ module Cosmos
         @s.define_item("test1", 0, 8, :UINT)
       end
 
-      it "should return a defined item" do
-        @s.get_item("test1").should_not be_nil
+      it "returns a defined item" do
+        expect(@s.get_item("test1")).not_to be_nil
       end
 
-      it "should complain if an item doesn't exist" do
+      it "complains if an item doesn't exist" do
         expect { @s.get_item("test2") }.to raise_error(ArgumentError, "Unknown item: test2")
       end
     end
@@ -274,15 +274,15 @@ module Cosmos
         @s.define_item("test1", 0, 8, :UINT)
       end
 
-      it "should set a defined item" do
+      it "sets a defined item" do
         item = @s.get_item("test1")
-        item.bit_size.should eql 8
+        expect(item.bit_size).to eql 8
         item.bit_size = 16
         @s.set_item(item)
-        @s.get_item("test1").bit_size.should eql 16
+        expect(@s.get_item("test1").bit_size).to eql 16
       end
 
-      it "should complain if an item doesn't exist" do
+      it "complains if an item doesn't exist" do
         item = @s.get_item("test1")
         item.name = "TEST2"
         expect { @s.set_item(item) }.to raise_error(ArgumentError, "Unknown item: TEST2 - Ensure item name is uppercase")
@@ -290,92 +290,92 @@ module Cosmos
     end
 
     describe "read_item" do
-      it "should complain if no buffer given" do
+      it "complains if no buffer given" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT)
         expect { s.read_item(s.get_item("test1"), :RAW, nil) }.to raise_error(RuntimeError, "No buffer given to read_item")
       end
 
-      it "should read data from the buffer" do
+      it "reads data from the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT)
         buffer = "\x01"
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql 1
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql 1
       end
 
-      it "should read array data from the buffer" do
+      it "reads array data from the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT, 16)
         buffer = "\x01\x02"
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql [1,2]
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql [1,2]
       end
     end
 
     describe "write_item" do
-      it "should complain if no buffer given" do
+      it "complains if no buffer given" do
         expect { Structure.new.write_item(nil, nil, nil, nil) }.to raise_error(RuntimeError, "No buffer given to write_item")
       end
 
-      it "should write data to the buffer" do
+      it "writes data to the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT)
         buffer = "\x01"
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql 1
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql 1
         s.write_item(s.get_item("test1"), 2, :RAW, buffer)
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql 2
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql 2
       end
 
-      it "should write array data to the buffer" do
+      it "writes array data to the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT, 16)
         buffer = "\x01\x02"
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql [1,2]
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql [1,2]
         s.write_item(s.get_item("test1"), [3,4], :RAW, buffer)
-        s.read_item(s.get_item("test1"), :RAW, buffer).should eql [3,4]
+        expect(s.read_item(s.get_item("test1"), :RAW, buffer)).to eql [3,4]
       end
     end
 
     describe "read" do
-      it "should complain if item doesn't exist" do
+      it "complains if item doesn't exist" do
         expect { Structure.new.read("BLAH") }.to raise_error(ArgumentError, "Unknown item: BLAH")
       end
 
-      it "should read data from the buffer" do
+      it "reads data from the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT)
         buffer = "\x01"
-        s.read("test1", :RAW, buffer).should eql 1
+        expect(s.read("test1", :RAW, buffer)).to eql 1
       end
 
-      it "should read array data from the buffer" do
+      it "reads array data from the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT, 16)
         buffer = "\x01\x02"
-        s.read("test1", :RAW, buffer).should eql [1,2]
+        expect(s.read("test1", :RAW, buffer)).to eql [1,2]
       end
     end
 
     describe "write" do
-      it "should complain if item doesn't exist" do
+      it "complains if item doesn't exist" do
         expect { Structure.new.write("BLAH", 0) }.to raise_error(ArgumentError, "Unknown item: BLAH")
       end
 
-      it "should write data to the buffer" do
+      it "writes data to the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT)
         buffer = "\x01"
-        s.read("test1", :RAW, buffer).should eql 1
+        expect(s.read("test1", :RAW, buffer)).to eql 1
         s.write("test1", 2, :RAW, buffer)
-        s.read("test1", :RAW, buffer).should eql 2
+        expect(s.read("test1", :RAW, buffer)).to eql 2
       end
 
-      it "should write array data to the buffer" do
+      it "writes array data to the buffer" do
         s = Structure.new
         s.define_item("test1", 0, 8, :UINT, 16)
         buffer = "\x01\x02"
-        s.read("test1", :RAW, buffer).should eql [1,2]
+        expect(s.read("test1", :RAW, buffer)).to eql [1,2]
         s.write("test1", [3,4], :RAW, buffer)
-        s.read("test1", :RAW, buffer).should eql [3,4]
+        expect(s.read("test1", :RAW, buffer)).to eql [3,4]
       end
     end
 
@@ -388,12 +388,12 @@ module Cosmos
 
         buffer = "\x01\x02\x03\x04\x05\x06\x07\x08"
         vals = s.read_all(:RAW, buffer)
-        vals[0][0].should eql "TEST1"
-        vals[1][0].should eql "TEST2"
-        vals[2][0].should eql "TEST3"
-        vals[0][1].should eql [1,2]
-        vals[1][1].should eql 0x0304
-        vals[2][1].should eql 0x05060708
+        expect(vals[0][0]).to eql "TEST1"
+        expect(vals[1][0]).to eql "TEST2"
+        expect(vals[2][0]).to eql "TEST3"
+        expect(vals[0][1]).to eql [1,2]
+        expect(vals[1][1]).to eql 0x0304
+        expect(vals[2][1]).to eql 0x05060708
       end
 
       it "reads all defined items synchronized" do
@@ -404,17 +404,17 @@ module Cosmos
 
         buffer = "\x01\x02\x03\x04\x05\x06\x07\x08"
         vals = s.read_all(:RAW, buffer, false)
-        vals[0][0].should eql "TEST1"
-        vals[1][0].should eql "TEST2"
-        vals[2][0].should eql "TEST3"
-        vals[0][1].should eql [1,2]
-        vals[1][1].should eql 0x0304
-        vals[2][1].should eql 0x05060708
+        expect(vals[0][0]).to eql "TEST1"
+        expect(vals[1][0]).to eql "TEST2"
+        expect(vals[2][0]).to eql "TEST3"
+        expect(vals[0][1]).to eql [1,2]
+        expect(vals[1][1]).to eql 0x0304
+        expect(vals[2][1]).to eql 0x05060708
       end
     end
 
     describe "formatted" do
-      it "should print out all the items and values" do
+      it "prints out all the items and values" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
@@ -422,13 +422,13 @@ module Cosmos
         s.write("test2", 3456)
         s.append_item("test3", 32, :BLOCK)
         s.write("test3", "\x07\x08\x09\x0A")
-        s.formatted.should include("TEST1: [1, 2]")
-        s.formatted.should include("TEST2: 3456")
-        s.formatted.should include("TEST3")
-        s.formatted.should include("00000000: 07 08 09 0A")
+        expect(s.formatted).to include("TEST1: [1, 2]")
+        expect(s.formatted).to include("TEST2: 3456")
+        expect(s.formatted).to include("TEST3")
+        expect(s.formatted).to include("00000000: 07 08 09 0A")
       end
 
-      it "should alter the indentation of the item" do
+      it "alters the indentation of the item" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
@@ -436,10 +436,10 @@ module Cosmos
         s.write("test2", 3456)
         s.append_item("test3", 32, :BLOCK)
         s.write("test3", "\x07\x08\x09\x0A")
-        s.formatted(:CONVERTED, 4).should include("    TEST1: [1, 2]")
-        s.formatted(:CONVERTED, 4).should include("    TEST2: 3456")
-        s.formatted(:CONVERTED, 4).should include("    TEST3")
-        s.formatted(:CONVERTED, 4).should include("    00000000: 07 08 09 0A")
+        expect(s.formatted(:CONVERTED, 4)).to include("    TEST1: [1, 2]")
+        expect(s.formatted(:CONVERTED, 4)).to include("    TEST2: 3456")
+        expect(s.formatted(:CONVERTED, 4)).to include("    TEST3")
+        expect(s.formatted(:CONVERTED, 4)).to include("    00000000: 07 08 09 0A")
       end
     end
 
@@ -452,35 +452,35 @@ module Cosmos
         s.write("test2", 0x0304)
         s.append_item("test3", 32, :UINT)
         s.write("test3", 0x05060708)
-        s.buffer.should eql "\x01\x02\x03\x04\x05\x06\x07\x08"
+        expect(s.buffer).to eql "\x01\x02\x03\x04\x05\x06\x07\x08"
         expect(s.buffer).to_not be s.buffer
         expect(s.buffer(false)).to be s.buffer(false)
       end
     end
 
     describe "buffer=" do
-      it "should complain if the given buffer is too small" do
+      it "complains if the given buffer is too small" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 16, :UINT)
         expect { s.buffer = "\x00" }.to raise_error(RuntimeError, "Buffer length less than defined length")
       end
 
-      it "should complain if the given buffer is too big" do
+      it "complains if the given buffer is too big" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 16, :UINT)
         expect { s.buffer = "\x00\x00\x00" }.to raise_error(RuntimeError, "Buffer length greater than defined length")
       end
 
-      it "shouldn't complain if the given buffer is too big and we're not fixed length" do
+      it "does not complain if the given buffer is too big and we're not fixed length" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT)
         s.append_item("test2", 0, :BLOCK)
         s.buffer = "\x01\x02\x03"
-        s.read("test1").should eql 1
-        s.read("test2").should eql "\x02\x03"
+        expect(s.read("test1")).to eql 1
+        expect(s.read("test2")).to eql "\x02\x03"
       end
 
-      it "should set the buffer" do
+      it "sets the buffer" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
@@ -488,18 +488,18 @@ module Cosmos
         s.write("test2", 0x0304)
         s.append_item("test3", 32, :UINT)
         s.write("test3", 0x05060708)
-        s.read("test1").should eql [1,2]
-        s.read("test2").should eql 0x0304
-        s.read("test3").should eql 0x05060708
+        expect(s.read("test1")).to eql [1,2]
+        expect(s.read("test2")).to eql 0x0304
+        expect(s.read("test3")).to eql 0x05060708
         s.buffer = "\x00\x01\x02\x03\x04\x05\x06\x07"
-        s.read("test1").should eql [0,1]
-        s.read("test2").should eql 0x0203
-        s.read("test3").should eql 0x04050607
+        expect(s.read("test1")).to eql [0,1]
+        expect(s.read("test2")).to eql 0x0203
+        expect(s.read("test3")).to eql 0x04050607
       end
     end
 
     describe "clone" do
-      it "should duplicate the structure with a new buffer" do
+      it "duplicates the structure with a new buffer" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
@@ -517,33 +517,33 @@ module Cosmos
         expect(s2.buffer(false)).to eql s.buffer(false)
         # But not the same object
         expect(s2.buffer(false)).to_not be s.buffer(false)
-        s2.read("test1").should eql [1,2]
-        s2.read("test2").should eql 0x0304
-        s2.read("test3").should eql 0x05060708
+        expect(s2.read("test1")).to eql [1,2]
+        expect(s2.read("test2")).to eql 0x0304
+        expect(s2.read("test3")).to eql 0x05060708
         s2.write("test1", [0,0])
-        s2.read("test1").should eql [0,0]
+        expect(s2.read("test1")).to eql [0,0]
         # Ensure we didn't change the original
-        s.read("test1").should eql [1,2]
+        expect(s.read("test1")).to eql [1,2]
       end
     end
 
     describe "enable_method_missing" do
-      it "should enable reading by name" do
+      it "enables reading by name" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
         s.enable_method_missing
-        s.test1.should eql [1,2]
+        expect(s.test1).to eql [1,2]
       end
 
-      it "should enable writing by name" do
+      it "enables writing by name" do
         s = Structure.new(:BIG_ENDIAN)
         s.append_item("test1", 8, :UINT, 16)
         s.write("test1", [1,2])
         s.enable_method_missing
-        s.test1.should eql [1,2]
+        expect(s.test1).to eql [1,2]
         s.test1 = [3,4]
-        s.test1.should eql [3,4]
+        expect(s.test1).to eql [3,4]
       end
 
       it "raises an exception if there is no buffer" do
@@ -553,7 +553,7 @@ module Cosmos
         expect { s.test1 }.to raise_error(/No buffer/)
       end
 
-      it "should complain if it can't find an item" do
+      it "complains if it can't find an item" do
         s = Structure.new(:BIG_ENDIAN)
         s.enable_method_missing
         expect { s.test1 }.to raise_error(ArgumentError, "Unknown item: test1")