id3tag 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92be9c2e14829993e4b5605e5e223a153ec95553
-  data.tar.gz: bc8c97ed113fe62aa18de8731c65c518527790e8
+  metadata.gz: 89941a8621dd5eec4f0ae322c2bf9615496d52ff
+  data.tar.gz: 65994561b1424f4c4101bc65080454566f86ce7f
 SHA512:
-  metadata.gz: dea74a6d210076823b9705db4a5caadaaef41e78e375918f167ea29a5d6e428fcacb48736450110f022e46869255b1dcc20a97b17ec91dba814876e0a57cebc3
-  data.tar.gz: dd001f998fa99acaa2edd9088d9e36c5967625b4bbafeb99201d12edafe0cf1712577aa6ff1b1f33edcb209ca190322e84d54df511a0e7afe24d86d7c0756951
+  metadata.gz: 7e7017566d378958d0bd534768854ff477d480f608baa4cb6839b1a1aa3856bd7697dabe016de3d60e084d3162dd3966a4a2228a4c1e16e2654740374462024a
+  data.tar.gz: f7e6b73b353b26d5fc9d03de31a63683579191823ec7695c66562634d8aacc1d209e74ac128765553461efc791be1cc1339a041399a85cd1d988476829108e6e

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/id3tag.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: id3tag 0.5.2 ruby lib
+# stub: id3tag 0.5.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "id3tag"
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Krists Ozols"]
-  s.date = "2013-11-12"
+  s.date = "2013-11-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 = [
@@ -85,6 +85,7 @@ Gem::Specification.new do |s|
     "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",
+    "spec/lib/id3tag/frames/v2/user_text_frame_spec.rb",
     "spec/lib/id3tag/id3_v1_frame_parser_spec.rb",
     "spec/lib/id3tag/id3_v2_frame_parser_spec.rb",
     "spec/lib/id3tag/id3_v2_tag_header_spec.rb",

data/lib/id3tag/frames/v2/frame_fabricator.rb

@@ -20,7 +20,7 @@ module  ID3Tag
           case @id
           when /^(TCON|TCO)$/
             GenreFrame
-          when /^TXX$/
+          when /^TXX/
             UserTextFrame
           when /^T/
             TextFrame

data/lib/id3tag/tag.rb

@@ -16,19 +16,26 @@ module ID3Tag
 
     [:artist, :title, :album, :year, :track_nr, :genre].each do |name|
       define_method(name) do
-        frame = first_frame_by_id(*possible_frame_ids_by_name(name))
-        frame && frame.content
+        content_of_first_frame(name)
       end
     end
 
-    # TODO: Add Terms of use frame and Synchronised lyrics/text frame
+    def content_of_first_frame(name)
+      frame = first_frame_by_id(*possible_frame_ids_by_name(name))
+      frame && frame.content
+    end
+
     [:comments, :unsychronized_transcription].each do |name|
       define_method(name) do |lang = :eng|
-        frame = all_frames_by_id(*possible_frame_ids_by_name(name)).find { |x| x.language == lang.to_s }
-        frame && frame.content
+        content_of_first_frame_with_language(name, lang)
       end
     end
 
+    def content_of_first_frame_with_language(name, lang)
+      frame = all_frames_by_id(*possible_frame_ids_by_name(name)).find { |x| x.language == lang.to_s }
+      frame && frame.content
+    end
+
     def first_frame_by_id(*ids)
       first_existing_id = ids.find { |id| frame_ids.include?(id) }
       first_existing_id && get_frame(first_existing_id)
@@ -62,7 +69,7 @@ module ID3Tag
     end
 
     def v2_frames
-      if audio_file.v2_tag_present? && scope.include?(:v2)
+      if should_and_could_read_v2_frames?
         ID3V2FrameParser.new(audio_file.v2_tag_body, audio_file.v2_tag_major_version_number).frames
       else
         []
@@ -70,7 +77,7 @@ module ID3Tag
     end
 
     def v1_frames
-      if audio_file.v1_tag_present? && scope.include?(:v1)
+      if should_and_could_read_v1_frames?
         ID3V1FrameParser.new(audio_file.v1_tag_body).frames
       else
         []
@@ -81,17 +88,35 @@ module ID3Tag
       @audio_file ||= AudioFile.new(@source)
     end
 
+    private
+
     def possible_frame_ids_by_name(name)
       ids = []
-      if scope.include?(:v2) && audio_file.v2_tag_present?
-        id = FrameIdAdvisor.new(2, audio_file.v2_tag_major_version_number).advise(name)
-        ids << id if id
+      id = possible_v1_frame_id_by_name(name)
+      ids << id if id
+      id = possible_v2_frame_id_by_name(name)
+      ids << id if id
+      ids
+    end
+
+    def possible_v2_frame_id_by_name(name)
+      if should_and_could_read_v2_frames?
+        FrameIdAdvisor.new(2, audio_file.v2_tag_major_version_number).advise(name)
       end
-      if scope.include?(:v1) && audio_file.v1_tag_present?
-        id = FrameIdAdvisor.new(1, FrameIdAdvisor::ANY_MAJOR_VERSION).advise(name)
-        ids << id if id
+    end
+
+    def possible_v1_frame_id_by_name(name)
+      if should_and_could_read_v1_frames?
+        FrameIdAdvisor.new(1, FrameIdAdvisor::ANY_MAJOR_VERSION).advise(name)
       end
-      ids
+    end
+
+    def should_and_could_read_v1_frames?
+      scope.include?(:v1) && audio_file.v1_tag_present?
+    end
+
+    def should_and_could_read_v2_frames?
+      scope.include?(:v2) && audio_file.v2_tag_present?
     end
   end
 end

data/spec/lib/id3tag/audio_file_spec.rb

@@ -43,6 +43,12 @@ describe ID3Tag::AudioFile do
       it "should return frame and padding bytes" do
         subject.v2_tag_body.should == "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"
+        end
+      end
     end
   end
 

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

@@ -30,6 +30,13 @@ describe ID3Tag::Frames::V2::FrameFabricator do
         subject
       end
     end
+    context "when frame is a user text frame" do
+      let(:id) { "TXX" }
+      it "fabricates user text frame" do
+        ID3Tag::Frames::V2::UserTextFrame.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
@@ -44,6 +51,13 @@ describe ID3Tag::Frames::V2::FrameFabricator do
         subject
       end
     end
+    context "when frame is a unique id" do
+      let(:id) { "IPLS" }
+      it "fabricates involved people list frame" do
+        ID3Tag::Frames::V2::InvolvedPeopleListFrame.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

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

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe ID3Tag::Frames::V2::UserTextFrame do
+  let(:id) { "TXX" }
+  let(:raw_content) { text.encode(target_encoding).prepend(encoding_byte.force_encoding(target_encoding)) }
+  let(:flags) { nil }
+  let(:major_version_number) { 4 }
+
+  let(:target_encoding) { Encoding::UTF_8 }
+  let(:encoding_byte) { "\x03" }
+  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>') }
+end

data/tags

@@ -138,6 +138,8 @@ content	lib/id3tag/frames/v2/genre_frame.rb	/^        def content$/;"	f	class:ID
 content	lib/id3tag/frames/v2/text_frame.rb	/^        def content$/;"	f	class:ID3Tag.Frames.V2.TextFrame
 content	lib/id3tag/frames/v2/unique_file_id_frame.rb	/^        def content$/;"	f	class:ID3Tag.Frames.V2.UniqueFileIdFrame
 content	lib/id3tag/frames/v2/user_text_frame.rb	/^        def content$/;"	f	class:ID3Tag.Frames.V2.UserTextFrame
+content_of_first_frame	lib/id3tag/tag.rb	/^    def content_of_first_frame(name)$/;"	f	class:ID3Tag
+content_of_first_frame_with_language	lib/id3tag/tag.rb	/^    def content_of_first_frame_with_language(name, lang)$/;"	f	class:ID3Tag
 content_parts	lib/id3tag/frames/v2/user_text_frame.rb	/^        def content_parts$/;"	f	class:ID3Tag.Frames.V2.UserTextFrame
 content_split_apart_by_null_byte	lib/id3tag/frames/v2/unique_file_id_frame.rb	/^        def content_split_apart_by_null_byte$/;"	f	class:ID3Tag.Frames.V2.UniqueFileIdFrame
 content_without_encoding_byte	lib/id3tag/frames/v2/text_frame.rb	/^        def content_without_encoding_byte$/;"	f	class:ID3Tag.Frames.V2.TextFrame
@@ -262,6 +264,8 @@ position_and_count_of_encryption_id_bytes	lib/id3tag/frames/v2/frame_flags.rb	/^
 position_and_count_of_group_id_bytes	lib/id3tag/frames/v2/basic_frame.rb	/^        def position_and_count_of_group_id_bytes$/;"	f	class:ID3Tag.Frames.V2.BasicFrame
 position_and_count_of_group_id_bytes	lib/id3tag/frames/v2/frame_flags.rb	/^        def position_and_count_of_group_id_bytes$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
 possible_frame_ids_by_name	lib/id3tag/tag.rb	/^    def possible_frame_ids_by_name(name)$/;"	f	class:ID3Tag
+possible_v1_frame_id_by_name	lib/id3tag/tag.rb	/^    def possible_v1_frame_id_by_name(name)$/;"	f	class:ID3Tag
+possible_v2_frame_id_by_name	lib/id3tag/tag.rb	/^    def possible_v2_frame_id_by_name(name)$/;"	f	class:ID3Tag
 preserve_on_file_alteration?	lib/id3tag/frames/v2/basic_frame.rb	/^        def preserve_on_file_alteration?$/;"	f	class:ID3Tag.Frames.V2.BasicFrame
 preserve_on_file_alteration?	lib/id3tag/frames/v2/frame_flags.rb	/^        def preserve_on_file_alteration?$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
 preserve_on_file_alteration?	lib/id3tag/frames/v2/frame_header_flags.rb	/^        def preserve_on_file_alteration?$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
@@ -283,6 +287,8 @@ read_only?	lib/id3tag/frames/v2/frame_flags.rb	/^        def read_only?$/;"	f	cl
 read_only?	lib/id3tag/frames/v2/frame_header_flags.rb	/^        def read_only?$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
 remove	lib/id3tag/unsynchronization.rb	/^    def remove$/;"	f	class:ID3Tag.Unsynchronization
 rewind_input	lib/id3tag/id3_v2_frame_parser.rb	/^    def rewind_input$/;"	f	class:ID3Tag.ID3V2FrameParser
+should_and_could_read_v1_frames?	lib/id3tag/tag.rb	/^    def should_and_could_read_v1_frames?$/;"	f	class:ID3Tag
+should_and_could_read_v2_frames?	lib/id3tag/tag.rb	/^    def should_and_could_read_v2_frames?$/;"	f	class:ID3Tag
 source_encoding	lib/id3tag/frames/v1/text_frame.rb	/^        def source_encoding$/;"	f	class:ID3Tag.Frames.V1.TextFrame
 source_encoding	lib/id3tag/frames/v2/text_frame.rb	/^        def source_encoding$/;"	f	class:ID3Tag.Frames.V2.TextFrame
 split_by_null_byte	lib/id3tag/string_util.rb	/^    def self.split_by_null_byte(string)$/;"	F	class:ID3Tag.StringUtil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Krists Ozols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -170,6 +170,7 @@ files:
 - 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
+- spec/lib/id3tag/frames/v2/user_text_frame_spec.rb
 - spec/lib/id3tag/id3_v1_frame_parser_spec.rb
 - spec/lib/id3tag/id3_v2_frame_parser_spec.rb
 - spec/lib/id3tag/id3_v2_tag_header_spec.rb