id3tag 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b0b5c61e35171280ba6a4c9141159ba0079e25
-  data.tar.gz: ad16f770564f70a30b3504fb5945656a2693f37a
+  metadata.gz: 3045586a23981f0e85728d27cd804bc238c1d8cb
+  data.tar.gz: f150bbc0d6286360265eee5d605d93f187af2ee6
 SHA512:
-  metadata.gz: 3580b6133eeef63c3b3b14e5f508df15473756d928aaf595171835750c85616a25fd2251f2ae6e9cffe538d3e99fc198fdb55768788ae7b948f2c66e6b2e3b6f
-  data.tar.gz: 18a2596b48760925683077237bb01871a82cf4f82ff350fef323e4e8da8eb0e4d129ad05d988abd2d9ca9b413c398adae0ec45dab8d8fb67d4a8325e6c6925b6
+  metadata.gz: 12d22e4a838918bcac2262248ce3d84b51be500f92aba2ef6b07b4772079361e32b51a8b7953d19ebeee4c591190f8174488aca6453a0ce5519a1544f257ada0
+  data.tar.gz: a6e04f69ed6dc53bfde17187bfedab5ceecc5a876f24fd593190dd64e2bd084708c914dc7684d4e7d675a6da40349d8aa13bd5ad8d9afb2e9a10effac3f24e4c

data/README.md

@@ -72,8 +72,7 @@ You can inspect tag by calling `frame_ids` to see available frame ids or `frames
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 ## Code Status
-[![Code Climate](https://codeclimate.com/github/krists/id3tag.png)](https://codeclimate.com/github/krists/id3tag) [![Build Status](https://travis-ci.org/krists/id3tag.png?branch=master)](https://travis-ci.org/krists/id3tag) [![Coverage Status](https://coveralls.io/repos/krists/id3tag/badge.png?branch=master)](https://coveralls.io/r/krists/id3tag)
-
+[![Code Climate](https://codeclimate.com/github/krists/id3tag.png)](https://codeclimate.com/github/krists/id3tag) [![Build Status](https://travis-ci.org/krists/id3tag.png?branch=master)](https://travis-ci.org/krists/id3tag) [![Coverage Status](https://coveralls.io/repos/krists/id3tag/badge.png?branch=master)](https://coveralls.io/r/krists/id3tag) [![Gem Version](https://badge.fury.io/rb/id3tag.png)](http://badge.fury.io/rb/id3tag)
 ## Copyright
 
 Copyright (c) 2013 Krists Ozols. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/id3tag.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "id3tag"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Krists Ozols"]

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

@@ -82,11 +82,15 @@ module  ID3Tag
         end
 
         def inspect
-          "<#{self.class.name} #{id}: #{inspectable_content}>"
+          if inspectable_content
+            "<#{self.class.name} #{id}: #{inspectable_content}>"
+          else
+            "<#{self.class.name} #{id}>"
+          end
         end
 
         def inspectable_content
-          content
+          nil
         end
 
         private

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

@@ -20,10 +20,14 @@ module  ID3Tag
           text
         end
 
+        def inspectable_content
+          content
+        end
+
         private
 
         def encoded_text_and_content_parts
-          @encoded_text_and_content_parts ||= encoded_text_and_content.split("\00",2)
+          @encoded_text_and_content_parts ||= encoded_text_and_content.split(current_encoding_map[:terminator], 2)
         end
 
         def encoded_text_and_content

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

@@ -12,6 +12,8 @@ module ID3Tag
           genres.join(", ")
         end
 
+        alias inspectable_content content
+
         private
 
         def get_genres

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

@@ -2,22 +2,29 @@ module  ID3Tag
   module Frames
     module  V2
       class TextFrame < BasicFrame
+        NULL_BYTE = "\x00"
         UnsupportedTextEncoding = Class.new(StandardError)
         ENCODING_MAP = {
-          0b0 => Encoding::ISO8859_1,
-          0b1 => Encoding::UTF_16,
-          0b10 => Encoding::UTF_16BE,
-          0b11 => Encoding::UTF_8
+          0b0 => { :encoding => Encoding::ISO8859_1, :terminator => NULL_BYTE },
+          0b1 => { :encoding => Encoding::UTF_16, :terminator => NULL_BYTE * 2 },
+          0b10 =>{ :encoding => Encoding::UTF_16BE, :terminator => NULL_BYTE * 2 },
+          0b11 =>{ :encoding => Encoding::UTF_8, :terminator => NULL_BYTE }
         }
 
         def content
           @content ||= content_without_encoding_byte.encode(destination_encoding, source_encoding)
         end
 
+        alias inspectable_content content
+
         private
 
         def source_encoding
-          ENCODING_MAP[get_encoding_byte] || raise(UnsupportedTextEncoding)
+          current_encoding_map[:encoding]
+        end
+
+        def current_encoding_map
+          ENCODING_MAP.fetch(get_encoding_byte) { raise UnsupportedTextEncoding }
         end
 
         def destination_encoding

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

@@ -94,7 +94,7 @@ describe ID3Tag::Frames::V2::BasicFrame do
 
   describe '#inspect' do
     it 'should be pretty inspectable' do
-      frame.inspect.should eq('<ID3Tag::Frames::V2::BasicFrame foo: bar>')
+      frame.inspect.should eq('<ID3Tag::Frames::V2::BasicFrame foo>')
     end
   end
 end

data/spec/lib/id3tag/id3_v2_frame_parser_spec.rb

@@ -11,6 +11,15 @@ describe ID3Tag::ID3V2FrameParser do
       subject.frames
     end
   end
+  context "parsing v2.2.3 tag" 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
+      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" }

data/tags

@@ -124,6 +124,7 @@ content_without_encoding_byte	lib/id3tag/frames/v2/text_frame.rb	/^        def c
 convert_32bit_integer_to_string	lib/id3tag/number_util.rb	/^    def self.convert_32bit_integer_to_string(integer)$/;"	F	class:ID3Tag.NumberUtil
 convert_string_to_32bit_integer	lib/id3tag/number_util.rb	/^    def self.convert_string_to_32bit_integer(string)$/;"	F	class:ID3Tag.NumberUtil
 current_additional_info_map	lib/id3tag/frames/v2/frame_flags.rb	/^        def current_additional_info_map$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
+current_encoding_map	lib/id3tag/frames/v2/text_frame.rb	/^        def current_encoding_map$/;"	f	class:ID3Tag.Frames.V2.TextFrame
 current_flag_map	lib/id3tag/frames/v2/frame_flags.rb	/^        def current_flag_map$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
 data_length_indicator?	lib/id3tag/frames/v2/basic_frame.rb	/^        def data_length_indicator?$/;"	f	class:ID3Tag.Frames.V2.BasicFrame
 data_length_indicator?	lib/id3tag/frames/v2/frame_flags.rb	/^        def data_length_indicator?$/;"	f	class:ID3Tag.Frames.V2.FrameFlags
@@ -207,6 +208,7 @@ input_bytes	lib/id3tag/unsynchronization.rb	/^    def input_bytes$/;"	f	class:ID
 inspect	lib/id3tag/frames/v2/basic_frame.rb	/^        def inspect$/;"	f	class:ID3Tag.Frames.V2.BasicFrame
 inspect	lib/id3tag/id3_v2_tag_header.rb	/^    def inspect$/;"	f	class:ID3Tag.ID3v2TagHeader
 inspectable_content	lib/id3tag/frames/v2/basic_frame.rb	/^        def inspectable_content$/;"	f	class:ID3Tag.Frames.V2.BasicFrame
+inspectable_content	lib/id3tag/frames/v2/comments_frame.rb	/^        def inspectable_content$/;"	f	class:ID3Tag.Frames.V2.CommentsFrame
 inspectable_content	lib/id3tag/frames/v2/unique_file_id_frame.rb	/^        def inspectable_content$/;"	f	class:ID3Tag.Frames.V2.UniqueFileIdFrame
 just_genres	lib/id3tag/frames/v2/genre_frame/genre_parser_pre_24.rb	/^          def just_genres$/;"	f	class:ID3Tag.Frames.V2.GenreFrame.GenreParserPre24
 just_requirements	lib/id3tag/frames/v2/genre_frame/genre_parser_pre_24.rb	/^          def just_requirements$/;"	f	class:ID3Tag.Frames.V2.GenreFrame.GenreParserPre24

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id3tag
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Krists Ozols