id3tag 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmYzYTExMDI2NWEzZjk2N2RhMTE3OTlmMDE0MTI1ZDY2MDRkM2Q0Mg==
+    NzNiYTE0YzFlYTA3ZGVhZDVhMDA4ZWUwNTU4ODcxNTc0ODQzMDg4MQ==
   data.tar.gz: !binary |-
-    YTNmZTcwZGQzMTM3ZWEwNmE1NzJmMmQzYWFhMzI5MDQ0ZmFlN2NlYw==
+    ODNiYzM1NTUzNDg4YmJiNGExY2M4YjdkZjg4MjZlODYzMDc1YzNlOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWEwOTQ5MzU4MDU3YWJjYzcyOTVhM2M5NDhlYzcxZDc2ZTNjMTViYmJjM2Zh
-    OTNlNWEyYzQzODcyOTY3ZGNiMDIzN2MyZGM2MjM2ZjQ1MDMxMDU0MWI5NDcw
-    NmNmZDM2NmUzZTJhNDE0OWVjZTcyNzYzMWFiMDFiZjQ2YTQ0ODQ=
+    NTc3ZDYzY2FiYWEwNTgzOGU4MjM1NDYxYTU1NDgyNzZlYWVhNGRjOTAzZDk1
+    YmVhMTViOThlYmMxZDRkNzVmMDRkMGViZGU2MWY5ZjViY2IxMTMyOTIwYjUy
+    NmRhZWNkNDliMjA2MDliMGFmNDM3MzI5NWVmZTM0OTNjY2QzMmM=
   data.tar.gz: !binary |-
-    ZTdkZDA0ZTdjOTMwNjE0OWE5Mzg1NGExMDQ4N2FkYTFlYWY0ZmY5OTg4NjFj
-    MDdmYWY0YzMxZjI4Njc5YWFjMWQzNmI2MmFiMDg5YTA3YTY0ZjljMWNjMGNl
-    OGI5OGYyOGY4ZDRiMzU0Y2ZmMTkxY2NhZjIyYmE3YWRmOWEyOTc=
+    MGE3NWQwMGM4MmQ3M2E3ZTkxNWMxYzkzODk2MTAxOThjYTc4ODllMGI1Yjgy
+    MGU1ZTdhZTMyYjdlYmFmMzFlMDZiZjIyN2IzMzk0NjYxZTJiNzk3YzdjMzg0
+    OTNmN2EwMWY5NGM3MzZkMmEwZDkwZmI0MmZkYTY2NzNiNjkzNTk=

data/README.md

@@ -25,7 +25,8 @@ mp3_file = File.open('/path/to/your/favorite_song.mp3')
 tag = ID3Tag.read(mp3_file)
 puts "#{tag.artist} - #{tag.title}"
 ```
-`ID3Tag::Tag` class provides easy accessors to frames like `artist`, `title`, `album`, `year`, `comments`, `track_nr`, `genre` but you can read any frame by using `get_frame` or `get_frame_content`.
+`ID3Tag::Tag` class provides easy accessors to frames like `artist`, `title`, `album`, `year`, `track_nr`, `genre` but you can read any frame by using `get_frame(id)` or `get_frame_content(id)` or browsing all frames by calling `frames`.
+When using easy accessors to frames like `artist` the reader will look for v.2.x tags artist frame first and if it can not find it artist frame from v1.x will be returned (if v1.x tag exists)
 
 ```ruby
 mp3s = Dir.entries("/some/dir").select { |filename| filename =~ /\.mp3/i }
@@ -37,7 +38,6 @@ mp3s.each do |file|
     puts tag.title
     puts tag.album
     puts tag.year
-    puts tag.comments
     puts tag.track_nr
     puts tag.genre
     puts "---"
@@ -45,8 +45,16 @@ mp3s.each do |file|
   end
 end
 ```
+By default `ID3Tag` reads both v1.x and v2.x tags but it is possible to specify only one of them:
+```ruby
+ID3Tag.read(file,:all) # default behaviour
+ID3Tag.read(file,:v1) # Reads only v1.x tag
+ID3Tag.read(file,:v2) # Reads only v2.x tag
+```
+
 You can inspect tag by calling `frame_ids` to see available frame ids or `frames` to return all frames
 
+
 ## Features
 
 * Can read v1.x, v2.2.x, v2.3.x, v2.4.x tags

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/id3tag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "id3tag"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Krists Ozols"]
-  s.date = "2013-05-01"
+  s.date = "2013-05-13"
   s.description = "Native Ruby ID3 tag reader that aims for 100% covarage of ID3v2.x and ID3v1.x standards"
   s.email = "krists@iesals.lv"
   s.extra_rdoc_files = [
@@ -51,6 +51,9 @@ Gem::Specification.new do |s|
     "lib/id3tag/string_util.rb",
     "lib/id3tag/synchsafe_integer.rb",
     "lib/id3tag/tag.rb",
+    "lib/id3tag/unsynchronization.rb",
+    "spec/features/can_read_non_audio_files_spec.rb",
+    "spec/features/can_read_tag_v1_spec.rb",
     "spec/fixtures/id3v1_and_v2.mp3",
     "spec/fixtures/id3v1_with_track_nr.mp3",
     "spec/fixtures/id3v1_without_track_nr.mp3",
@@ -63,8 +66,10 @@ Gem::Specification.new do |s|
     "spec/lib/id3tag/frames/v1/track_nr_frame_spec.rb",
     "spec/lib/id3tag/frames/v2/basic_frame_spec.rb",
     "spec/lib/id3tag/frames/v2/comments_frame_spec.rb",
+    "spec/lib/id3tag/frames/v2/frame_fabricator_spec.rb",
     "spec/lib/id3tag/frames/v2/genre_frame/genre_parser_24_spec.rb",
     "spec/lib/id3tag/frames/v2/genre_frame/genre_parser_pre_24_spec.rb",
+    "spec/lib/id3tag/frames/v2/genre_frame/genre_parser_spec.rb",
     "spec/lib/id3tag/frames/v2/genre_frame_spec.rb",
     "spec/lib/id3tag/frames/v2/text_frame_spec.rb",
     "spec/lib/id3tag/frames/v2/unique_file_id_frame_spec.rb",

data/lib/id3tag.rb

@@ -1,9 +1,8 @@
-require "set"
 require "stringio"
-
 require "id3tag/synchsafe_integer"
 require "id3tag/audio_file"
 require "id3tag/id3_v2_tag_header"
+require "id3tag/unsynchronization"
 require "id3tag/number_util"
 require "id3tag/string_util"
 require "id3tag/id3_v1_frame_parser"
@@ -26,7 +25,7 @@ require "id3tag/frames/v2/genre_frame/genre_parser_24"
 require "id3tag/frames/v2/frame_fabricator"
 
 module ID3Tag
-  def self.read(source, version = nil)
+  def self.read(source, version = :all)
     tag = Tag.read(source, version)
     yield tag if block_given?
     tag

data/lib/id3tag/audio_file.rb

@@ -41,16 +41,6 @@ module ID3Tag
       v2_tag_header.minor_version_number
     end
 
-    def greatest_tag_version
-      if v2_tag_present?
-        2
-      elsif v1_tag_present?
-        1
-      else
-        nil
-      end
-    end
-
     private
 
     def v2_tag_frame_and_padding_position

data/lib/id3tag/frame_id_advisor.rb

@@ -44,7 +44,13 @@ module ID3Tag
     end
 
     def advise(frame_name)
-      COMMON_FRAME_IDS_BY_VERSION["v#{@version}.#{@major_version}"][frame_name]
+      version_ids && version_ids[frame_name]
+    end
+
+    private
+
+    def version_ids
+      COMMON_FRAME_IDS_BY_VERSION["v#{@version}.#{@major_version}"]
     end
   end
 end

data/lib/id3tag/id3_v1_frame_parser.rb

@@ -12,7 +12,7 @@ module ID3Tag
     private
 
     def get_frames
-      frames = Set.new
+      frames = []
       frames << title_frame
       frames << artist_frame
       frames << album_frame

data/lib/id3tag/id3_v2_tag_header.rb

@@ -38,6 +38,10 @@ module ID3Tag
       @tag_size ||= get_tag_size
     end
 
+    def inspect
+      "<#{self.class.name} version:2.#{version_number} size:#{tag_size} unsync:#{unsynchronisation?} ext.header:#{extended_header?} experimental:#{experimental?} footer:#{footer_present?}>"
+    end
+
     private
 
     def flags_byte

data/lib/id3tag/string_util.rb

@@ -3,5 +3,17 @@ module ID3Tag
     def self.blank?(string)
       string !~ /[^[:space:]]/
     end
+
+    def self.do_unsynchronization(input)
+      unsynch = Unsynchronization.new(input)
+      unsynch.apply
+      unsynch.output
+    end
+
+    def self.undo_unsynchronization(input)
+      unsynch = Unsynchronization.new(input)
+      unsynch.remove
+      unsynch.output
+    end
   end
 end

data/lib/id3tag/tag.rb

@@ -3,48 +3,37 @@ module ID3Tag
     class MultipleFrameError < StandardError; end
 
     class << self
-      def read(source, version = nil)
+      def read(source, version = :all)
         new(source, version)
       end
     end
 
-    def initialize(source, version = nil)
+    def initialize(source, version = :all)
       @source, @version = source, version
     end
 
     def artist
-      get_frame_content(frame_id_by_name(:artist))
+      get_frame_content(frame_id(:v2, :artist), frame_id(:v1, :artist))
     end
 
     def title
-      get_frame_content(frame_id_by_name(:title))
+      get_frame_content(frame_id(:v2, :title), frame_id(:v1, :title))
     end
 
     def album
-      get_frame_content(frame_id_by_name(:album))
+      get_frame_content(frame_id(:v2, :album), frame_id(:v1, :album))
     end
 
     def year
-      get_frame_content(frame_id_by_name(:year))
-    end
-
-    def comments(language = nil)
-      all_comments_frames = get_frames(frame_id_by_name(:comments))
-      comments_frame = if language
-        all_comments_frames.select { |frame| frame.language == language.to_s.downcase }.first
-      else
-        in_english = all_comments_frames.select { |frame| frame.language == 'eng' }
-        in_english.first || all_comments_frames.first
-      end
-      comments_frame && comments_frame.content
+      get_frame_content(frame_id(:v2, :year), frame_id(:v1, :year))
     end
 
     def track_nr
-      get_frame_content(frame_id_by_name(:track_nr))
+      get_frame_content(frame_id(:v2, :track_nr), frame_id(:v1, :track_nr))
     end
 
     def genre
-      get_frame_content(frame_id_by_name(:genre))
+      get_frame_content(frame_id(:v2, :genre), frame_id(:v1, :genre))
     end
 
     def get_frame(frame_id)
@@ -65,52 +54,46 @@ module ID3Tag
     end
 
     def frames
-      @frames ||= parse_frames
-    end
-
-    def get_frame_content(frame_id)
-      frame = get_frame(frame_id)
-      frame && frame.content
-    end
-
-    def parsable_version
-      @parsable_version ||= calc_parsable_version
+      @frames ||= v2_frames + v1_frames
     end
 
-    private
-
-    def frame_id_by_name(name)
-      case parsable_version
-      when 2
-        FrameIdAdvisor.new(2, audio_file.v2_tag_major_version_number).advise(name)
-      when 1
-        FrameIdAdvisor.new(1, 'x').advise(name)
+    def v2_frames
+      if audio_file.v2_tag_present? && [:v2, :all].include?(@version)
+        ID3V2FrameParser.new(audio_file.v2_tag_body, audio_file.v2_tag_major_version_number).frames
       else
-        nil
+        []
       end
     end
 
-    def parse_frames
-      case parsable_version
-      when 2
-        ID3V2FrameParser.new(audio_file.v2_tag_body, audio_file.v2_tag_major_version_number).frames
-      when 1
+    def v1_frames
+      if audio_file.v1_tag_present? && [:v1, :all].include?(@version)
         ID3V1FrameParser.new(audio_file.v1_tag_body).frames
       else
         []
       end
     end
 
-    def calc_parsable_version
-      if @version
-        method = "v#{@version}_tag_present?"
-        if audio_file.respond_to?(method) && audio_file.send(method)
-          @version
-        else
-          nil
+    def get_frame_content(frame_id, *alt_frame_ids)
+      frame = nil
+      alt_frame_ids.unshift(frame_id).each do |frame_id|
+        frame = get_frame(frame_id)
+        break if frame
+      end
+      frame && frame.content
+    end
+
+    private
+
+    def frame_id(version, name)
+      case version
+      when :v2
+        if audio_file.v2_tag_present?
+          FrameIdAdvisor.new(2, audio_file.v2_tag_major_version_number).advise(name)
         end
+      when :v1
+        FrameIdAdvisor.new(1, 'x').advise(name)
       else
-        audio_file.greatest_tag_version
+        nil
       end
     end
 

data/lib/id3tag/unsynchronization.rb

@@ -0,0 +1,45 @@
+module ID3Tag
+  class Unsynchronization
+    def initialize(input)
+      @input = input
+      @encoding = input.encoding
+    end
+
+    def apply
+      loop do
+        current_byte = input_bytes.next
+        output_bytes << current_byte
+        next_byte = input_bytes.peek
+        if (current_byte == 255) && (next_byte > 224)
+          output_bytes << 0
+        end
+      end
+    end
+
+    def remove
+      prev_byte = nil
+      loop do
+        current_byte = input_bytes.next
+        next_byte = input_bytes.peek rescue 0
+        unless (prev_byte == 255) && (current_byte == 0) && (next_byte > 224)
+          output_bytes << current_byte
+        end
+        prev_byte = current_byte
+      end
+    end
+
+    def output
+      output_bytes.pack("C*").force_encoding(@encoding)
+    end
+
+    private
+
+    def input_bytes
+      @input_bytes ||= @input.unpack("C*").to_enum
+    end
+
+    def output_bytes
+      @output_bytes ||= []
+    end
+  end
+end

data/spec/features/can_read_non_audio_files_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'can read any file and does not raise errors if no tag found' do
+  subject { ID3Tag.read(File.open('/dev/null')) }
+
+  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 == []
+  end
+end

data/spec/features/can_read_tag_v1_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'can read v1 info from file' do
+  let(:mp3_with_v1_1_tag) { mp3_fixture('id3v1_with_track_nr.mp3') }
+  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"
+  end
+end

data/spec/lib/id3tag/audio_file_spec.rb

@@ -32,9 +32,24 @@ describe ID3Tag::AudioFile do
   end
 
   describe "#v2_tag_body" do
-    subject { described_class.new(mp3_with_v2_tag) }
-    it "should return frame and padding bytes" do
-      subject.v2_tag_body.should == File.read(mp3_with_v2_tag, 246, 10)
+    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"
+      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\u000E" + ("\u0000" * 10) + "ABC")) }
+      it "should return frame and padding bytes" do
+        subject.v2_tag_body.should == "ABC"
+      end
+    end
+  end
+
+  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 }
   end
 end

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

@@ -17,6 +17,14 @@ describe ID3Tag::Frames::V1::CommentsFrame do
     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
+    end
+  end
+
   describe '#language' do
     it 'should be unknown' do
       described_class.new('comments', '').language.should eq('unknown')

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

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe ID3Tag::Frames::V2::FrameFabricator do
+  let(:id) { nil }
+  let(:content) { 'some content' }
+  let(:flags) { nil }
+  let(:major_version_number) { 4 }
+
+  describe "self#fabricate" do
+    subject { described_class.fabricate(id, content, flags, major_version_number) }
+    context "when frame is a genre frame TCON" do
+      let(:id) { "TCON" }
+      it "fabricates genre frame" do
+        ID3Tag::Frames::V2::GenreFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+
+    context "when frame is a genre frame TCO" do
+      let(:id) { "TCO" }
+      it "fabricates genre frame" do
+        ID3Tag::Frames::V2::GenreFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+    context "when frame is a text frame TIT2" do
+      let(:id) { "TIT2" }
+      it "fabricates text frame" do
+        ID3Tag::Frames::V2::TextFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+    context "when frame is a comment frame COM" do
+      let(:id) { "COMM" }
+      it "fabricates comment frame" do
+        ID3Tag::Frames::V2::CommentsFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+    context "when frame is a unique id" do
+      let(:id) { "UFID" }
+      it "fabricates unique id frame" do
+        ID3Tag::Frames::V2::UniqueFileIdFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+    context "when frame is a unknown" do
+      let(:id) { "unknown" }
+      it "fabricates basic frame" do
+        ID3Tag::Frames::V2::BasicFrame.should_receive(:new).with(id, content, flags, major_version_number)
+        subject
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,13 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe ID3Tag::Frames::V2::GenreFrame::GenreParser do
+  let(:genre_string) { "17" }
+  subject { described_class.new(genre_string) }
+
+  describe '#genres' do
+    it "should raise not implemented error" do
+      expect { subject.genres }.to raise_error(/genres is not implemented/)
+    end
+  end
+end

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

@@ -16,19 +16,37 @@ describe ID3Tag::Frames::V2::GenreFrame do
   describe '#content' do
     subject { frame.content }
 
-    context "when one genre" do
-      before do
-        ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A'] }
+    context "when tag major version is pre 3" do
+      let(:major_version_number) { 3 }
+
+      context "when one genre" do
+        before do
+          ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A'] }
+        end
+
+        it { should eq('A') }
       end
+      context "when two genres" do
+        before do
+          ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A', 'B'] }
+        end
 
-      it { should eq('A') }
+        it { should eq('A, B') }
+      end
     end
-    context "when two genres" do
+
+    context "when tag major version is 4" do
+      let(:major_version_number) { 4 }
       before do
-        ID3Tag::Frames::V2::GenreFrame::GenreParserPre24.any_instance.stub(:genres) { ['A', 'B'] }
+        ID3Tag::Frames::V2::GenreFrame::GenreParser24.any_instance.stub(:genres) { ['B'] }
+      end
+      it { should eq('B') }
+    end
+    context "when tag major version is 232" do
+      let(:major_version_number) { 232 }
+      it "should raise MissingGenreParser error" do
+        expect { subject }.to raise_error(ID3Tag::Frames::V2::GenreFrame::MissingGenreParser)
       end
-
-      it { should eq('A, B') }
     end
   end
 

data/spec/lib/id3tag/id3_v1_frame_parser_spec.rb

@@ -7,10 +7,6 @@ describe ID3Tag::ID3V1FrameParser do
   describe "#frames" do
     subject { described_class.new(frame_bytes_v1_0).frames }
 
-    it "should return array or frames" do
-      subject.should be_kind_of(Set)
-    end
-
     describe "common frames between v1.0 and v.1.1" do
 
       it "should contain title frame" do

data/spec/lib/id3tag/id3_v2_frame_parser_spec.rb

@@ -1,18 +1,23 @@
 require "spec_helper"
 describe ID3Tag::ID3V2FrameParser do
-  let(:mp3_with_v2_3_tag) { mp3_fixture('id3v2.mp3') }
-  let(:frame_bytes) { File.read(mp3_with_v2_3_tag, 246, 10) }
-  let(:tag_major_version) { 3 }
-  describe "#frames" do
-    subject { described_class.new(frame_bytes, tag_major_version).frames }
-    it "should have frame TIT2" do
-      subject.select { |x| x.id == :TIT2 }.count.should == 1
-    end
+  subject { described_class.new(frame_bytes, tag_major_version) }
 
-    describe "text frames" do
-      it "should parse text frames and initialize as TextFrame objects" do
-        subject.select { |x| x.id == :TIT2 }.first.should be_kind_of(ID3Tag::Frames::V2::TextFrame)
-      end
+  context "parsing v2.2.x tag" 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
+      subject.frames
+    end
+  end
+  context "parsing v2.4.x tag" 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
+      subject.frames
     end
   end
 end

data/spec/lib/id3tag/id3_v2_tag_header_spec.rb

@@ -57,4 +57,9 @@ describe ID3Tag::ID3v2TagHeader do
     let(:header_data) { "ID3abc\x00\x00\x01\x7F" }
     its(:tag_size) { should == 255 }
   end
+
+  describe "#inspect" do
+    let(:header_data) { "ID3\u0003\u0000\u0000\u0000\u0000\u0000\u0000" }
+    its(:inspect) { should eq "<ID3Tag::ID3v2TagHeader version:2.3.0 size:0 unsync:false ext.header:false experimental:false footer:false>" }
+  end
 end

data/spec/lib/id3tag/string_util_spec.rb

@@ -18,4 +18,32 @@ describe ID3Tag::StringUtil do
       it { should be_false }
     end
   end
+
+  describe "do_unsynchronization" do
+    let(:input) { }
+    subject { described_class.do_unsynchronization(input) }
+
+    context "when a false synchronization is present" do
+      let(:input) { "\xFF\xEE" }
+      it { should eq("\xFF\x00\xEE") }
+    end
+    context "when a false synchronization is not present" do
+      let(:input) { "\xEE\xEE" }
+      it { should eq("\xEE\xEE") }
+    end
+  end
+
+  describe "undo_unsynchronization" do
+    let(:input) { }
+    subject { described_class.undo_unsynchronization(input) }
+
+    context "when unsynchronization in present" do
+      let(:input) { "\xFF\x00\xEE\xEE" }
+      it { should eq("\xFF\xEE\xEE") }
+    end
+    context "when unsynchronization in not present" do
+      let(:input) { "\xEE\xEE" }
+      it { should eq("\xEE\xEE") }
+    end
+  end
 end

data/spec/lib/id3tag/tag_spec.rb

@@ -1,84 +1,268 @@
 require "spec_helper"
 
 describe ID3Tag::Tag do
-  let(:mp3_with_v1_tag) { mp3_fixture('id3v1_without_track_nr.mp3') }
-  let(:mp3_with_v1_1_tag) { mp3_fixture('id3v1_with_track_nr.mp3') }
-  context "when reading file with v1.x tag" do
-    subject { described_class.new(mp3_with_v1_tag)}
-    describe "#frames" do
-      it "reads frames from source" do
-        subject.frames.size.should > 0
+  describe "class method #read" do
+
+  end
+
+  context "when file has v2.4.x tag and v.1.x tag" do
+    subject { described_class.read(nil) }
+    before :each do
+      ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { true }
+      ID3Tag::AudioFile.any_instance.stub(:v2_tag_major_version_number) { 4 }
+    end
+
+    describe "#artist" do
+      it "reads TPE1 or v1 artist" do
+        subject.should_receive(:get_frame_content).with(:TPE1, :artist).and_return('A')
+        subject.artist.should eq('A')
       end
     end
 
-    describe "Class methods" do
-      describe "#read" do
-        it "should initialize new instance of tag object" do
-          described_class.read(mp3_with_v1_tag).should be_instance_of(described_class)
-        end
+    describe "#title" do
+      it "reads TIT2 or v1 title" do
+        subject.should_receive(:get_frame_content).with(:TIT2, :title).and_return('A')
+        subject.title.should eq('A')
+      end
+    end
+
+    describe "#album" do
+      it "reads TALB or v1 album" do
+        subject.should_receive(:get_frame_content).with(:TALB, :album).and_return('A')
+        subject.album.should eq('A')
+      end
+    end
+
+    describe "#year" do
+      it "reads TDRC or v1 year" do
+        subject.should_receive(:get_frame_content).with(:TDRC, :year).and_return('A')
+        subject.year.should eq('A')
       end
     end
 
-    describe "#get_frame" do
-      it "returns string with frames content" do
-        subject.get_frame(:title).should be_kind_of(ID3Tag::Frames::V1::TextFrame)
-        subject.get_frame(:title).id.should == :title
+    describe "#track_nr" do
+      it "reads TRCK or v1 track_nr" do
+        subject.should_receive(:get_frame_content).with(:TRCK, :track_nr).and_return('A')
+        subject.track_nr.should eq('A')
       end
+    end
 
-      it "raises MultipleFrameError when tag has multiple tags with the same id" do
-        subject.stub(:frames) { [ID3Tag::Frames::V1::TextFrame.new(:TIT2, "some title"), ID3Tag::Frames::V1::TextFrame.new(:TIT2, "some other title")] }
-        expect { subject.get_frame(:TIT2) }.to raise_error(ID3Tag::Tag::MultipleFrameError)
+    describe "#genre" do
+      it "reads TCON or v1 genre" do
+        subject.should_receive(:get_frame_content).with(:TCON, :genre).and_return('A')
+        subject.genre.should eq('A')
       end
     end
+  end
 
-    describe "#get_frames" do
-      it "returns string with frames content" do
-        subject.get_frames(:title).should be_kind_of(Array)
-        subject.get_frames(:title).count.should == 1
+  describe "#get_frame" do
+    subject { described_class.read(nil) }
+    context "when more that one frame by that ID exists" do
+      before :each do
+        subject.stub(:get_frames) { [:frame, :frame] }
+      end
+      it "should raise MultipleFrameError" do
+        expect { subject.get_frame(:some_unique_frame) }.to raise_error(ID3Tag::Tag::MultipleFrameError)
       end
     end
 
-    describe "#frames" do
-      context "when file has v2.x tag version" do
+    context "when only one frame by that ID exists" do
+      before :each do
+        subject.stub(:get_frames) { [:frame] }
+      end
+      it "should return the frame" do
+        subject.get_frame(:some_unique_frame).should eq(:frame)
+      end
+    end
+  end
+
+  describe "#get_frames" do
+    subject { described_class.read(nil) }
+    let(:a1) { ID3Tag::Frames::V1::TextFrame.new(:A, 'a1') }
+    let(:a2) { ID3Tag::Frames::V1::TextFrame.new(:A, 'a2') }
+    let(:b) { ID3Tag::Frames::V1::TextFrame.new(:B, 'b') }
+    before :each do
+      subject.stub(:frames) { [a1, a2, b] }
+    end
+    it "returns frames with specific IDs" do
+      subject.get_frames(:A).should eq([a1, a2])
+    end
+  end
+
+  describe "#frames" do
+    subject { described_class.read(nil) }
+    before do
+      subject.stub(:v1_frames) { [:v1_frame1, :v1_frame2] }
+      subject.stub(:v2_frames) { [:v2_frame1, :v2_frame2] }
+    end
+    it "returns v2 frames and v1 frames" do
+      subject.frames.should eq([:v2_frame1, :v2_frame2, :v1_frame1, :v1_frame2])
+    end
+  end
+
+  describe "#frame_ids" do
+    subject { described_class.read(nil) }
+    let(:frame_1) { ID3Tag::Frames::V1::TextFrame.new(:AA, 'a1') }
+    let(:frame_2) { ID3Tag::Frames::V1::TextFrame.new(:BB, 'a2') }
+    before do
+      subject.stub(:frames) { [frame_1, frame_2] }
+    end
+    it "returns frames ids" do
+      subject.frame_ids.should eq([:AA, :BB])
+    end
+  end
+
+  describe "#v1_frames" do
+    context "when tag reading initialized with v1 tag only" do
+      subject { described_class.read(nil, :v1) }
+      context "when file has v1 tag" do
         before do
           ID3Tag::AudioFile.any_instance.stub(:v1_tag_present?) { true }
-          ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { true }
-          ID3Tag::ID3V2FrameParser.any_instance.stub(:frames) { [1,2,3] }
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_body) { '' }
+          ID3Tag::ID3V1FrameParser.any_instance.stub(:frames) { [:v1_frame] }
+        end
+        it "reads v1 tags" do
+          subject.v1_frames.should eq([:v1_frame])
+        end
+      end
+
+      context "when file does not have v1 tag" do
+        before do
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_present?) { false }
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_body) { '' }
+        end
+        it "returns empty array" do
+          subject.v1_frames.should eq([])
+        end
+      end
+    end
+
+    context "when tag reading initialized with v2 tag only" do
+      subject { described_class.read(nil, :v2) }
+      context "when file has v1 tag" do
+        before do
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_present?) { true }
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_body) { '' }
         end
-        it "should return frames from ID3V2FrameParser class" do
-          subject.frames.should == [1,2,3]
+        it "reads v1 tags" do
+          subject.v1_frames.should eq([])
         end
       end
-      context "when file has v2.x tag version" do
+    end
+
+    context "when tag reading initialized with all versions flag" do
+      subject { described_class.read(nil, :all) }
+      context "when file has v1 tag" do
         before do
           ID3Tag::AudioFile.any_instance.stub(:v1_tag_present?) { true }
+          ID3Tag::AudioFile.any_instance.stub(:v1_tag_body) { '' }
+          ID3Tag::ID3V1FrameParser.any_instance.stub(:frames) { [:v1_frame] }
+        end
+        it "reads v1 tags" do
+          subject.v1_frames.should eq([:v1_frame])
+        end
+      end
+    end
+  end
+
+  describe "#v2_frames" do
+    before do
+      ID3Tag::AudioFile.any_instance.stub(:v2_tag_major_version_number) { 3 }
+    end
+    context "when tag reading initialized with v2 tag only" do
+      subject { described_class.read(nil, :v2) }
+      context "when file has v2 tag" do
+        before do
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { true }
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_body) { '' }
+          ID3Tag::ID3V2FrameParser.any_instance.stub(:frames) { [:v2_frame] }
+        end
+        it "reads v2 tags" do
+          subject.v2_frames.should eq([:v2_frame])
+        end
+      end
+
+      context "when file does not have v2 tag" do
+        before do
           ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { false }
-          ID3Tag::ID3V1FrameParser.any_instance.stub(:frames) { [1,2,3] }
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_body) { '' }
         end
-        it "should return frames from ID3V1FrameParser class" do
-          subject.frames.should == [1,2,3]
+        it "returns empty array" do
+          subject.v2_frames.should eq([])
         end
       end
     end
 
-    describe "#frame_ids" do
-      before do
-        subject.stub(:frames) { [ID3Tag::Frames::V1::TextFrame.new(:TIT2, "some title")] }
+    context "when tag reading initialized with v1 tag only" do
+      subject { described_class.read(nil, :v1) }
+      context "when file has v2 tag" do
+        before do
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { true }
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_body) { '' }
+        end
+        it "returns empty array" do
+          subject.v2_frames.should eq([])
+        end
       end
-      it "returns its of all frames" do
-        subject.frame_ids.should == [:TIT2]
+    end
+
+    context "when tag reading initialized with all versions flag" do
+      subject { described_class.read(nil, :all) }
+      context "when file has v2 tag" do
+        before do
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_present?) { true }
+          ID3Tag::AudioFile.any_instance.stub(:v2_tag_body) { '' }
+          ID3Tag::ID3V2FrameParser.any_instance.stub(:frames) { [:v2_frame] }
+        end
+        it "reads v2 tags" do
+          subject.v2_frames.should eq([:v2_frame])
+        end
       end
     end
   end
 
-  describe "Easy access methods to text frames" do
-    subject { described_class.new(mp3_with_v1_1_tag)}
-    its(:title) { should == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaA" }
-    its(:artist) { should == "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbB" }
-    its(:album) { should == "cccccccccccccccccccccccccccccC" }
-    its(:comments) { should == "dddddddddddddddddddddddddddD" }
-    its(:genre) { should == "Blues" }
-    its(:year) { should == "2003" }
-    its(:track_nr) { should == "1" }
+  describe "#get_frame_content" do
+    subject { described_class.read(nil, :all) }
+    let(:frame_1) { ID3Tag::Frames::V1::TextFrame.new(:some_id, 'some content') }
+    let(:frame_2) { ID3Tag::Frames::V1::TextFrame.new(:some_other_id, 'some other content') }
+    context "with one ID as argument" do
+      context "when frame with ID exists" do
+        before :each do
+          subject.stub(:get_frame).with(:some_id) { frame_1 }
+        end
+        it "should return frame" do
+          subject.get_frame_content(:some_id).should == 'some content'
+        end
+      end
+      context "when frame with ID does not exists" do
+        before :each do
+          subject.stub(:get_frame).with(:some_id) { nil }
+        end
+        it "should return none" do
+          subject.get_frame_content(:some_id).should be_nil
+        end
+      end
+    end
+
+    context "with multiple ID as armguments" do
+      context "when first one does exist" do
+        before :each do
+          subject.stub(:get_frame).with(:some_id) { frame_1 }
+          subject.stub(:get_frame).with(:some_other_id) { frame_2 }
+        end
+        it "should return first existing frame's content" do
+          subject.get_frame_content(:some_id, :some_other_id).should eq 'some content'
+        end
+      end
+      context "when second exists" do
+        before :each do
+          subject.stub(:get_frame).with(:some_id) { nil }
+          subject.stub(:get_frame).with(:some_other_id) { frame_2 }
+        end
+        it "should return first existing frame's content" do
+          subject.get_frame_content(:some_id, :some_other_id).should eq 'some other content'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
@@ -151,6 +151,9 @@ files:
 - lib/id3tag/string_util.rb
 - lib/id3tag/synchsafe_integer.rb
 - lib/id3tag/tag.rb
+- lib/id3tag/unsynchronization.rb
+- spec/features/can_read_non_audio_files_spec.rb
+- spec/features/can_read_tag_v1_spec.rb
 - spec/fixtures/id3v1_and_v2.mp3
 - spec/fixtures/id3v1_with_track_nr.mp3
 - spec/fixtures/id3v1_without_track_nr.mp3
@@ -163,8 +166,10 @@ files:
 - spec/lib/id3tag/frames/v1/track_nr_frame_spec.rb
 - spec/lib/id3tag/frames/v2/basic_frame_spec.rb
 - spec/lib/id3tag/frames/v2/comments_frame_spec.rb
+- spec/lib/id3tag/frames/v2/frame_fabricator_spec.rb
 - spec/lib/id3tag/frames/v2/genre_frame/genre_parser_24_spec.rb
 - spec/lib/id3tag/frames/v2/genre_frame/genre_parser_pre_24_spec.rb
+- spec/lib/id3tag/frames/v2/genre_frame/genre_parser_spec.rb
 - spec/lib/id3tag/frames/v2/genre_frame_spec.rb
 - spec/lib/id3tag/frames/v2/text_frame_spec.rb
 - spec/lib/id3tag/frames/v2/unique_file_id_frame_spec.rb