id3tag 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c0b821b5377f22089bdda01eae4e3b4a77e8ab2
-  data.tar.gz: 698cbb6e33de5bd8ea628521ada68ec1a2b94b18
+  metadata.gz: 30e2c415fd1a952d8239e96cf5b2ece8f3729f23
+  data.tar.gz: 9e064e792b74db5d5d473f04d7caa7865ff789f7
 SHA512:
-  metadata.gz: 732fad51cb94e0e4ebe55d0221515ea098084e61b2c9b95415b484cd1808a00e010c86cee9ddb5c38e0d196f81361c327d9bc1a859153698535b43991944d334
-  data.tar.gz: cdf7eb252dac30f582483b994d30f9effcd0ecf1aa9606892220fa838c758466d4c84a374436b963a60c908c631de4c1849eb2047ac73c45e275fd66f71b0b86
+  metadata.gz: c77daedfe027a064210ccd201f78e8834f6fdec4efd8bca7b0b34fe2e2329e9a3bb42fc1a8ae2a5f926cfc636ee3941f61a399d8cd8e48e41922ca8c714e886d
+  data.tar.gz: 11341ffed291bf7aab6441587461eadec753c454bad13d43bf4427212f86c4a8156e5e170635b771f82983e448c0558e4939278a76e96ce3a571fb89462fb70e

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/id3tag.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: id3tag 0.3.1 ruby lib
+# stub: id3tag 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "id3tag"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Krists Ozols"]

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

@@ -13,7 +13,7 @@ module  ID3Tag
         end
 
         def text
-          @text ||= encoded_text_and_content_parts.last
+          @text ||= cut_at_null_byte(encoded_text_and_content_parts.last)
         end
 
         def content

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

@@ -12,11 +12,15 @@ module  ID3Tag
         }
 
         def content
-          @content ||= content_without_encoding_byte.encode(destination_encoding, source_encoding)
+          @content ||= cut_at_null_byte(content_without_encoding_byte.encode(destination_encoding, source_encoding))
         end
 
         alias inspectable_content content
 
+        def cut_at_null_byte(string)
+          string.split(NULL_BYTE, 2).first
+        end
+
         private
 
         def source_encoding

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

@@ -20,6 +20,13 @@ describe ID3Tag::Frames::V2::TextFrame do
   describe '#content' do
     subject { frame.content }
 
+    context "when text's last char is null byte" do
+      let(:target_encoding) { Encoding::UTF_8 }
+      let(:encoding_byte) { "\x03" }
+      let(:text) { "Glāzšķūņrūķīši\x00" }
+      it { should == 'Glāzšķūņrūķīši' }
+    end
+
     context "when encoding byte is not present" do
       let(:encoding_byte) { "" }
       it { expect { subject }.to raise_error(ID3Tag::Frames::V2::TextFrame::UnsupportedTextEncoding) }

data/tags

@@ -126,6 +126,7 @@ convert_string_to_32bit_integer	lib/id3tag/number_util.rb	/^    def self.convert
 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
+cut_at_null_byte	lib/id3tag/frames/v2/text_frame.rb	/^        def cut_at_null_byte(string)$/;"	f	class:ID3Tag.Frames.V2.TextFrame
 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
 decode	lib/id3tag/synchsafe_integer.rb	/^      def decode(synchsafe_int)$/;"	f	class:ID3Tag.SynchsafeInteger.encode

metadata

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