mp3file 1.2.0 → 1.3.0

data/spec/mp3file/id3v2/header_spec.rb

@@ -6,126 +6,294 @@ include CommonHelpers
 describe Mp3file::ID3v2::Header do
   it "raises an error if the first 3 bytes don't say \"ID3\"" do
     io = StringIO.new("ID2\x03\x00\x00\x00\x00\x00\x00")
-    lambda { Mp3file::ID3v2::Header.new(io) }.should(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
+    expect { Mp3file::ID3v2::Header.new(io) }.to(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
   end
 
   it "raises an error if the major version is more than 4 (e.g., no ID3v2.5.0+)" do
     io = StringIO.new("ID3\x05\x00\x00\x00\x00\x00\x00")
-    lambda { Mp3file::ID3v2::Header.new(io) }.should(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
+    expect { Mp3file::ID3v2::Header.new(io) }.to(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
   end
 
   it "raises an error if the major version is less than 2 (e.g., no ID3v2.1.0)" do
     io = StringIO.new("ID3\x01\x00\x00\x00\x00\x00\x00")
-    lambda { Mp3file::ID3v2::Header.new(io) }.should(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
+    expect { Mp3file::ID3v2::Header.new(io) }.to(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
   end
 
   describe "flags:" do
     describe "An ID3v2.2 header with no set flags:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x00\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_2_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == false }
-      its(:compression) { should == false }
-      its(:experimental) { should == false }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_2_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.2 header with the unsync flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x80\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_2_0 }
-      its(:unsynchronized) { should == true }
-      its(:extended_header) { should == false }
-      its(:compression) { should == false }
-      its(:experimental) { should == false }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_2_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.2 header with the compression flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x40\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_2_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == false }
-      its(:compression) { should == true }
-      its(:experimental) { should == false }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_2_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.2 header with an invalid flag set" do
       it "raises an error" do
-        lambda { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x20\x00\x00\x00\x00")) }.
-          should(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
+        expect { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x20\x00\x00\x00\x00")) }.
+          to(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
       end
     end
 
     describe "An ID3v2.3 header with the extended header flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x40\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_3_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == true }
-      its(:compression) { should == false }
-      its(:experimental) { should == false }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_3_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.3 header with the experimental header flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x20\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_3_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == false }
-      its(:compression) { should == false }
-      its(:experimental) { should == true }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_3_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.3 header with the experimental header flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x20\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_3_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == false }
-      its(:compression) { should == false }
-      its(:experimental) { should == true }
-      its(:footer) { should == false }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_3_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(false) }
+      end
     end
 
     describe "An ID3v2.3 header with an invalid flag set" do
       it "raises an error" do
-        lambda { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x10\x00\x00\x00\x00")) }.
-          should(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
+        expect { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x10\x00\x00\x00\x00")) }.
+          to(raise_error(Mp3file::ID3v2::InvalidID3v2TagError))
       end
     end
 
     describe "An ID3v2.4 header with the footer header flag set:" do
       subject { Mp3file::ID3v2::Header.new(StringIO.new("ID3\x04\x00\x10\x00\x00\x00\x00")) }
-      its(:version) { should == Mp3file::ID3v2::ID3V2_4_0 }
-      its(:unsynchronized) { should == false }
-      its(:extended_header) { should == false }
-      its(:compression) { should == false }
-      its(:experimental) { should == false }
-      its(:footer) { should == true }
+
+      describe '#version' do
+        subject { super().version }
+        it { is_expected.to eq(Mp3file::ID3v2::ID3V2_4_0) }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#extended_header' do
+        subject { super().extended_header }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compression' do
+        subject { super().compression }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#experimental' do
+        subject { super().experimental }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#footer' do
+        subject { super().footer }
+        it { is_expected.to eq(true) }
+      end
     end
   end
 
   describe "#version" do
     it "detects ID3v2.2.0" do
       t = Mp3file::ID3v2::Header.new(StringIO.new("ID3\x02\x00\x00\x00\x00\x00\x00"))
-      t.version.should == Mp3file::ID3v2::ID3V2_2_0
+      expect(t.version).to eq(Mp3file::ID3v2::ID3V2_2_0)
     end
 
     it "detects ID3v2.3.0" do
       t = Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x00\x00\x00\x00\x00"))
-      t.version.should == Mp3file::ID3v2::ID3V2_3_0
+      expect(t.version).to eq(Mp3file::ID3v2::ID3V2_3_0)
     end
 
     it "detects ID3v2.4.0" do
       t = Mp3file::ID3v2::Header.new(StringIO.new("ID3\x04\x00\x00\x00\x00\x00\x00"))
-      t.version.should == Mp3file::ID3v2::ID3V2_4_0
+      expect(t.version).to eq(Mp3file::ID3v2::ID3V2_4_0)
     end
   end
 
   describe "#size" do
     it "properly reads the size of an ID3v2 tag" do
       t = Mp3file::ID3v2::Header.new(StringIO.new("ID3\x03\x00\x00\x00\x06\x49\x37"))
-      t.tag_size.should == 107703
+      expect(t.tag_size).to eq(107703)
     end
   end
 

data/spec/mp3file/id3v2/tag_spec.rb

@@ -6,13 +6,45 @@ include CommonHelpers
 describe Mp3file::ID3v2::Tag do
   describe "An empty tag" do
     subject { Mp3file::ID3v2::Tag.new(StringIO.new("ID3\x03\x00\x00\x00\x00\x00\x00")) }
-    its(:version) { should == Mp3file::ID3v2::ID3V2_3_0 }
-    its(:unsynchronized) { should == false }
-    its(:extended_header) { should == false }
-    its(:compression) { should == false }
-    its(:experimental) { should == false }
-    its(:footer) { should == false }
-    its(:size) { should == 10 }
-    its(:frames) { should == [] }
+
+    describe '#version' do
+      subject { super().version }
+      it { is_expected.to eq(Mp3file::ID3v2::ID3V2_3_0) }
+    end
+
+    describe '#unsynchronized' do
+      subject { super().unsynchronized }
+      it { is_expected.to eq(false) }
+    end
+
+    describe '#extended_header' do
+      subject { super().extended_header }
+      it { is_expected.to eq(false) }
+    end
+
+    describe '#compression' do
+      subject { super().compression }
+      it { is_expected.to eq(false) }
+    end
+
+    describe '#experimental' do
+      subject { super().experimental }
+      it { is_expected.to eq(false) }
+    end
+
+    describe '#footer' do
+      subject { super().footer }
+      it { is_expected.to eq(false) }
+    end
+
+    describe '#size' do
+      subject { super().size }
+      it { is_expected.to eq(10) }
+    end
+
+    describe '#frames' do
+      subject { super().frames }
+      it { is_expected.to eq([]) }
+    end
   end
 end

data/spec/mp3file/id3v2/version_spec.rb

@@ -6,51 +6,131 @@ include CommonHelpers
 describe Mp3file::ID3v2::Version do
   describe Mp3file::ID3v2::ID3V2_2_0 do
     subject { Mp3file::ID3v2::ID3V2_2_0 }
-    its(:vbig) { should == 2 }
-    its(:vmaj) { should == 2 }
-    its(:vmin) { should == 0 }
-    its(:to_s) { should == 'ID3v2.2.0' }
-    its(:to_byte_string) { should == "\x02\x00" }
+
+    describe '#vbig' do
+      subject { super().vbig }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#vmaj' do
+      subject { super().vmaj }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#vmin' do
+      subject { super().vmin }
+      it { is_expected.to eq(0) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq('ID3v2.2.0') }
+    end
+
+    describe '#to_byte_string' do
+      subject { super().to_byte_string }
+      it { is_expected.to eq("\x02\x00") }
+    end
   end
 
   describe Mp3file::ID3v2::ID3V2_3_0 do
     subject { Mp3file::ID3v2::ID3V2_3_0 }
-    its(:vbig) { should == 2 }
-    its(:vmaj) { should == 3 }
-    its(:vmin) { should == 0 }
-    its(:to_s) { should == 'ID3v2.3.0' }
-    its(:to_byte_string) { should == "\x03\x00" }
+
+    describe '#vbig' do
+      subject { super().vbig }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#vmaj' do
+      subject { super().vmaj }
+      it { is_expected.to eq(3) }
+    end
+
+    describe '#vmin' do
+      subject { super().vmin }
+      it { is_expected.to eq(0) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq('ID3v2.3.0') }
+    end
+
+    describe '#to_byte_string' do
+      subject { super().to_byte_string }
+      it { is_expected.to eq("\x03\x00") }
+    end
   end
 
   describe Mp3file::ID3v2::ID3V2_4_0 do
     subject { Mp3file::ID3v2::ID3V2_4_0 }
-    its(:vbig) { should == 2 }
-    its(:vmaj) { should == 4 }
-    its(:vmin) { should == 0 }
-    its(:to_s) { should == 'ID3v2.4.0' }
-    its(:to_byte_string) { should == "\x04\x00" }
+
+    describe '#vbig' do
+      subject { super().vbig }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#vmaj' do
+      subject { super().vmaj }
+      it { is_expected.to eq(4) }
+    end
+
+    describe '#vmin' do
+      subject { super().vmin }
+      it { is_expected.to eq(0) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq('ID3v2.4.0') }
+    end
+
+    describe '#to_byte_string' do
+      subject { super().to_byte_string }
+      it { is_expected.to eq("\x04\x00") }
+    end
   end
 
   describe "#<=>" do
     it("should recognize that ID3v2.2 < ID3v2.3") do
-      (Mp3file::ID3v2::ID3V2_2_0 <=> Mp3file::ID3v2::ID3V2_3_0).should == -1
+      expect(Mp3file::ID3v2::ID3V2_2_0 <=> Mp3file::ID3v2::ID3V2_3_0).to eq(-1)
     end
 
     it("should recognize that ID3v2.4 > ID3v2.2") do
-      (Mp3file::ID3v2::ID3V2_4_0 <=> Mp3file::ID3v2::ID3V2_2_0).should == 1
+      expect(Mp3file::ID3v2::ID3V2_4_0 <=> Mp3file::ID3v2::ID3V2_2_0).to eq(1)
     end
 
     it("should recognize that ID3v2.3 == ID3v2.3") do
-      (Mp3file::ID3v2::ID3V2_3_0 <=> Mp3file::ID3v2::ID3V2_3_0).should == 0
+      expect(Mp3file::ID3v2::ID3V2_3_0 <=> Mp3file::ID3v2::ID3V2_3_0).to eq(0)
     end
   end
 
   describe "#new" do
     subject { Mp3file::ID3v2::Version.new(3, 1) }
-    its(:vbig) { should == 2 }
-    its(:vmaj) { should == 3 }
-    its(:vmin) { should == 1 }
-    its(:to_s) { should == 'ID3v2.3.1' }
-    its(:to_byte_string) { should == "\x03\x01" }
+
+    describe '#vbig' do
+      subject { super().vbig }
+      it { is_expected.to eq(2) }
+    end
+
+    describe '#vmaj' do
+      subject { super().vmaj }
+      it { is_expected.to eq(3) }
+    end
+
+    describe '#vmin' do
+      subject { super().vmin }
+      it { is_expected.to eq(1) }
+    end
+
+    describe '#to_s' do
+      subject { super().to_s }
+      it { is_expected.to eq('ID3v2.3.1') }
+    end
+
+    describe '#to_byte_string' do
+      subject { super().to_byte_string }
+      it { is_expected.to eq("\x03\x01") }
+    end
   end
 end