ruby-mp3info 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2623bb3c42570ac26f433976d36d71e1ed64faf0
-  data.tar.gz: be52e6fb3afb871e59f8a24b9e18dda682f91e70
+  metadata.gz: ce54c521b67a367467f344b231debdbb1e36b543
+  data.tar.gz: 160261476cab97ea32fddd4870ff67a92ffd6ac5
 SHA512:
-  metadata.gz: 885f991c667e898af9decb33a2a63515c705f7eaf69f17f682410f117583edbf67febaf0dba7d218fcd9a1fd826a34c26be7abfcfb1cc1ecb4942c73cd2c702c
-  data.tar.gz: a7658745342508647a955ae12c9cdb0b74041e780fb15ac249414bb8aec254e553a51f492384ce27aa834c85f3704ae98dc6f4ffe2f9db2a1840ec37e8947e45
+  metadata.gz: 0609877cdd0fba3d09a74bc613338da699eb67dfe7bedf80f872ff09bdc23689bcb3e86c97632133f4c60bbad1c4ba8ac6e188799670e73772f818803627c9a4
+  data.tar.gz: 08999c5701caab8ba9a2a6e0d0ac0961e076d1acea747114878f1d84e2238631cf36cf472f5b2a4ad3bc880c6efa0eef2f0b558d544afb20bdfaf8c94c7e6076

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.9 / 2016-02-03
+
+* bugfix on JPEG picture parsing + testsuite
+
 === 0.8.8 / 2016-01-26
 
 * fix on picture parsing when mime type is wrong
@@ -132,9 +136,9 @@
 
 === 0.6.2 / 2008-03-02
 
-* better handling of frames: 
+* better handling of frames:
   decode and encode as raw string by default,
-  or handle charset decoding/encoding for /^T/ and 
+  or handle charset decoding/encoding for /^T/ and
   COMM frames
 
 === 0.6.1 / 2008-02-28

data/Rakefile

@@ -5,7 +5,7 @@ require 'hoe'
 Hoe.plugin :yard
 Hoe.plugin :gemspec
 
-Hoe.spec('ruby-mp3info') do 
+Hoe.spec('ruby-mp3info') do
   developer "Guillaume Pierronnet", "guillaume.pierronnet@gmail.com"
 end
 

data/lib/mp3info.rb

@@ -18,7 +18,7 @@ end
 
 class Mp3Info
 
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 
   LAYER = [ nil, 3, 2, 1]
   BITRATE = {
@@ -515,11 +515,11 @@ private
     bitrate = BITRATE[mpeg_version][layer-1][bits(head, 15,12)-1]
     samplerate = SAMPLERATE[mpeg_version][bits(head, 11,10)]
     padding = (head[9] == 1)
-	
+
     frame_slot_count = (( ((SAMPLES_PER_FRAME[layer][mpeg_version] / 8) * (bitrate*1000.0)) / samplerate ) + (padding ? 1 : 0)).to_i
     bytes_per_slot = ((layer == 1) ? 4 : 1)
     size = frame_slot_count * bytes_per_slot
-	
+
     channel_num = Mp3Info.bits(head, 7, 6)
     { :layer => layer,
       :bitrate => bitrate,

data/lib/mp3info/id3v2.rb

@@ -284,32 +284,26 @@ class ID3v2 < DelegateClass(Hash)
       next if !pic.is_a?(String) or pic == ""
       pic.force_encoding 'BINARY' 
       picture = []
-      jpg = Regexp.new("jpg|JPG|jpeg|JPEG".force_encoding("BINARY"),
+      jpg_regexp = Regexp.new("jpg|JPG|jpeg|JPEG".force_encoding("BINARY"),
                    Regexp::FIXEDENCODING )
-      png = Regexp.new("png|PNG".force_encoding("BINARY"),
+      png_regexp = Regexp.new("png|PNG".force_encoding("BINARY"),
                    Regexp::FIXEDENCODING )
       header = pic.unpack('a120').first.force_encoding "BINARY"
       mime_pos = 0
       
       # safest way to correctly extract jpg and png is finding mime
-      if header.match jpg and not header.match png
+      if header.match jpg_regexp and not header.match png_regexp
         mime = "jpg"
-        mime_pos = header =~ jpg
+        mime_pos = header =~ jpg_regexp
         start = Regexp.new("\xFF\xD8".force_encoding("BINARY"),
                 Regexp::FIXEDENCODING )
         start_with_anchor = Regexp.new("^\xFF\xD8".force_encoding("BINARY"),
                                        Regexp::FIXEDENCODING )
-         # inspect jpg image header (first 10 chars) for "\xFF\x00" (expect "\xFF")
-         trailing_null_byte = Regexp.new("(\377)(\000)".force_encoding('BINARY'), 
-                                Regexp::FIXEDENCODING)
-         if (data =~ trailing_null_byte) < 10
-           data.gsub!(trailing_null_byte, "\xff".force_encoding('BINARY'))
-         end
       end
       
-      if header.match png and not header.match jpg
+      if header.match png_regexp and not header.match jpg_regexp
         mime = "png"
-        mime_pos = header =~ png
+        mime_pos = header =~ png_regexp
         start = Regexp.new("\x89PNG".force_encoding("BINARY"),
                 Regexp::FIXEDENCODING )
         start_with_anchor = Regexp.new("^\x89PNG".force_encoding("BINARY"),
@@ -319,12 +313,22 @@ class ID3v2 < DelegateClass(Hash)
       puts "analysing image: #{header.inspect}..." if $DEBUG
       _, _, desc, data = pic[mime_pos, pic.length].unpack('Z*hZ*a*')
 
-      if mime and (!data.match(start_with_anchor) or data.nil?)
-        real_start = pic =~ start
-        data = pic[real_start, pic.length]
-      end
-
-      unless mime
+      if mime
+        if !data.match(start_with_anchor) or data.nil?
+          real_start = pic =~ start
+          data = pic[real_start, pic.length]
+        end
+        
+        if mime == "jpg"
+          # inspect jpg image header (first 10 chars) for "\xFF\x00" (expect "\xFF")
+          trailing_null_byte = Regexp.new("(\377)(\000)".force_encoding('BINARY'), 
+                                          Regexp::FIXEDENCODING)
+          md = data =~ trailing_null_byte
+          if !md.nil? and md < 10
+            data.gsub!(trailing_null_byte, "\xff".force_encoding('BINARY'))
+          end
+        end
+      else
         mime = "dat"
         # if no jpg or png, extract data anyway e.g. gif
         mime, desc, data = pic.unpack('h Z* h Z* a*').values_at(1,3,4)

data/test/test_ruby-mp3info.rb

@@ -207,7 +207,7 @@ class Mp3InfoTest < TestCase
     end
   end
 
-  def test_id3v2_get_pictures
+  def test_id3v2_get_pictures_png
     img = "\x89PNG".force_encoding('BINARY') +
       random_string(120).force_encoding('BINARY')
     Mp3Info.open(TEMP_FILE) do |mp3|
@@ -218,19 +218,45 @@ class Mp3InfoTest < TestCase
     end
   end
 
-  def test_id3v2_get_pictures
+  def test_id3v2_get_pictures_png_bad_mime
     img = "\x89PNG\r\n\u001A\n\u0000\u0000\u0000\rIHDR\u0000\u0000\u0000\u0001\u0000\u0000\u0000\u0001\b\u0002\u0000\u0000\u0000\x90wS\xDE\u0000\u0000\u0000\fIDAT\b\xD7c\xF8\xFF\xFF?\u0000\u0005\xFE\u0002\xFE\xDC\xCCY\xE7\u0000\u0000\u0000\u0000IEND\xAEB`\x82".force_encoding('BINARY')
     Mp3Info.open(TEMP_FILE) do |mp3|
       mp3.tag2.add_picture(img, :description => 'example image.png', :mime => 'jpg')
     end
-    
+
     Mp3Info.open(TEMP_FILE) do |mp3|
       assert_equal(["01_example image.png", img], mp3.tag2.pictures[0])
     end
   end
-  
+
+  def test_id3v2_get_pictures_jpg
+    img = "\xFF\xD8".force_encoding('BINARY') +
+          random_string(120).force_encoding('BINARY')
+
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      mp3.tag2.add_picture(img, :description => 'example image.jpg')
+    end
+
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      assert_equal(["01_example image.jpg", img], mp3.tag2.pictures[0])
+    end
+  end
+
+  def test_id3v2_get_pictures_jpg_bad_mime
+    img = "\xFF\xD8".force_encoding('BINARY') +
+          random_string(120).force_encoding('BINARY')
+
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      mp3.tag2.add_picture(img, :description => 'example image.jpg', :mime => 'png')
+    end
+
+    Mp3Info.open(TEMP_FILE) do |mp3|
+      assert_equal(["01_example image.jpg", img], mp3.tag2.pictures[0])
+    end
+  end
+
   def test_id3v2_remove_pictures
-    jpg_data = "\xFF".force_encoding('BINARY') +
+    jpg_data = "\xFF\xD8".force_encoding('BINARY') +
       random_string(123).force_encoding('BINARY')
     Mp3Info.open(TEMP_FILE) do |mp|
       mp.tag2.add_picture(jpg_data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mp3info
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Guillaume Pierronnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc