taglib-ruby 1.1.0 → 1.1.1

data/test/data/vorbis-create.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <taglib/taglib.h>
 #include <taglib/vorbisfile.h>
@@ -10,9 +10,10 @@ using namespace TagLib;
 
 int main(int argc, char **argv) {
   if (argc != 2) {
-    std::cout << "usage: " << argv[0] << " file.oga" << std::endl;
-    exit(1);
+    std::cerr << "usage: " << argv[0] << " file.oga" << std::endl;
+    return EXIT_FAILURE;
   }
+
   char *filename = argv[1];
 
   Vorbis::File file(filename);
@@ -41,7 +42,11 @@ int main(int argc, char **argv) {
   tag->addField("MULTIPLE", "A");
   tag->addField("MULTIPLE", "B", false);
 
-  ByteVector pictureData = getPictureData("globe_east_90.jpg");
+  const ByteVector data = getPictureData("globe_east_90.jpg");
+  if (data.isEmpty()) {
+    std::cerr << "failed to get picture data" << std::endl;
+    return EXIT_FAILURE;
+  }
 
   FLAC::Picture picture;
   picture.setType(FLAC::Picture::FrontCover);
@@ -51,11 +56,13 @@ int main(int argc, char **argv) {
   picture.setHeight(90);
   picture.setColorDepth(24);
   picture.setNumColors(0);
-  picture.setData(pictureData);
+  picture.setData(data);
 
   tag->addField("METADATA_BLOCK_PICTURE", picture.render().toBase64());
 
   file.save();
+
+  return EXIT_SUCCESS;
 }
 
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/data/wav-create.cpp

@@ -1,3 +1,6 @@
+#include <iostream>
+#include <cstdlib>
+
 #include <taglib/taglib.h>
 #include <taglib/wavfile.h>
 #include <taglib/wavproperties.h>
@@ -7,12 +10,12 @@
 
 using namespace TagLib;
 
-
 int main(int argc, char **argv) {
   if (argc != 2) {
-    std::cout << "usage: " << argv[0] << " file.wav" << std::endl;
-    exit(1);
+    std::cerr << "usage: " << argv[0] << " file.wav" << std::endl;
+    return EXIT_FAILURE;
   }
+
   char *filename = argv[1];
 
   RIFF::WAV::File file(filename);
@@ -32,6 +35,11 @@ int main(int argc, char **argv) {
   ID3v2::AttachedPictureFrame *apic;
 
   picture_data = getPictureData("globe_east_540.jpg");
+  if (picture_data.isEmpty()) {
+    std::cerr << "failed to get picture data" << std::endl;
+    return EXIT_FAILURE;
+  }
+
   apic = new ID3v2::AttachedPictureFrame();
   apic->setPicture(picture_data);
   apic->setMimeType("image/jpeg");
@@ -41,6 +49,11 @@ int main(int argc, char **argv) {
   tag->addFrame(apic);
 
   picture_data = getPictureData("globe_east_90.jpg");
+  if (picture_data.isEmpty()) {
+    std::cerr << "failed to get picture data" << std::endl;
+    return EXIT_FAILURE;
+  }
+
   apic = new ID3v2::AttachedPictureFrame();
   apic->setPicture(picture_data);
   apic->setMimeType("image/jpeg");
@@ -50,6 +63,8 @@ int main(int argc, char **argv) {
   tag->addFrame(apic);
 
   file.save();
+
+  return EXIT_SUCCESS;
 }
 
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/file_test.rb

@@ -1,18 +1,20 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestFile < Test::Unit::TestCase
-  context "The sample.mp3 file" do
+  context 'The sample.mp3 file' do
     setup do
-      @mpeg_file = TagLib::MPEG::File.new("test/data/sample.mp3", false)
+      @mpeg_file = TagLib::MPEG::File.new('test/data/sample.mp3', false)
     end
 
-    context "filename" do
-      should "be the right name" do
+    context 'filename' do
+      should 'be the right name' do
         assert_equal 'test/data/sample.mp3', @mpeg_file.name
       end
 
       if HAVE_ENCODING
-        should "have the right encoding" do
+        should 'have the right encoding' do
           assert_equal Encoding.find('filesystem'), @mpeg_file.name.encoding
         end
       end

data/test/fileref_open_test.rb

@@ -1,30 +1,32 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class FileRefOpenTest < Test::Unit::TestCase
-  context "TagLib::FileRef.open" do
-    should "return result" do
-      title = TagLib::FileRef.open("test/data/vorbis.oga", false) do |file|
+  context 'TagLib::FileRef.open' do
+    should 'return result' do
+      title = TagLib::FileRef.open('test/data/vorbis.oga', false) do |file|
         tag = file.tag
         assert_not_nil tag
         tag.title
       end
-      assert_equal "Title", title
+      assert_equal 'Title', title
     end
 
-    should "close even with exception" do
+    should 'close even with exception' do
       f = nil
       begin
-        TagLib::FileRef.open("test/data/vorbis.oga", false) do |file|
+        TagLib::FileRef.open('test/data/vorbis.oga', false) do |file|
           f = file
           raise NotImplementedError
         end
-        flunk("Should have raised NotImplementedError.")
+        flunk('Should have raised NotImplementedError.')
       rescue NotImplementedError
         begin
           f.tag
-          flunk("Should have raised ObjectPreviouslyDeleted.")
-        rescue => e
-          assert_equal "ObjectPreviouslyDeleted", e.class.to_s
+          flunk('Should have raised ObjectPreviouslyDeleted.')
+        rescue StandardError => e
+          assert_equal 'ObjectPreviouslyDeleted', e.class.to_s
         end
       end
     end

data/test/fileref_properties_test.rb

@@ -1,17 +1,19 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestFileRefProperties < Test::Unit::TestCase
-  context "The crash.mp3 file audio properties" do
+  context 'The crash.mp3 file audio properties' do
     setup do
-      @fileref = TagLib::FileRef.new("test/data/crash.mp3", true, TagLib::AudioProperties::Average)
+      @fileref = TagLib::FileRef.new('test/data/crash.mp3', true, TagLib::AudioProperties::Average)
       @properties = @fileref.audio_properties
     end
 
-    should "exist" do
+    should 'exist' do
       assert_not_nil @properties
     end
 
-    should "contain basic information" do
+    should 'contain basic information' do
       assert_equal 2, @properties.length_in_seconds
       assert_equal 157, @properties.bitrate
       assert_equal 44100, @properties.sample_rate

data/test/fileref_write_test.rb

@@ -1,36 +1,37 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 require 'fileutils'
 
 class TestFileRefWrite < Test::Unit::TestCase
+  SAMPLE_FILE = 'test/data/sample.mp3'
+  OUTPUT_FILE = 'test/data/output.mp3'
 
-  SAMPLE_FILE = "test/data/sample.mp3"
-  OUTPUT_FILE = "test/data/output.mp3"
-
-  context "TagLib::FileRef" do
+  context 'TagLib::FileRef' do
     setup do
       FileUtils.cp SAMPLE_FILE, OUTPUT_FILE
       @file = TagLib::MPEG::File.new(OUTPUT_FILE, false)
     end
 
-    should "be able to save the title" do
+    should 'be able to save the title' do
       tag = @file.tag
       assert_not_nil tag
-      tag.title = "New Title"
+      tag.title = 'New Title'
       success = @file.save
       assert success
       @file.close
       @file = nil
 
       written_file = TagLib::MPEG::File.new(OUTPUT_FILE, false)
-      assert_equal "New Title", written_file.tag.title
+      assert_equal 'New Title', written_file.tag.title
       written_file.close
     end
 
-    should "not segfault when setting int" do
+    should 'not segfault when setting int' do
       begin
         @file.tag.title = 42
-        flunk("Should have raised a TypeError")
+        flunk('Should have raised a TypeError')
       rescue TypeError
         # this is good
       end
@@ -45,15 +46,15 @@ class TestFileRefWrite < Test::Unit::TestCase
     end
   end
 
-  context "TagLib::FileRef.open" do
+  context 'TagLib::FileRef.open' do
     setup do
       FileUtils.cp SAMPLE_FILE, OUTPUT_FILE
     end
 
-    should "be able to save file" do
+    should 'be able to save file' do
       TagLib::MPEG::File.open(OUTPUT_FILE, false) do |file|
         tag = file.tag
-        tag.title = "New Title"
+        tag.title = 'New Title'
         file.save
       end
 
@@ -61,7 +62,7 @@ class TestFileRefWrite < Test::Unit::TestCase
         tag = file.tag
         tag.title
       end
-      assert_equal "New Title", title
+      assert_equal 'New Title', title
     end
 
     teardown do

data/test/flac_file_test.rb

@@ -1,49 +1,54 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class FlacFileTest < Test::Unit::TestCase
-  context "TagLib::FLAC::File" do
+  context 'TagLib::FLAC::File' do
     setup do
-      @file = TagLib::FLAC::File.new("test/data/flac.flac")
+      @file = TagLib::FLAC::File.new('test/data/flac.flac')
     end
 
-    should "have a tag" do
+    should 'have a tag' do
       tag = @file.tag
       assert_not_nil tag
       assert_equal TagLib::Tag, tag.class
     end
 
-    should "have XiphComment" do
+    should 'have XiphComment' do
       assert @file.xiph_comment?
       tag = @file.xiph_comment
       assert_not_nil tag
       assert_equal TagLib::Ogg::XiphComment, tag.class
+      assert_not_nil @file.xiph_comment(true)
     end
 
-    should "have method for ID3v1 tag" do
+    should 'have method for ID3v1 tag' do
       refute @file.id3v1_tag?
       assert_nil @file.id3v1_tag
+      assert_not_nil @file.id3v1_tag(true)
     end
 
-    should "have method for ID3v2 tag" do
+    should 'have method for ID3v2 tag' do
       refute @file.id3v2_tag?
       assert_nil @file.id3v2_tag
+      assert_not_nil @file.id3v2_tag(true)
     end
 
-    should "support stripping tags by type" do
+    should 'support stripping tags by type' do
       @file.strip(TagLib::FLAC::File::XiphComment)
       assert @file.xiph_comment?
     end
 
-    context "audio properties" do
+    context 'audio properties' do
       setup do
         @properties = @file.audio_properties
       end
 
-      should "exist" do
+      should 'exist' do
         assert_not_nil @properties
       end
 
-      should "contain basic information" do
+      should 'contain basic information' do
         assert_equal 1, @properties.length_in_seconds
         assert_equal 1017, @properties.length_in_milliseconds
         assert_equal 209, @properties.bitrate
@@ -51,51 +56,51 @@ class FlacFileTest < Test::Unit::TestCase
         assert_equal 1, @properties.channels
       end
 
-      should "contain flac-specific information" do
+      should 'contain flac-specific information' do
         assert_equal 16, @properties.bits_per_sample
-        s = ["78d19b86df2cd488b35957e6bd884968"].pack('H*')
+        s = ['78d19b86df2cd488b35957e6bd884968'].pack('H*')
         assert_equal s, @properties.signature
       end
     end
 
-    should "have pictures" do
+    should 'have pictures' do
       refute_empty @file.picture_list
     end
 
-    context "first picture" do
+    context 'first picture' do
       setup do
         @picture = @file.picture_list.first
       end
 
-      should "be a TagLib::FLAC::Picture," do
+      should 'be a TagLib::FLAC::Picture,' do
         assert_equal TagLib::FLAC::Picture, @picture.class
       end
 
-      should "have meta-data" do
+      should 'have meta-data' do
         assert_equal TagLib::FLAC::Picture::FrontCover, @picture.type
-        assert_equal "image/jpeg", @picture.mime_type
-        assert_equal "Globe", @picture.description
+        assert_equal 'image/jpeg', @picture.mime_type
+        assert_equal 'Globe', @picture.description
         assert_equal 90, @picture.width
         assert_equal 90, @picture.height
         assert_equal 8, @picture.color_depth
         assert_equal 0, @picture.num_colors
       end
 
-      should "have data" do
-        picture_data = File.open("test/data/globe_east_90.jpg", 'rb'){ |f| f.read }
+      should 'have data' do
+        picture_data = File.open('test/data/globe_east_90.jpg', 'rb') { |f| f.read }
         assert_equal picture_data, @picture.data
       end
     end
 
-    should "support removing a picture" do
+    should 'support removing a picture' do
       refute_empty @file.picture_list
       @file.remove_picture(@file.picture_list.first)
       assert_empty @file.picture_list
     end
 
-    should "support removing all pictures" do
+    should 'support removing all pictures' do
       refute_empty @file.picture_list
-      @file.remove_pictures()
+      @file.remove_pictures
       assert_empty @file.picture_list
     end
 
@@ -105,13 +110,13 @@ class FlacFileTest < Test::Unit::TestCase
     end
   end
 
-  context "TagLib::FLAC::File.open" do
-    should "should work" do
+  context 'TagLib::FLAC::File.open' do
+    should 'should work' do
       title = nil
-      TagLib::FLAC::File.open("test/data/flac.flac", false) do |file|
+      TagLib::FLAC::File.open('test/data/flac.flac', false) do |file|
         title = file.tag.title
       end
-      assert_equal "Title", title
+      assert_equal 'Title', title
     end
   end
 end

data/test/flac_file_write_test.rb

@@ -1,27 +1,26 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class FlacFileWriteTest < Test::Unit::TestCase
+  SAMPLE_FILE = 'test/data/flac.flac'
+  OUTPUT_FILE = 'test/data/output.flac'
+  PICTURE_FILE = 'test/data/globe_east_90.jpg'
 
-  SAMPLE_FILE = "test/data/flac.flac"
-  OUTPUT_FILE = "test/data/output.flac"
-  PICTURE_FILE = "test/data/globe_east_90.jpg"
-
-  def reloaded
-    TagLib::FLAC::File.open(OUTPUT_FILE, false) do |file|
-      yield file
-    end
+  def reloaded(&block)
+    TagLib::FLAC::File.open(OUTPUT_FILE, false, &block)
   end
 
-  context "TagLib::FLAC::File" do
+  context 'TagLib::FLAC::File' do
     setup do
       FileUtils.cp SAMPLE_FILE, OUTPUT_FILE
       @file = TagLib::FLAC::File.new(OUTPUT_FILE, false)
     end
 
-    should "be able to save the title" do
+    should 'be able to save the title' do
       tag = @file.tag
       assert_not_nil tag
-      tag.title = "New Title"
+      tag.title = 'New Title'
       success = @file.save
       assert success
       @file.close
@@ -30,10 +29,10 @@ class FlacFileWriteTest < Test::Unit::TestCase
       written_title = reloaded do |file|
         file.tag.title
       end
-      assert_equal "New Title", written_title
+      assert_equal 'New Title', written_title
     end
 
-    should "be able to remove pictures" do
+    should 'be able to remove pictures' do
       assert_equal 1, @file.picture_list.size
       @file.remove_pictures
       assert_equal 0, @file.picture_list.size
@@ -41,13 +40,13 @@ class FlacFileWriteTest < Test::Unit::TestCase
       assert success
     end
 
-    should "be able to add and save a new picture" do
+    should 'be able to add and save a new picture' do
       picture_data = File.open(PICTURE_FILE, 'rb') { |f| f.read }
 
       pic = TagLib::FLAC::Picture.new
       pic.type = TagLib::FLAC::Picture::FrontCover
-      pic.mime_type = "image/jpeg"
-      pic.description = "desc"
+      pic.mime_type = 'image/jpeg'
+      pic.description = 'desc'
       pic.width = 90
       pic.height = 90
       pic.data = picture_data
@@ -62,8 +61,8 @@ class FlacFileWriteTest < Test::Unit::TestCase
       reloaded do |file|
         written_pic = file.picture_list.last
         assert_equal TagLib::FLAC::Picture::FrontCover, written_pic.type
-        assert_equal "image/jpeg", written_pic.mime_type
-        assert_equal "desc", written_pic.description
+        assert_equal 'image/jpeg', written_pic.mime_type
+        assert_equal 'desc', written_pic.description
         assert_equal 90, written_pic.width
         assert_equal 90, written_pic.height
         assert_equal picture_data, written_pic.data

data/test/flac_picture_memory_test.rb

@@ -1,43 +1,39 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestFlacPictureMemory < Test::Unit::TestCase
-
   N = 10000
 
-  context "TagLib::FLAC::Picture" do
- 
+  context 'TagLib::FLAC::Picture' do
     setup do
-      
     end
 
-    should "release memory when closing flac file with picture data" do
+    should 'release memory when closing flac file with picture data' do
       c = 0
       N.times do
-        TagLib::FLAC::File.open("test/data/flac.flac", false) do |f|
-          f.picture_list.each do |p|
-            x = p.data
-            c = c + 1
+        TagLib::FLAC::File.open('test/data/flac.flac', false) do |f|
+          f.picture_list.each do |_p|
+            c += 1
           end
         end
       end
-      assert_equal N,c
+      assert_equal N, c
     end
 
-    should "process a flac file without picture data" do
+    should 'process a flac file without picture data' do
       c = 0
       N.times do
-        TagLib::FLAC::File.open("test/data/flac_nopic.flac", false) do |f|
-          f.picture_list.each do |p|
-            x = p.data
-            c = c + 1
+        TagLib::FLAC::File.open('test/data/flac_nopic.flac', false) do |f|
+          f.picture_list.each do |_p|
+            c += 1
           end
         end
       end
-      assert_equal 0,c
+      assert_equal 0, c
     end
 
     teardown do
-
     end
   end
 end

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'rubygems'
 require 'test/unit'
 require 'shoulda-context'
@@ -7,4 +9,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'taglib'
 
-HAVE_ENCODING = !RUBY_VERSION.start_with?("1.8")
+HAVE_ENCODING = !RUBY_VERSION.start_with?('1.8')

data/test/id3v1_genres_test.rb

@@ -1,23 +1,25 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestVorbisTag < Test::Unit::TestCase
-  context "TagLib::ID3v1" do
-    should "list genres" do
-      assert_equal "Jazz", TagLib::ID3v1::genre_list[8]
+  context 'TagLib::ID3v1' do
+    should 'list genres' do
+      assert_equal 'Jazz', TagLib::ID3v1.genre_list[8]
     end
 
-    should "map genres to their index" do
-      assert_equal 8, TagLib::ID3v1::genre_map["Jazz"]
+    should 'map genres to their index' do
+      assert_equal 8, TagLib::ID3v1.genre_map['Jazz']
     end
 
-    should "support to query the value of a genre" do
-      assert_equal "Jazz", TagLib::ID3v1::genre(8)
-      assert_equal "", TagLib::ID3v1::genre(255)
+    should 'support to query the value of a genre' do
+      assert_equal 'Jazz', TagLib::ID3v1.genre(8)
+      assert_equal '', TagLib::ID3v1.genre(255)
     end
 
-    should "support to query the index of a genre" do
-      assert_equal 8, TagLib::ID3v1::genre_index("Jazz")
-      assert_equal 255, TagLib::ID3v1::genre_index("Unknown")
+    should 'support to query the index of a genre' do
+      assert_equal 8, TagLib::ID3v1.genre_index('Jazz')
+      assert_equal 255, TagLib::ID3v1.genre_index('Unknown')
     end
   end
-end
+end

data/test/id3v1_tag_test.rb

@@ -1,22 +1,24 @@
+# frozen-string-literal: true
+
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestID3v1Tag < Test::Unit::TestCase
-  context "The id3v1.mp3 file" do
+  context 'The id3v1.mp3 file' do
     setup do
       read_properties = false
-      @file = TagLib::MPEG::File.new("test/data/id3v1.mp3", read_properties)
+      @file = TagLib::MPEG::File.new('test/data/id3v1.mp3', read_properties)
     end
 
-    should "have an ID3v1 tag" do
+    should 'have an ID3v1 tag' do
       assert_not_nil @file.id3v1_tag
     end
 
-    context "ID3v1 tag" do
+    context 'ID3v1 tag' do
       setup do
         @tag = @file.id3v1_tag
       end
 
-      should "have basic properties" do
+      should 'have basic properties' do
         assert_equal 'Title', @tag.title
         assert_equal 'Artist', @tag.artist
         assert_equal 'Album', @tag.album