apetag 1.1.1 → 1.1.2

data/apetag.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# This library implements a APEv2 parser/generator.
+# This library implements a APEv2 reader/writer.
 # If called from the command line, it prints out the contents of the APEv2 tag 
 # for the given filename arguments.
 #
@@ -61,7 +61,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
 # SOFTWARE.
 
-require 'set'
 require 'cicphash'
 
 # Error raised by the library
@@ -189,8 +188,8 @@ end
 class ApeTag
   MAX_SIZE = 8192
   MAX_ITEM_COUNT = 64
-  HEADER_FLAGS = "\x00\x00\x00\xA0"
-  FOOTER_FLAGS = "\x00\x00\x00\x80"
+  HEADER_FLAGS = "\x00\x00\xA0"
+  FOOTER_FLAGS = "\x00\x00\x80"
   PREAMBLE = "APETAGEX\xD0\x07\x00\x00"
   RECOMMENDED_KEYS = %w'Title Artist Album Year Comment Genre Track Subtitle
     Publisher Conductor Composer Copyright Publicationright File EAN/UPC ISBN
@@ -249,8 +248,7 @@ class ApeTag
       @check_id3 = check_id3.nil? ? @@check_id3 : check_id3 
     else
       @filename = filename.to_s
-      @check_id3 = check_id3 unless check_id3.nil?
-      @check_id3 = !MP3_RE.match(@filename).nil? if @check_id3.nil?
+      @check_id3 = check_id3.nil? ? !MP3_RE.match(@filename).nil? : check_id3 
     end
   end
   
@@ -368,11 +366,12 @@ class ApeTag
       end
       file.seek(-32-id3.length, IO::SEEK_END)
       tag_footer = file.read(32)
-      unless tag_footer[0...12] == PREAMBLE && tag_footer[20...24] == FOOTER_FLAGS
+      unless tag_footer[0...12] == PREAMBLE 
         @has_tag = false
         @tag_start = file_size - id3.length
         return
       end
+      raise ApeTagError, "Tag has bad footer flags" unless tag_footer[21...24] == FOOTER_FLAGS && (tag_footer[20...21] == "\x00" || tag_footer[20...21] == "\x01")
       @tag_footer = tag_footer
       @tag_size, @tag_item_count = tag_footer[12...20].unpack('VV')
       @tag_size += 32
@@ -385,9 +384,9 @@ class ApeTag
       @tag_start=file.pos
       @tag_header=file.read(32)
       @tag_data=file.read(tag_size-64)
-      raise ApeTagError, "Missing header" unless tag_header[0...12] == PREAMBLE && tag_header[20...24] == HEADER_FLAGS
-      raise ApeTagError, "Header and footer size does match" unless tag_size == tag_header[12...16].unpack('V')[0] + 32
-      raise ApeTagError, "Header and footer item count does match" unless tag_item_count == tag_header[16...20].unpack('V')[0]
+      raise ApeTagError, "Missing header" unless tag_header[0...12] == PREAMBLE && tag_header[21...24] == HEADER_FLAGS && (tag_header[20...21] == "\x00" || tag_header[20...21] == "\x01")
+      raise ApeTagError, "Header and footer size does not match" unless tag_size == tag_header[12...16].unpack('V')[0] + 32
+      raise ApeTagError, "Header and footer item count does not match" unless tag_item_count == tag_header[16...20].unpack('V')[0]
       @has_tag = true
     end
     
@@ -428,8 +427,8 @@ class ApeTag
       @tag_size = tag_data.length + 64
       base_start = "#{PREAMBLE}#{[tag_size-32, tag_item_count].pack('VV')}"
       base_end = "\0"*8
-      @tag_header = "#{base_start}#{HEADER_FLAGS}#{base_end}"
-      @tag_footer = "#{base_start}#{FOOTER_FLAGS}#{base_end}"
+      @tag_header = "#{base_start}\x00#{HEADER_FLAGS}#{base_end}"
+      @tag_footer = "#{base_start}\x00#{FOOTER_FLAGS}#{base_end}"
       raise ApeTagError, "Updated tag has too many items (#{tag_item_count})" if tag_item_count > MAX_ITEM_COUNT
       raise ApeTagError, "Updated tag too large (#{tag_size})" if tag_size > MAX_SIZE
     end

data/test/test_apetag.rb

@@ -228,7 +228,7 @@ class ApeTagTest < Test::Unit::TestCase
     assert_equal "XYZ", ai.string_value
     
     # Test parsing of invalid UTF-8
-    data = "\012\0\0\0\07\0\0\0BlaH\0BlAh\0XYZ\0\xff"
+    data = "\012\0\0\0\0\0\0\0BlaH\0BlAh\0XYZ\0\xff"
     assert_raises(ApeTagError){ApeItem.parse(data, 0)}
   end
   
@@ -237,6 +237,23 @@ class ApeTagTest < Test::Unit::TestCase
     data = EMPTY_APE_TAG.dup
     # Test default case OK
     assert_nothing_raised{ApeTag.new(StringIO.new(data)).raw}
+
+    # Test read only tags work
+    data[20] = 1
+    assert_nothing_raised{ApeTag.new(StringIO.new(data)).raw}
+
+    # Test other flags values don't work
+    2.upto(255) do |i|
+      data[20] = i
+      assert_raises(ApeTagError){ApeTag.new(StringIO.new(data)).raw}
+    end
+    data[20] = 1
+    2.upto(255) do |i|
+      data[52] = i
+      assert_raises(ApeTagError){ApeTag.new(StringIO.new(data)).raw}
+      data[20] = i
+      assert_raises(ApeTagError){ApeTag.new(StringIO.new(data)).raw}
+    end
     
     # Test footer size less than minimum size (32)
     data[44] = 31
@@ -284,7 +301,7 @@ class ApeTagTest < Test::Unit::TestCase
     
     # Test unmatched header and footer item count, footer size wrong
     data = EXAMPLE_APE_TAG.dup
-    data[48] -=1
+    data[208-16] -=1
     assert_raises(ApeTagError){ApeTag.new(StringIO.new(data)).fields}
     
     # Test missing/corrupt header
@@ -330,7 +347,7 @@ class ApeTagTest < Test::Unit::TestCase
     data[192] += 2
     assert_raises(ApeTagError){ApeTag.new(StringIO.new(data)).fields}
     
-    # Test updating works in case insensitive manner 
+    # Test updating works in a case insensitive manner 
     assert_equal ['blah'], ApeTag.new(StringIO.new(EXAMPLE_APE_TAG.dup)).update{|x| x['album']='blah'}['ALBUM']
     assert_equal ['blah'], ApeTag.new(StringIO.new(EXAMPLE_APE_TAG.dup)).update{|x| x['ALBUM']='blah'}['album']
     assert_equal ['blah'], ApeTag.new(StringIO.new(EXAMPLE_APE_TAG.dup)).update{|x| x['ALbUM']='blah'}['albuM']
@@ -345,10 +362,10 @@ class ApeTagTest < Test::Unit::TestCase
     # Test ID3v1.0 tag
     assert_nothing_raised{ApeTag.new(StringIO.new(EXAMPLE_APE_TAG[0...-128] + EXAMPLE_APE_TAG[-128..-1].gsub("\0", " "))).update{|x| x}}
 
-    # Test updating with invalid value
+    # Test updating with an invalid value
     assert_raises(ApeTagError){ApeTag.new(StringIO.new(EMPTY_APE_TAG.dup)).update{|x| x['Album']="\xfe"}}
     
-    # Test updating with invalid key
+    # Test updating with an invalid key
     assert_raises(ApeTagError){ApeTag.new(StringIO.new(EMPTY_APE_TAG.dup)).update{|x| x['x']=""}}
     
     # Test updating with too many items 
@@ -358,7 +375,7 @@ class ApeTagTest < Test::Unit::TestCase
     
     # Test updating with too large a tag
     assert_raises(ApeTagError){ApeTag.new(StringIO.new(EMPTY_APE_TAG.dup)).update{|x| x['xx']=' '*8118}}
-    # Test updating with just enough tag
+    # Test updating with a just large enough tag
     assert_nothing_raised{ApeTag.new(StringIO.new(EMPTY_APE_TAG.dup)).update{|x| x['xx']=' '*8117}}
   end
   

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: apetag
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-08-20 00:00:00 -07:00
-summary: APEv2 Tag Parser/Generator
+  version: 1.1.2
+date: 2007-11-07 00:00:00 -08:00
+summary: APEv2 Tag Reader/Writer
 require_paths: 
 - .
 email: code@jeremyevans.net
 homepage: 
-rubyforge_project: 
+rubyforge_project: apetag
 description: 
 autorequire: apetag
 default_executable: