id3tag 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccd7d09b5680224f517388b816869e337d1041e
-  data.tar.gz: 608e4d9b4072420b86b5c53fe85cc30d0c7be16f
+  metadata.gz: 29c3cc9a5756c4275ce59da395e80643854f8dec
+  data.tar.gz: a5e6942ac0b6fa2d7242682c32506842421f68ac
 SHA512:
-  metadata.gz: a82c303f0abc81661f7cf9f8ec2197770ed3fcc9f85254d8680372817fd4569b709bc1942b7055de85e0cbc41f85ad04e15f20e35e52bef4157791d9cfeb503c
-  data.tar.gz: 77890b09ebe42028bc0f96ede27bc71727563ac56c87d31bc85d6a255a26843311688aac9f8b48ee606826aecd93325cb9a5d99a6995db8198346fda70fde26f
+  metadata.gz: 5bcb3bda2e129e52030e22e4bde12b016646205967a7f4ab7be13337d6bca4483f6b3b66217a822a2d9f4f5b22d0b114f58a85b9c853275d23e6a3433218b5dc
+  data.tar.gz: d711c5880bfaca342a734ee69c1f9c93e635e09ea62535d145b7dbe000b80ee496a2497e706da9c007b98bedd58afd0288a19d2e4cb23c436b9e4b204c3ebe09

data/.gitignore

@@ -1,50 +1,7 @@
-# rcov generated
 coverage
-coverage.data
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
+Gemfile.lock
 .bundle
-
-# jeweler generated
-pkg
 tags
+vendor/bundle
+bin
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
   - ruby-head
-  - 2.1.2
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
   - jruby-head
-  - rbx-2
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
+  - jruby-9.0.5.0
 matrix:
   allow_failures:
     - rvm: jruby-head

data/id3tag.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = "id3tag"
   s.version = ID3Tag::VERSION
   s.authors = ["Krists Ozols"]
-  s.email = "krists@iesals.lv"
+  s.email = "krists.ozols@gmail.com"
   s.description = "Native Ruby ID3 tag reader that aims for 100% covarage of ID3v2.x and ID3v1.x standards"
   s.summary = "Native Ruby ID3 tag reader that aims for 100% covarage of ID3v2.x and ID3v1.x standards"
   s.homepage = "http://github.com/krists/id3tag"
@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
 
-  s.add_development_dependency "bundler", "~> 1.3"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rdoc", "~> 4.1.1"
-  s.add_development_dependency "rspec", "~> 2.13.0"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency 'coveralls'
-  s.add_development_dependency 'pry'
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake", "~> 11.1.1"
+  s.add_development_dependency "rdoc", "~> 4.2.2"
+  s.add_development_dependency "rspec", "~> 3.4.0"
+  s.add_development_dependency "simplecov", "~> 0.11.2"
+  s.add_development_dependency 'coveralls', "~> 0.8.13"
+  s.add_development_dependency 'pry', "~> 0.10.3"
 end

data/lib/id3tag/audio_file.rb

@@ -24,17 +24,35 @@ module ID3Tag
     end
 
     def v1_tag_body
-      if @file.size >= ID3V1_TAG_SIZE
-        @file.seek(-ID3V1_TAG_SIZE + IDV1_TAG_IDENTIFIER.size, IO::SEEK_END)
+      if v1_tag_present?
+        @file.seek(-v1_tag_size, IO::SEEK_END)
+        @file.read
+      else
+        nil
+      end
+    end
+
+    def v1_tag_size
+      if v1_tag_present?
+        ID3V1_TAG_SIZE - IDV1_TAG_IDENTIFIER.size
       else
-        @file.rewind
+        0
       end
-      @file.read
     end
 
     def v2_tag_body
-      @file.seek(v2_tag_frame_and_padding_position)
-      @file.read(v2_tag_frame_and_padding_size)
+      if v2_tag_size > 0
+        @file.seek(v2_tag_frame_and_padding_position)
+        @file.read(v2_tag_frame_and_padding_size)
+      end
+    end
+
+    def v2_tag_size
+      if v2_tag_present?
+        v2_tag_header.tag_size
+      else
+        0
+      end
     end
 
     def v2_tag_version

data/lib/id3tag/id3_v2_tag_header.rb

@@ -19,19 +19,19 @@ module ID3Tag
     end
 
     def unsynchronisation?
-      flags_byte[7] == 1
+      0b1000_0000 & flags_byte > 0
     end
 
     def extended_header?
-      flags_byte[6] == 1
+      0b100_0000 & flags_byte > 0
     end
 
     def experimental?
-      flags_byte[5] == 1
+      0b10_0000 & flags_byte > 0
     end
 
     def footer_present?
-      flags_byte[4] == 1
+      0b1_0000 & flags_byte > 0
     end
 
     def tag_size

data/lib/id3tag/number_util.rb

@@ -3,6 +3,7 @@ module ID3Tag
     FORMAT_FOR_8_BIT_SIGNED_INTEGER = 'c'
     FORMAT_FOR_32BIT_INTEGER = 'N'
     def self.convert_string_to_32bit_integer(string)
+      raise(ArgumentError, "Input must be a string. #{string.inspect} given.") unless string.is_a?(::String)
       integers = string.unpack(FORMAT_FOR_32BIT_INTEGER)
       integers.first || raise(ArgumentError, "String: '#{string}' could not be decoded as 32-bit integer")
     end

data/lib/id3tag/tag.rb

@@ -112,11 +112,11 @@ module ID3Tag
     end
 
     def should_and_could_read_v1_frames?
-      scope.include?(:v1) && audio_file.v1_tag_present?
+      scope.include?(:v1) && audio_file.v1_tag_present? && audio_file.v1_tag_size > 0
     end
 
     def should_and_could_read_v2_frames?
-      scope.include?(:v2) && audio_file.v2_tag_present?
+      scope.include?(:v2) && audio_file.v2_tag_present? && audio_file.v2_tag_size > 0
     end
   end
 end

data/lib/id3tag/version.rb

@@ -1,3 +1,3 @@
 module ID3Tag
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/spec/features/can_read_non_audio_files_spec.rb

@@ -5,12 +5,13 @@ describe 'can read any file and does not raise errors if no tag found' do
   subject { ID3Tag.read(Tempfile.new('fake_mp3')) }
 
   it 'should return blanks' do
-    subject.title.should == nil
-    subject.artist.should == nil
-    subject.album.should == nil
-    subject.genre.should == nil
-    subject.year.should == nil
-    subject.track_nr.should == nil
-    subject.frames.should == []
+    expect(subject.title).to eq(nil)
+    expect(subject.artist).to eq(nil)
+    expect(subject.album).to eq(nil)
+    expect(subject.genre).to eq(nil)
+    expect(subject.year).to eq(nil)
+    expect(subject.track_nr).to eq(nil)
+    expect(subject.frames).to eq([])
+    expect(subject.frame_ids).to eq([])
   end
 end

data/spec/features/can_read_tag_v1_spec.rb

@@ -5,11 +5,11 @@ describe 'can read v1 info from file' do
   subject { ID3Tag.read(mp3_with_v1_1_tag) }
 
   it 'reading file with only v1 tag' do
-    subject.title.should == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaA"
-    subject.artist.should == "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbB"
-    subject.album.should == "cccccccccccccccccccccccccccccC"
-    subject.genre.should == "Blues"
-    subject.year.should == "2003"
-    subject.track_nr.should == "1"
+    expect(subject.title).to eq("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaA")
+    expect(subject.artist).to eq("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbB")
+    expect(subject.album).to eq("cccccccccccccccccccccccccccccC")
+    expect(subject.genre).to eq("Blues")
+    expect(subject.year).to eq("2003")
+    expect(subject.track_nr).to eq("1")
   end
 end

data/spec/lib/id3tag/audio_file_spec.rb

@@ -3,31 +3,89 @@ describe ID3Tag::AudioFile do
   let(:mp3_with_v1_tag) { mp3_fixture('id3v1_without_track_nr.mp3') }
   let(:mp3_with_v2_tag) { mp3_fixture('id3v2.mp3') }
   let(:mp3_with_v1_and_v2_tags) { mp3_fixture('id3v1_and_v2.mp3') }
+  let(:broken_mp3) do
+    file = Tempfile.new("broken_mp3")
+    file.write("just something..but not enough")
+    file
+  end
 
   describe "Tag presence checking methods" do
     context "reading file only with ID3v1 tag" do
       subject { described_class.new(mp3_with_v1_tag) }
-      its(:v1_tag_present?) { should be_true }
-      its(:v2_tag_present?) { should be_false }
+
+      describe '#v1_tag_present?' do
+        subject { super().v1_tag_present? }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#v1_tag_size' do
+        subject { super().v1_tag_size }
+        it { is_expected.to eq(125) }
+      end
+
+
+      describe '#v2_tag_present?' do
+        subject { super().v2_tag_present? }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#v2_tag_size' do
+        subject { super().v2_tag_size }
+        it { is_expected.to eq(0) }
+      end
     end
 
     context "reading file only with ID3v2 tag" do
       subject { described_class.new(mp3_with_v2_tag) }
-      its(:v1_tag_present?) { should be_false }
-      its(:v2_tag_present?) { should be_true }
+
+      describe '#v1_tag_present?' do
+        subject { super().v1_tag_present? }
+        it { is_expected.to eq(false) }
+      end
+
+      describe '#v1_tag_size' do
+        subject { super().v1_tag_size }
+        it { is_expected.to eq(0) }
+      end
+
+      describe '#v2_tag_present?' do
+        subject { super().v2_tag_present? }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#v2_tag_size' do
+        subject { super().v2_tag_size }
+        it { is_expected.to eq(246) }
+      end
     end
 
     context "reading file with ID3v1 and ID3v2 tags" do
       subject { described_class.new(mp3_with_v1_and_v2_tags) }
-      its(:v1_tag_present?) { should be_true }
-      its(:v2_tag_present?) { should be_true }
+
+      describe '#v1_tag_present?' do
+        subject { super().v1_tag_present? }
+        it { is_expected.to eq(true) }
+      end
+
+      describe '#v2_tag_present?' do
+        subject { super().v2_tag_present? }
+        it { is_expected.to eq(true) }
+      end
     end
   end
 
   describe "#v1_tag_body" do
-    subject { described_class.new(mp3_with_v1_tag) }
-    it "should return last 125 bytes of audio file" do
-      subject.v1_tag_body.should == File.read(mp3_with_v1_tag, 125, 579)
+    context "when reading file with alteast 125 bytes" do
+      subject { described_class.new(mp3_with_v1_tag) }
+      it "should return last 125 bytes of audio file" do
+        expect(subject.v1_tag_body).to eq(File.read(mp3_with_v1_tag, 125, 579))
+      end
+    end
+    context "when reading file with size less ID3v1 tag" do
+      subject { described_class.new(broken_mp3) }
+      it "should return as much bytes as possible" do
+        expect(subject.v1_tag_body).to eq(nil)
+      end
     end
   end
 
@@ -35,18 +93,18 @@ describe ID3Tag::AudioFile do
     context "when extended header is not present" do
       subject { described_class.new(StringIO.new("ID3\u0003\u0000\u0000\u0000\u0000\u0000\u0003ABC")) }
       it "should return frame and padding bytes" do
-        subject.v2_tag_body.should == "ABC"
+        expect(subject.v2_tag_body).to eq("ABC")
       end
     end
     context "when extended header is present" do
       subject { described_class.new(StringIO.new("ID3\u0003\u0000\u0040\u0000\u0000\u0000\u0011" + "\u0000\u0000\u0000\u000A" + ("\u0000" * 10) + "ABC")) }
       it "should return frame and padding bytes" do
-        subject.v2_tag_body.should == "ABC"
+        expect(subject.v2_tag_body).to eq("ABC")
       end
       context "when tag verison is v.2.4 and extended header size is calculated differently" do
         subject { described_class.new(StringIO.new("ID3\u0004\u0000\u0040\u0000\u0000\u0000\u0011" + "\u0000\u0000\u0000\u000A" + ("\u0000" * 6) + "ABC")) }
         it "should return frame and padding bytes" do
-          subject.v2_tag_body.should == "ABC"
+          expect(subject.v2_tag_body).to eq("ABC")
         end
       end
     end
@@ -54,8 +112,20 @@ describe ID3Tag::AudioFile do
 
   context "when reading file with v2.3.0 tag" do
     subject { described_class.new(StringIO.new("ID3\u0003\u0000")) }
-    its(:v2_tag_version) { should eq '3.0' }
-    its(:v2_tag_major_version_number) { should eq 3 }
-    its(:v2_tag_minor_version_number) { should eq 0 }
+
+    describe '#v2_tag_version' do
+      subject { super().v2_tag_version }
+      it { is_expected.to eq '3.0' }
+    end
+
+    describe '#v2_tag_major_version_number' do
+      subject { super().v2_tag_major_version_number }
+      it { is_expected.to eq 3 }
+    end
+
+    describe '#v2_tag_minor_version_number' do
+      subject { super().v2_tag_minor_version_number }
+      it { is_expected.to eq 0 }
+    end
   end
 end

data/spec/lib/id3tag/frames/util/genre_name_by_id_finder_spec.rb

@@ -7,12 +7,12 @@ describe ID3Tag::Frames::Util::GenreNames do
 
     context "when calling with id 0 what represents Blues" do
       let(:id) { 0 }
-      it { should eq('Blues') }
+      it { is_expected.to eq('Blues') }
     end
 
     context "when calling with id 17 what represents Rock" do
       let(:id) { 17 }
-      it { should eq('Rock') }
+      it { is_expected.to eq('Rock') }
     end
   end
 end

data/spec/lib/id3tag/frames/v1/comments_frame_spec.rb

@@ -2,38 +2,38 @@ require 'spec_helper'
 describe ID3Tag::Frames::V1::CommentsFrame do
   describe '#id' do
     subject { described_class.new('comments', nil).id }
-    it { should == 'comments' }
+    it { is_expected.to eq('comments') }
   end
 
   describe '#content' do
     context 'when comment is present' do
       subject { described_class.new('comments', 'some comment about the song').content }
-      it { should == 'some comment about the song' }
+      it { is_expected.to eq('some comment about the song') }
     end
 
     context 'when comment is not present' do
       subject { described_class.new('comments', '').content }
-      it { should == '' }
+      it { is_expected.to eq('') }
     end
   end
 
   describe "#text" do
     subject { described_class.new('comments', 'some comment about the song') }
     it "should be the same as #content" do
-      subject.stub(:content) { "ZXC" }
-      subject.text.should == subject.content
+      allow(subject).to receive(:content) { "ZXC" }
+      expect(subject.text).to eq(subject.content)
     end
   end
 
   describe '#language' do
     it 'should be unknown' do
-      described_class.new('comments', '').language.should eq('unknown')
+      expect(described_class.new('comments', '').language).to eq('unknown')
     end
   end
 
   describe '#desciption' do
     it 'should be unknown' do
-      described_class.new('comments', '').desciption.should eq('unknown')
+      expect(described_class.new('comments', '').desciption).to eq('unknown')
     end
   end
 end