id3tag 0.8.0 → 0.9.0

data/spec/lib/id3tag/frames/v2/genre_frame/genre_parser_24_spec.rb

@@ -9,15 +9,15 @@ describe ID3Tag::Frames::V2::GenreFrame::GenreParser24 do
     context "when version is 2.4" do
       context "with remix and cover" do
         let(:genre_string) { "RX\x00CR" }
-        it { should == ['Remix', 'Cover'] }
+        it { is_expected.to eq(['Remix', 'Cover']) }
       end
       context "with refinement and number" do
         let(:genre_string) { "ABC\x0017" }
-        it { should == ['ABC', 'Rock'] }
+        it { is_expected.to eq(['ABC', 'Rock']) }
       end
       context "with one genre" do
         let(:genre_string) { "17" }
-        it { should == ['Rock'] }
+        it { is_expected.to eq(['Rock']) }
       end
     end
 

data/spec/lib/id3tag/frames/v2/genre_frame/genre_parser_pre_24_spec.rb

@@ -9,39 +9,39 @@ describe ID3Tag::Frames::V2::GenreFrame::GenreParserPre24 do
     context "without refinements" do
       context "with one genre" do
         let(:genre_string) { '(17)' }
-        it { should == ['Rock'] }
+        it { is_expected.to eq(['Rock']) }
       end
       context "with multiple genres" do
         let(:genre_string) { '(17)(18)' }
-        it { should == ['Rock', 'Techno'] }
+        it { is_expected.to eq(['Rock', 'Techno']) }
       end
       context "with remix and cover" do
         let(:genre_string) { '(RX)(CR)' }
-        it { should == ['Remix', 'Cover'] }
+        it { is_expected.to eq(['Remix', 'Cover']) }
       end
     end
     context "with refinements" do
       context "with one genre" do
         let(:genre_string) { '(17)qwerty' }
-        it { should == ['qwerty'] }
+        it { is_expected.to eq(['qwerty']) }
       end
       context "with miltiple genres but only 1 refinement" do
         let(:genre_string) { '(0)(16)(17)qwerty' }
-        it { should == ['Blues', 'Reggae', 'qwerty'] }
+        it { is_expected.to eq(['Blues', 'Reggae', 'qwerty']) }
       end
       context "with multiple genres" do
         let(:genre_string) { '(17)qwerty(18)abcdef' }
-        it { should == ['qwerty', 'abcdef'] }
+        it { is_expected.to eq(['qwerty', 'abcdef']) }
       end
     end
     context "with refinement containing '('" do
       context "with one genre" do
         let(:genre_string) { '(55)((I think...)' }
-        it { should == ['(I think...)'] }
+        it { is_expected.to eq(['(I think...)']) }
       end
       context "with multiple genres" do
         let(:genre_string) { '(55)((I think...)(17)' }
-        it { should == ['(I think...)', 'Rock'] }
+        it { is_expected.to eq(['(I think...)', 'Rock']) }
       end
     end
   end

data/spec/lib/id3tag/frames/v2/genre_frame_spec.rb

@@ -10,7 +10,7 @@ describe ID3Tag::Frames::V2::GenreFrame do
 
   describe '#id' do
     subject { frame.id }
-    it { should == :TCON }
+    it { is_expected.to eq(:TCON) }
   end
 
   describe '#content' do
@@ -21,26 +21,26 @@ describe ID3Tag::Frames::V2::GenreFrame do
 
       context "when one genre" do
         before do
-          ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A'] }
+          allow_any_instance_of(ID3Tag::Frames::V2::GenreFrame::GenreParserPre24).to receive(:genres) { ['A'] }
         end
 
-        it { should eq('A') }
+        it { is_expected.to eq('A') }
       end
       context "when two genres" do
         before do
-          ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A', 'B'] }
+          allow_any_instance_of(ID3Tag::Frames::V2::GenreFrame::GenreParserPre24).to receive(:genres) { ['A', 'B'] }
         end
 
-        it { should eq('A, B') }
+        it { is_expected.to eq('A, B') }
       end
     end
 
     context "when tag major version is 4" do
       let(:major_version_number) { 4 }
       before do
-        ID3Tag::Frames::V2::GenreFrame::GenreParser24.any_instance.stub(:genres) { ['B'] }
+        allow_any_instance_of(ID3Tag::Frames::V2::GenreFrame::GenreParser24).to receive(:genres) { ['B'] }
       end
-      it { should eq('B') }
+      it { is_expected.to eq('B') }
     end
     context "when tag major version is 232" do
       let(:major_version_number) { 232 }
@@ -52,11 +52,11 @@ describe ID3Tag::Frames::V2::GenreFrame do
 
   describe '#inspect' do
     before do
-      frame.stub(:content) { 'Rock' }
+      allow(frame).to receive(:content) { 'Rock' }
     end
 
     it 'should be pretty inspectable' do
-      frame.inspect.should eq('<ID3Tag::Frames::V2::GenreFrame TCON: Rock>')
+      expect(frame.inspect).to eq('<ID3Tag::Frames::V2::GenreFrame TCON: Rock>')
     end
   end
 end

data/spec/lib/id3tag/frames/v2/picture_frame_spec.rb

@@ -22,36 +22,36 @@ describe ID3Tag::Frames::V2::PictureFrame do
 
     describe '#id' do
       subject { frame.id }
-      it { should == :PIC }
+      it { is_expected.to eq(:PIC) }
     end
 
     describe "mime_type" do
       subject { frame.mime_type }
-      it { should eq('image/png') }
+      it { is_expected.to eq('image/png') }
       context "when mime type is blank" do
         let(:format) { "\x00\x00\x00" }
-        it { should eq('image/') }
+        it { is_expected.to eq('image/') }
       end
     end
 
     describe "#data" do
       subject { frame.data }
-      it { should == "picture data" }
+      it { is_expected.to eq("picture data") }
     end
 
     describe "#type" do
       subject { frame.type }
-      it { should == :cover_front }
+      it { is_expected.to eq(:cover_front) }
     end
 
     describe "#description" do
       subject { frame.description }
-      it { should == "picture description" }
+      it { is_expected.to eq("picture description") }
     end
 
     describe "#content" do
       subject { frame.content }
-      it { should == "picture data" }
+      it { is_expected.to eq("picture data") }
     end
   end
 
@@ -66,42 +66,62 @@ describe ID3Tag::Frames::V2::PictureFrame do
 
     describe '#id' do
       subject { frame.id }
-      it { should == :APIC }
+      it { is_expected.to eq(:APIC) }
     end
 
     describe "#data" do
       subject { frame.data }
-      it { should == "picture data" }
+      it { is_expected.to eq("picture data") }
     end
 
     describe "#type" do
       subject { frame.type }
-      it { should == :cover_front }
+      it { is_expected.to eq(:cover_front) }
     end
 
     describe "#mime_type" do
       subject { frame.mime_type }
-      it { should == "image/png" }
+      it { is_expected.to eq("image/png") }
+      context "when mime type is omitted" do
+        let(:mime_type) { "\x00" }
+        subject { frame.mime_type }
+        it { is_expected.to eq("image/") }
+      end
     end
 
     describe "#description" do
       subject { frame.description }
-      it { should == "picture description" }
+      it { is_expected.to eq("picture description") }
     end
 
     describe "#content" do
       subject { frame.content }
-      it { should == "picture data" }
+      it { is_expected.to eq("picture data") }
     end
 
     context "when frame contains link not actual image data" do
       let(:raw_content) { "\x02-->\x00\x08\u0000a\u0000b\u0000c" }
       subject { frame }
 
-      its(:link?) { should be_true }
-      its(:mime_type) { should eq("-->") }
-      its(:description) { should eq("abc") }
-      its(:type) { should eq(:artist) }
+      describe '#link?' do
+        subject { super().link? }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#mime_type' do
+        subject { super().mime_type }
+        it { is_expected.to eq("-->") }
+      end
+
+      describe '#description' do
+        subject { super().description }
+        it { is_expected.to eq("abc") }
+      end
+
+      describe '#type' do
+        subject { super().type }
+        it { is_expected.to eq(:artist) }
+      end
     end
   end
 end

data/spec/lib/id3tag/frames/v2/text_frame_spec.rb

@@ -14,7 +14,7 @@ describe ID3Tag::Frames::V2::TextFrame do
 
   describe '#id' do
     subject { frame.id }
-    it { should == :artist }
+    it { is_expected.to eq(:artist) }
   end
 
   describe '#content' do
@@ -24,7 +24,7 @@ describe ID3Tag::Frames::V2::TextFrame do
       let(:target_encoding) { Encoding::UTF_8 }
       let(:encoding_byte) { "\x03" }
       let(:text) { "Glāzšķūņrūķīši\x00" }
-      it { should == 'Glāzšķūņrūķīši' }
+      it { is_expected.to eq('Glāzšķūņrūķīši') }
     end
 
     context "when encoding byte is not present" do
@@ -36,25 +36,25 @@ describe ID3Tag::Frames::V2::TextFrame do
       let(:target_encoding) { Encoding::ISO8859_1 }
       let(:encoding_byte) { "\x00" }
       let(:text) { "some fancy artist" }
-      it { should == 'some fancy artist' }
+      it { is_expected.to eq('some fancy artist') }
     end
 
     context "when encoding is UTF_16" do
       let(:target_encoding) { Encoding::UTF_16 }
       let(:encoding_byte) { "\x01" }
-      it { should == 'Glāzšķūņrūķīši' }
+      it { is_expected.to eq('Glāzšķūņrūķīši') }
     end
 
     context "when encoding is UTF_16BE" do
       let(:target_encoding) { Encoding::UTF_16BE }
       let(:encoding_byte) { "\x02" }
-      it { should == 'Glāzšķūņrūķīši' }
+      it { is_expected.to eq('Glāzšķūņrūķīši') }
     end
 
     context "when encoding is UTF_8" do
       let(:target_encoding) { Encoding::UTF_8 }
       let(:encoding_byte) { "\x03" }
-      it { should == 'Glāzšķūņrūķīši' }
+      it { is_expected.to eq('Glāzšķūņrūķīši') }
     end
 
     context "when UTF-16 and missing BOM" do
@@ -83,7 +83,7 @@ describe ID3Tag::Frames::V2::TextFrame do
 
   describe '#inspect' do
     it 'should be pretty inspectable' do
-      frame.inspect.should eq('<ID3Tag::Frames::V2::TextFrame artist: Glāzšķūņrūķīši>')
+      expect(frame.inspect).to eq('<ID3Tag::Frames::V2::TextFrame artist: Glāzšķūņrūķīši>')
     end
   end
 end

data/spec/lib/id3tag/frames/v2/unique_file_id_frame_spec.rb

@@ -10,22 +10,22 @@ describe ID3Tag::Frames::V2::UniqueFileIdFrame do
 
   describe '#id' do
     subject { frame.id }
-    it { should == :UFID }
+    it { is_expected.to eq(:UFID) }
   end
 
   describe '#owner_identifier' do
     subject { frame.owner_identifier }
-    it { should == 'ZXC' }
+    it { is_expected.to eq('ZXC') }
   end
 
   describe '#content' do
     subject { frame.content }
-    it { should == 'foobar' }
+    it { is_expected.to eq('foobar') }
   end
 
   describe '#inspect' do
     it 'should be pretty inspectable' do
-      frame.inspect.should eq('<ID3Tag::Frames::V2::UniqueFileIdFrame UFID: ZXC>')
+      expect(frame.inspect).to eq('<ID3Tag::Frames::V2::UniqueFileIdFrame UFID: ZXC>')
     end
   end
 end

data/spec/lib/id3tag/frames/v2/user_text_frame_spec.rb

@@ -12,8 +12,23 @@ describe ID3Tag::Frames::V2::UserTextFrame do
   let(:text) { "SUPER_FRAME\x00Glāzšķūņrūķīši" }
   subject { described_class.new(id, raw_content, flags, major_version_number) }
 
-  its(:id) { should == :TXX }
-  its(:content) { should == 'Glāzšķūņrūķīši' }
-  its(:description) { should == 'SUPER_FRAME' }
-  its(:inspect) { should eq('<ID3Tag::Frames::V2::UserTextFrame TXX: Glāzšķūņrūķīši>') }
+  describe '#id' do
+    subject { super().id }
+    it { is_expected.to eq(:TXX) }
+  end
+
+  describe '#content' do
+    subject { super().content }
+    it { is_expected.to eq('Glāzšķūņrūķīši') }
+  end
+
+  describe '#description' do
+    subject { super().description }
+    it { is_expected.to eq('SUPER_FRAME') }
+  end
+
+  describe '#inspect' do
+    subject { super().inspect }
+    it { is_expected.to eq('<ID3Tag::Frames::V2::UserTextFrame TXX: Glāzšķūņrūķīši>') }
+  end
 end

data/spec/lib/id3tag/id3_v1_frame_parser_spec.rb

@@ -11,22 +11,22 @@ describe ID3Tag::ID3V1FrameParser do
 
       it "should contain title frame" do
         frame = subject.select { |frame| frame.id == :title }.first
-        frame.content.should == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaA"
+        expect(frame.content).to eq("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaA")
       end
 
       it "should contain artist frame" do
         frame = subject.select { |frame| frame.id == :artist }.first
-        frame.content.should == "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbB"
+        expect(frame.content).to eq("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbB")
       end
 
       it "should contain album frame" do
         frame = subject.select { |frame| frame.id == :album }.first
-        frame.content.should == "cccccccccccccccccccccccccccccC"
+        expect(frame.content).to eq("cccccccccccccccccccccccccccccC")
       end
 
       it "should contain year frame" do
         frame = subject.select { |frame| frame.id == :year }.first
-        frame.content.should == "2003"
+        expect(frame.content).to eq("2003")
       end
     end
 
@@ -34,28 +34,28 @@ describe ID3Tag::ID3V1FrameParser do
       context "when reading v1.0 tag" do
         it "should contain comments frame" do
           frame = subject.select { |frame| frame.id == :comments }.first
-          frame.content.should == "dddddddddddddddddddddddddddddD"
+          expect(frame.content).to eq("dddddddddddddddddddddddddddddD")
         end
 
         it "should contain genre frame" do
           frame = subject.select { |frame| frame.id == :genre }.first
-          frame.content.should == "Blues"
+          expect(frame.content).to eq("Blues")
         end
 
         it "should not contain track nr frame" do
-          subject.select { |frame| frame.id == :track_nr }.first.should be_nil
+          expect(subject.select { |frame| frame.id == :track_nr }.first).to be_nil
         end
       end
       context "when reading v1.1 tag" do
         subject { described_class.new(frame_bytes_v1_1).frames }
         it "should contain comments frame" do
           frame = subject.select { |frame| frame.id == :comments }.first
-          frame.content.should == "dddddddddddddddddddddddddddD"
+          expect(frame.content).to eq("dddddddddddddddddddddddddddD")
         end
 
         it "should contain track nr frame" do
           frame = subject.select { |frame| frame.id == :track_nr }.first
-          frame.content.should == "1"
+          expect(frame.content).to eq("1")
         end
       end
     end
@@ -65,7 +65,7 @@ describe ID3Tag::ID3V1FrameParser do
     let(:tag_body) { File.read mp3_fixture("pov_20131018-2100a.mp3.v1_tag_body") }
     subject { described_class.new(tag_body) }
     it "have title" do
-      subject.frames.find { |f| f.id == :title }.content.should eq("pov_20131018-2100a.mp3")
+      expect(subject.frames.find { |f| f.id == :title }.content).to eq("pov_20131018-2100a.mp3")
     end
   end
 end

data/spec/lib/id3tag/id3_v2_frame_parser_spec.rb

@@ -6,8 +6,8 @@ describe ID3Tag::ID3V2FrameParser do
     let(:tag_major_version) { 2 }
     let(:frame_bytes) { "TP2\u0000\u0000\u0004\u0000ABC" + "TP1\u0000\u0000\u0004\u0000DEF" }
     it "should fabricate frames" do
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TP2', "\u0000ABC", nil, 2).once
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TP1', "\u0000DEF", nil, 2).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TP2', "\u0000ABC", nil, 2).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TP1', "\u0000DEF", nil, 2).once
       subject.frames
     end
   end
@@ -15,8 +15,8 @@ describe ID3Tag::ID3V2FrameParser do
     let(:tag_major_version) { 3 }
     let(:frame_bytes) { "TIT2\u0000\u0000\u0000\u0004\u0000\u0000\u0000ABC" + "TIT1\u0000\u0000\u0000\u0004\u0000\u0000\u0000DEF" }
     it "should fabricate frames" do
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TIT2', "\u0000ABC", "\u0000\u0000", 3).once
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TIT1', "\u0000DEF", "\u0000\u0000", 3).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TIT2', "\u0000ABC", "\u0000\u0000", 3).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TIT1', "\u0000DEF", "\u0000\u0000", 3).once
       subject.frames
     end
   end
@@ -24,8 +24,8 @@ describe ID3Tag::ID3V2FrameParser do
     let(:tag_major_version) { 4 }
     let(:frame_bytes) { "TIT2\u0000\u0000\u0000\u0004\u0000\u0000\u0000ABC" + "TIT1\u0000\u0000\u0000\u0004\u0000\u0000\u0000DEF" }
     it "should fabricate frames" do
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TIT2', "\u0000ABC", "\u0000\u0000", 4).once
-      ID3Tag::Frames::V2::FrameFabricator.should_receive(:fabricate).with('TIT1', "\u0000DEF", "\u0000\u0000", 4).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TIT2', "\u0000ABC", "\u0000\u0000", 4).once
+      expect(ID3Tag::Frames::V2::FrameFabricator).to receive(:fabricate).with('TIT1', "\u0000DEF", "\u0000\u0000", 4).once
       subject.frames
     end
   end