mp3file 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9ad0218bd03684169d8f12f4bbe90a47388ea4a
-  data.tar.gz: 345deef9fcc2f91c5cdd0e233cc07973fdab9b49
+SHA256:
+  metadata.gz: 02d2af45ba050fcd79a6ad1cf2a9293e881be810be1a2c89471d152aea8a1e4d
+  data.tar.gz: c4f1d11342e60b7c1ff8cc1a55a2f95f3e635c1f8898c0959e4a6d827e85140b
 SHA512:
-  metadata.gz: 6c45bef09f17af0e2fa3f2d42329a1a3fc1267c123478182a680fc0ad696835892786f6e62464880c6f08387028fbdb7ad3ba87a14d68f58ca69c560a50a64c4
-  data.tar.gz: 79c80620a99932962e312a0343b4e8c090ae3ded864201b32924b91fca302758bad64c292109829e5868853e7ac954d9d9c1b810930a7347702efffb16348728
+  metadata.gz: 46ac99a44bc6e04762683c2ee0f4f7b18f96d170a5e6cb7f1230d85041298e5de57997e101fe7a73bd020500e8c61292b3c391fba60ddeb59b82600d1a976c8b
+  data.tar.gz: e1de3df56fd73be4c2598827cf1669d00c9317c1f748a945cc87d26a6598c244506b694b1256207919853d343c50833ed4a941d7b7d955430015bef23b581620

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.6
-  - 2.1.9
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.3.5
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0

data/lib/mp3file/mp3_header.rb

@@ -118,6 +118,10 @@ module Mp3file
       @side_bytes = SIDE_BYTES[head.version][head.mode]
     end
 
+    def duration
+      @samples.to_f / @samplerate
+    end
+
     def to_i
       @raw.to_binary_s
         .reverse

data/lib/mp3file/version.rb

@@ -1,3 +1,3 @@
 module Mp3file
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/mp3file.gemspec

@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "mp3file"
 
-  s.add_development_dependency('rspec', '~> 2.0', '< 2.99')
+  s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('rake')
   s.add_development_dependency('pry')
 
-  s.add_dependency('bindata', '~> 2.3.0')
+  s.add_dependency('bindata', '~> 2.4.0')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/mp3file/id3v1_tag_spec.rb

@@ -5,8 +5,8 @@ include CommonHelpers
 
 describe Mp3file::ID3v1Tag do
   it "rejects an ID3v1 tag if it doesn't begin with TAG" do
-    lambda { Mp3file::ID3v1Tag.parse(StringIO.new("\x00" * 128)) }.
-      should(raise_error(Mp3file::InvalidID3v1TagError))
+    expect { Mp3file::ID3v1Tag.parse(StringIO.new("\x00" * 128)) }.
+      to(raise_error(Mp3file::InvalidID3v1TagError))
   end
 
   describe "When created with a properly-formatted ID3v1 tag" do
@@ -20,13 +20,40 @@ describe Mp3file::ID3v1Tag do
       Mp3file::ID3v1Tag.parse(StringIO.new('TAG' + title + artist + album + year + comment + genre))
     end
 
-    its(:title) { should == 'Big Dipper' }
-    its(:artist) { should == 'Cracker' }
-    its(:album) { should == 'The Golden Age' }
-    its(:year) { should == '1996' }
-    its(:comment) { should == 'This is a comment' }
-    its(:track) { should == nil }
-    its(:genre) { should == 'Rock' }
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq('Big Dipper') }
+    end
+
+    describe '#artist' do
+      subject { super().artist }
+      it { is_expected.to eq('Cracker') }
+    end
+
+    describe '#album' do
+      subject { super().album }
+      it { is_expected.to eq('The Golden Age') }
+    end
+
+    describe '#year' do
+      subject { super().year }
+      it { is_expected.to eq('1996') }
+    end
+
+    describe '#comment' do
+      subject { super().comment }
+      it { is_expected.to eq('This is a comment') }
+    end
+
+    describe '#track' do
+      subject { super().track }
+      it { is_expected.to eq(nil) }
+    end
+
+    describe '#genre' do
+      subject { super().genre }
+      it { is_expected.to eq('Rock') }
+    end
   end
 
   describe "When created with a properly-formatted ID3v1.1 tag" do
@@ -41,22 +68,73 @@ describe Mp3file::ID3v1Tag do
       Mp3file::ID3v1Tag.parse(StringIO.new('TAG' + title + artist + album + year + comment + tracknum + genre))
     end
 
-    its(:title) { should == 'Big Dipper' }
-    its(:artist) { should == 'Cracker' }
-    its(:album) { should == 'The Golden Age' }
-    its(:year) { should == '1996' }
-    its(:comment) { should == 'This is a comment' }
-    its(:track) { should == 3 }
-    its(:genre) { should == 'Rock' }
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq('Big Dipper') }
+    end
+
+    describe '#artist' do
+      subject { super().artist }
+      it { is_expected.to eq('Cracker') }
+    end
+
+    describe '#album' do
+      subject { super().album }
+      it { is_expected.to eq('The Golden Age') }
+    end
+
+    describe '#year' do
+      subject { super().year }
+      it { is_expected.to eq('1996') }
+    end
+
+    describe '#comment' do
+      subject { super().comment }
+      it { is_expected.to eq('This is a comment') }
+    end
+
+    describe '#track' do
+      subject { super().track }
+      it { is_expected.to eq(3) }
+    end
+
+    describe '#genre' do
+      subject { super().genre }
+      it { is_expected.to eq('Rock') }
+    end
   end
 
   describe "When created with a blank ID3v1 tag" do
     subject { Mp3file::ID3v1Tag.parse(StringIO.new("TAG" + ("\x00" * 125))) }
-    its(:title) { should == "" }
-    its(:artist) { should == "" }
-    its(:album) { should == "" }
-    its(:comment) { should == "" }
-    its(:track) { should == nil }
-    its(:genre) { should == 'Blues' }
+
+    describe '#title' do
+      subject { super().title }
+      it { is_expected.to eq("") }
+    end
+
+    describe '#artist' do
+      subject { super().artist }
+      it { is_expected.to eq("") }
+    end
+
+    describe '#album' do
+      subject { super().album }
+      it { is_expected.to eq("") }
+    end
+
+    describe '#comment' do
+      subject { super().comment }
+      it { is_expected.to eq("") }
+    end
+
+    describe '#track' do
+      subject { super().track }
+      it { is_expected.to eq(nil) }
+    end
+
+    describe '#genre' do
+      subject { super().genre }
+      it { is_expected.to eq('Blues') }
+    end
   end
 end

data/spec/mp3file/id3v2/bit_padded_int_spec.rb

@@ -3,55 +3,55 @@ require File.dirname(__FILE__) + '/../../../lib/mp3file'
 describe Mp3file::ID3v2::BitPaddedInt do
   describe ".unpad_number" do
     it "returns 0 when unpadding 0" do
-      Mp3file::ID3v2::BitPaddedInt.unpad_number(0).should == 0
+      expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0)).to eq(0)
     end
 
     context "without specifying bits" do
       it "returns the least significant 7 bits of each byte in a 4-byte number" do
-        Mp3file::ID3v2::BitPaddedInt.unpad_number(0xFF_FF_FF_FF).
-          should == 0x0F_FF_FF_FF
-        Mp3file::ID3v2::BitPaddedInt.unpad_number(0b0101_0101_0101_0101_0101_0101_0101_0101).
-          should == 0b0000_1010_1011_0101_0110_1010_1101_0101
-        Mp3file::ID3v2::BitPaddedInt.unpad_number(0b1010_1010_1010_1010_1010_1010_1010_1010).
-          should == 0b0000_0101_0100_1010_1001_0101_0010_1010
+        expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0xFF_FF_FF_FF)).
+          to eq(0x0F_FF_FF_FF)
+        expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0b0101_0101_0101_0101_0101_0101_0101_0101)).
+          to eq(0b0000_1010_1011_0101_0110_1010_1101_0101)
+        expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0b1010_1010_1010_1010_1010_1010_1010_1010)).
+          to eq(0b0000_0101_0100_1010_1001_0101_0010_1010)
       end
     end
 
     context "specifying bits as n" do
       it "returns the least significant n bits from each byte of a 4-byte number" do
         1.upto(7) do |n|
-          Mp3file::ID3v2::BitPaddedInt.unpad_number(0xFF_FF_FF_FF, n).
-            should == 16**n - 1
+          expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0xFF_FF_FF_FF, n)).
+            to eq(16**n - 1)
         end
-        Mp3file::ID3v2::BitPaddedInt.unpad_number(0b0101_0101_0101_0101_0101_0101_0101_0101, 5).
-          should == 0b1010_1101_0110_1011_0101
-        Mp3file::ID3v2::BitPaddedInt.unpad_number(0b1010_1010_1010_1010_1010_1010_1010_1010, 3).
-          should == 0b1001_001_0010
+        expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0b0101_0101_0101_0101_0101_0101_0101_0101, 5)).
+          to eq(0b1010_1101_0110_1011_0101)
+        expect(Mp3file::ID3v2::BitPaddedInt.unpad_number(0b1010_1010_1010_1010_1010_1010_1010_1010, 3)).
+          to eq(0b1001_001_0010)
       end
     end
   end
 
   describe ".pad_number" do
     it "returns 0 when padding 0" do
-      Mp3file::ID3v2::BitPaddedInt.pad_number(0).should == 0
+      expect(Mp3file::ID3v2::BitPaddedInt.pad_number(0)).to eq(0)
     end
 
     context "without specifying bits" do
       it "keeps the least significant 28 bits of a 4-byte number and pads each byte with a 0" do
-        Mp3file::ID3v2::BitPaddedInt.pad_number(0xFF_FF_FF_FF).
-          should == 0x7F_7F_7F_7F
-        Mp3file::ID3v2::BitPaddedInt.pad_number(0b0101_0101_0101_0101_0101_0101_0101_0101).
-          should == 0b0010_1010_0101_0101_0010_1010_0101_0101
-        Mp3file::ID3v2::BitPaddedInt.pad_number(0b1010_1010_1010_1010_1010_1010_1010_1010).
-          should == 0b0101_0101_0010_1010_0101_0101_0010_1010
+        expect(Mp3file::ID3v2::BitPaddedInt.pad_number(0xFF_FF_FF_FF)).
+          to eq(0x7F_7F_7F_7F)
+        expect(Mp3file::ID3v2::BitPaddedInt.pad_number(0b0101_0101_0101_0101_0101_0101_0101_0101)).
+          to eq(0b0010_1010_0101_0101_0010_1010_0101_0101)
+        expect(Mp3file::ID3v2::BitPaddedInt.pad_number(0b1010_1010_1010_1010_1010_1010_1010_1010)).
+          to eq(0b0101_0101_0010_1010_0101_0101_0010_1010)
       end
     end
 
     context "specifying bits as n" do
       it "keeps the bottom n*4 bits and pads each byte with 0s" do
         1.upto(7) do |n|
-          Mp3file::ID3v2::BitPaddedInt.pad_number(0xFF_FF_FF_FF, n).
-            should == (2**n - 1)*(256**3 + 256**2 + 256**1 + 1)
+          expect(Mp3file::ID3v2::BitPaddedInt.pad_number(0xFF_FF_FF_FF, n)).
+            to eq((2**n - 1)*(256**3 + 256**2 + 256**1 + 1))
         end
       end
     end

data/spec/mp3file/id3v2/frame_header_spec.rb

@@ -9,18 +9,66 @@ describe Mp3file::ID3v2::FrameHeader do
 
     describe("A 15-byte long TT2 frame header.") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TT2\x00\x00\x0f"), tag) }
-      its(:frame_id) { should == 'TT2' }
-      its(:size) { should == 21 }
-      its(:frame_size) { should == 15 }
-      its(:preserve_on_altered_tag) { should == false }
-      its(:preserve_on_altered_file) { should == false }
-      its(:read_only) { should == false }
-      its(:compressed) { should == false }
-      its(:encrypted) { should == false }
-      its(:encryption_type) { should be_nil }
-      its(:group) { should be_nil }
-      its(:unsynchronized) { should == false }
-      its(:data_length) { should == 0 }
+
+      describe '#frame_id' do
+        subject { super().frame_id }
+        it { is_expected.to eq('TT2') }
+      end
+
+      describe '#size' do
+        subject { super().size }
+        it { is_expected.to eq(21) }
+      end
+
+      describe '#frame_size' do
+        subject { super().frame_size }
+        it { is_expected.to eq(15) }
+      end
+
+      describe '#preserve_on_altered_tag' do
+        subject { super().preserve_on_altered_tag }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#preserve_on_altered_file' do
+        subject { super().preserve_on_altered_file }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#read_only' do
+        subject { super().read_only }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compressed' do
+        subject { super().compressed }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encrypted' do
+        subject { super().encrypted }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encryption_type' do
+        subject { super().encryption_type }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#group' do
+        subject { super().group }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#data_length' do
+        subject { super().data_length }
+        it { is_expected.to eq(0) }
+      end
     end
   end
   
@@ -37,34 +85,130 @@ describe Mp3file::ID3v2::FrameHeader do
     
     describe("A 9-byte TIT2 frame header.") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TIT2\x00\x00\x00\x09\x00\x00"), tag) }
-      its(:frame_id) { should == 'TIT2' }
-      its(:size) { should == 19 }
-      its(:frame_size) { should == 9 }
-      its(:preserve_on_altered_tag) { should == false }
-      its(:preserve_on_altered_file) { should == false }
-      its(:read_only) { should == false }
-      its(:compressed) { should == false }
-      its(:encrypted) { should == false }
-      its(:encryption_type) { should be_nil }
-      its(:group) { should be_nil }
-      its(:unsynchronized) { should == false }
-      its(:data_length) { should == 0 }
+
+      describe '#frame_id' do
+        subject { super().frame_id }
+        it { is_expected.to eq('TIT2') }
+      end
+
+      describe '#size' do
+        subject { super().size }
+        it { is_expected.to eq(19) }
+      end
+
+      describe '#frame_size' do
+        subject { super().frame_size }
+        it { is_expected.to eq(9) }
+      end
+
+      describe '#preserve_on_altered_tag' do
+        subject { super().preserve_on_altered_tag }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#preserve_on_altered_file' do
+        subject { super().preserve_on_altered_file }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#read_only' do
+        subject { super().read_only }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compressed' do
+        subject { super().compressed }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encrypted' do
+        subject { super().encrypted }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encryption_type' do
+        subject { super().encryption_type }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#group' do
+        subject { super().group }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#data_length' do
+        subject { super().data_length }
+        it { is_expected.to eq(0) }
+      end
     end
 
     describe("A TIT2 header with all of its flags set") do
       subject { Mp3file::ID3v2::FrameHeader.new(StringIO.new("TIT2\x00\x00\x00\x09\x00\x00"), tag) }
-      its(:frame_id) { should == 'TIT2' }
-      its(:size) { should == 19 }
-      its(:frame_size) { should == 9 }
-      its(:preserve_on_altered_tag) { should == false }
-      its(:preserve_on_altered_file) { should == false }
-      its(:read_only) { should == false }
-      its(:compressed) { should == false }
-      its(:encrypted) { should == false }
-      its(:encryption_type) { should be_nil }
-      its(:group) { should be_nil }
-      its(:unsynchronized) { should == false }
-      its(:data_length) { should == 0 }
+
+      describe '#frame_id' do
+        subject { super().frame_id }
+        it { is_expected.to eq('TIT2') }
+      end
+
+      describe '#size' do
+        subject { super().size }
+        it { is_expected.to eq(19) }
+      end
+
+      describe '#frame_size' do
+        subject { super().frame_size }
+        it { is_expected.to eq(9) }
+      end
+
+      describe '#preserve_on_altered_tag' do
+        subject { super().preserve_on_altered_tag }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#preserve_on_altered_file' do
+        subject { super().preserve_on_altered_file }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#read_only' do
+        subject { super().read_only }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#compressed' do
+        subject { super().compressed }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encrypted' do
+        subject { super().encrypted }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#encryption_type' do
+        subject { super().encryption_type }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#group' do
+        subject { super().group }
+        it { is_expected.to be_nil }
+      end
+
+      describe '#unsynchronized' do
+        subject { super().unsynchronized }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#data_length' do
+        subject { super().data_length }
+        it { is_expected.to eq(0) }
+      end
     end
   end