taglib-ruby 0.6.0 → 0.7.0

data/lib/taglib.rb

@@ -14,3 +14,5 @@ require 'taglib/ogg'
 require 'taglib/vorbis'
 require 'taglib/flac'
 require 'taglib/mp4'
+require 'taglib/aiff'
+require 'taglib/wav'

data/lib/taglib/aiff.rb

@@ -0,0 +1,7 @@
+require 'taglib_aiff'
+
+module TagLib::RIFF::AIFF
+  class File
+    extend ::TagLib::FileOpenable
+  end
+end

data/lib/taglib/version.rb

@@ -1,7 +1,7 @@
 module TagLib
   module Version
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     PATCH = 0
     BUILD = nil
 

data/lib/taglib/wav.rb

@@ -0,0 +1,7 @@
+require 'taglib_wav'
+
+module TagLib::RIFF::WAV
+  class File
+    extend ::TagLib::FileOpenable
+  end
+end

data/taglib-ruby.gemspec

@@ -7,7 +7,7 @@ require 'taglib/version'
 Gem::Specification.new do |s|
   s.name        = "taglib-ruby"
   s.version     = TagLib::Version::STRING
-  s.authors     = ["Robin Stocker", "Jacob Vosmaer"]
+  s.authors     = ["Robin Stocker", "Jacob Vosmaer", "Thomas Chevereau"]
   s.email       = ["robin@nibor.org"]
   s.homepage    = "http://robinst.github.io/taglib-ruby/"
   s.licenses    = ["MIT"]
@@ -24,7 +24,7 @@ DESC
   s.requirements = ["taglib (libtag1-dev in Debian/Ubuntu, taglib-devel in Fedora/RHEL)"]
 
   s.add_development_dependency 'bundler', '~> 1.2'
-  s.add_development_dependency 'rake-compiler', '~> 0.8'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
   s.add_development_dependency 'shoulda-context', '~> 1.0'
   s.add_development_dependency 'yard', '~> 0.7'
   s.add_development_dependency 'kramdown', '~> 1.0'
@@ -38,6 +38,8 @@ DESC
     "ext/taglib_vorbis/extconf.rb",
     "ext/taglib_flac/extconf.rb",
     "ext/taglib_mp4/extconf.rb",
+    "ext/taglib_aiff/extconf.rb",
+    "ext/taglib_wav/extconf.rb",
   ]
   s.extra_rdoc_files = [
     "CHANGES.md",
@@ -53,6 +55,7 @@ DESC
     "README.md",
     "Rakefile",
     "docs/default/fulldoc/html/css/common.css",
+    "docs/taglib/aiff.rb",
     "docs/taglib/base.rb",
     "docs/taglib/flac.rb",
     "docs/taglib/id3v1.rb",
@@ -60,8 +63,13 @@ DESC
     "docs/taglib/mp4.rb",
     "docs/taglib/mpeg.rb",
     "docs/taglib/ogg.rb",
+    "docs/taglib/riff.rb",
     "docs/taglib/vorbis.rb",
+    "docs/taglib/wav.rb",
     "ext/extconf_common.rb",
+    "ext/taglib_aiff/extconf.rb",
+    "ext/taglib_aiff/taglib_aiff.i",
+    "ext/taglib_aiff/taglib_aiff_wrap.cxx",
     "ext/taglib_base/extconf.rb",
     "ext/taglib_base/includes.i",
     "ext/taglib_base/taglib_base.i",
@@ -88,9 +96,13 @@ DESC
     "ext/taglib_vorbis/extconf.rb",
     "ext/taglib_vorbis/taglib_vorbis.i",
     "ext/taglib_vorbis/taglib_vorbis_wrap.cxx",
+    "ext/taglib_wav/extconf.rb",
+    "ext/taglib_wav/taglib_wav.i",
+    "ext/taglib_wav/taglib_wav_wrap.cxx",
     "ext/valgrind-suppressions.txt",
     "ext/win.cmake",
     "lib/taglib.rb",
+    "lib/taglib/aiff.rb",
     "lib/taglib/base.rb",
     "lib/taglib/flac.rb",
     "lib/taglib/id3v1.rb",
@@ -100,6 +112,7 @@ DESC
     "lib/taglib/ogg.rb",
     "lib/taglib/version.rb",
     "lib/taglib/vorbis.rb",
+    "lib/taglib/wav.rb",
     "taglib-ruby.gemspec",
     "tasks/docs_coverage.rake",
     "tasks/ext.rake",
@@ -107,6 +120,7 @@ DESC
     "tasks/swig.rake",
     "test/base_test.rb",
     "test/data/Makefile",
+    "test/data/aiff-sample.aiff",
     "test/data/add-relative-volume.cpp",
     "test/data/crash.mp3",
     "test/data/flac-create.cpp",
@@ -123,10 +137,17 @@ DESC
     "test/data/unicode.mp3",
     "test/data/vorbis-create.cpp",
     "test/data/vorbis.oga",
+    "test/data/wav-create.cpp",
+    "test/data/wav-dump.cpp",
+    "test/data/wav-sample.wav",
+    "test/aiff_examples_test.rb",
+    "test/aiff_file_test.rb",
+    "test/aiff_file_write_test.rb",
     "test/helper.rb",
     "test/fileref_open_test.rb",
     "test/fileref_properties_test.rb",
     "test/fileref_write_test.rb",
+    "test/file_test.rb",
     "test/flac_file_test.rb",
     "test/flac_file_write_test.rb",
     "test/id3v1_tag_test.rb",
@@ -136,6 +157,7 @@ DESC
     "test/id3v2_relative_volume_test.rb",
     "test/id3v2_tag_test.rb",
     "test/id3v2_unicode_test.rb",
+    "test/id3v2_unknown_frames_test.rb",
     "test/id3v2_write_test.rb",
     "test/mp4_file_test.rb",
     "test/mp4_file_write_test.rb",
@@ -145,5 +167,8 @@ DESC
     "test/unicode_filename_test.rb",
     "test/vorbis_file_test.rb",
     "test/vorbis_tag_test.rb",
+    "test/wav_examples_test.rb",
+    "test/wav_file_test.rb",
+    "test/wav_file_write_test.rb",
   ]
 end

data/tasks/ext.rake

@@ -1,23 +1,23 @@
 # Extension tasks and cross-compiling
 
 host = 'i686-w64-mingw32'
-plat = 'x86-mingw32'
+$plat = 'i386-mingw32'
 
-tmp = "#{Dir.pwd}/tmp/#{plat}"
+tmp = "#{Dir.pwd}/tmp/#{$plat}"
 toolchain_file = "#{Dir.pwd}/ext/win.cmake"
 install_dir = "#{tmp}/install"
 install_dll = "#{install_dir}/bin/libtag.dll"
-ldflags = "-static-libgcc -static-libstdc++"
-$cross_config_options = [%(--with-opt-dir=#{install_dir} --with-ldflags="#{ldflags}")]
+$cross_config_options = ["--with-opt-dir=#{install_dir}"]
 
-taglib_version = '1.8'
+taglib_version = '1.9.1'
 taglib = "taglib-#{taglib_version}"
-taglib_url = "http://cloud.github.com/downloads/taglib/taglib/#{taglib}.tar.gz"
+taglib_url = "https://github.com/taglib/taglib/releases/download/v#{taglib_version}/#{taglib}.tar.gz"
 # WITH_MP4, WITH_ASF only needed with taglib 1.7, will be default in 1.8
 taglib_options = "-DCMAKE_BUILD_TYPE=Release -DWITH_MP4=ON -DWITH_ASF=ON"
 
 def configure_cross_compile(ext)
   ext.cross_compile = true
+  ext.cross_platform = $plat
   ext.cross_config_options.concat($cross_config_options)
   ext.cross_compiling do |gem|
     gem.files << "lib/libtag.dll"
@@ -49,19 +49,26 @@ end
 Rake::ExtensionTask.new("taglib_mp4", $gemspec) do |ext|
   configure_cross_compile(ext)
 end
+Rake::ExtensionTask.new("taglib_aiff", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_wav", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
 
-task :cross => [:taglib] do
+task :cross do
   # Mkmf just uses "g++" as C++ compiler, despite what's in rbconfig.rb.
   # So, we need to hack around it by setting CXX to the cross compiler.
   ENV["CXX"] = "#{host}-g++"
-  install install_dll, "lib/"
 end
 
-task :taglib => [install_dll]
+file "tmp/#{$plat}/stage/lib/libtag.dll" => [install_dll] do |f|
+  install install_dll, f
+end
 
 file install_dll => ["#{tmp}/#{taglib}"] do
   chdir "#{tmp}/#{taglib}" do
-    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} -DCMAKE_SHARED_LINKER_FLAGS="#{ldflags}" #{taglib_options})
+    sh %(cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file} #{taglib_options})
     sh "make VERBOSE=1"
     sh "make install"
   end

data/tasks/swig.rake

@@ -17,6 +17,8 @@ task :swig =>
    'ext/taglib_vorbis/taglib_vorbis_wrap.cxx',
    'ext/taglib_flac/taglib_flac_wrap.cxx',
    'ext/taglib_mp4/taglib_mp4_wrap.cxx',
+   'ext/taglib_aiff/taglib_aiff_wrap.cxx',
+   'ext/taglib_wav/taglib_wav_wrap.cxx',
   ]
 
 base_dependencies = ['ext/taglib_base/taglib_base.i', 'ext/taglib_base/includes.i']
@@ -52,3 +54,11 @@ end
 file 'ext/taglib_mp4/taglib_mp4_wrap.cxx' => ['ext/taglib_mp4/taglib_mp4.i'] + base_dependencies do
   run_swig('taglib_mp4')
 end
+
+file 'ext/taglib_aiff/taglib_aiff_wrap.cxx' => ['ext/taglib_aiff/taglib_aiff.i'] + base_dependencies do
+  run_swig('taglib_aiff')
+end
+
+file 'ext/taglib_wav/taglib_wav_wrap.cxx' => ['ext/taglib_wav/taglib_wav.i'] + base_dependencies do
+  run_swig('taglib_wav')
+end

data/test/aiff_examples_test.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class AIFFExamples < Test::Unit::TestCase
+
+  DATA_FILE_PREFIX = "test/data/aiff-"
+
+  context "TagLib::RIFF::AIFF::File" do
+
+    should "Run TagLib::RIFF::AIFF::File examples" do
+
+
+      # @example Reading the title
+      title = TagLib::RIFF::AIFF::File.open("#{DATA_FILE_PREFIX}sample.aiff") do |file|
+        file.tag.title
+      end
+
+      # @example Reading AIFF-specific audio properties
+      TagLib::RIFF::AIFF::File.open("#{DATA_FILE_PREFIX}sample.aiff") do |file|
+        file.audio_properties.sample_width  #=>  16
+      end
+
+      # @example Saving ID3v2 cover-art to disk
+      TagLib::RIFF::AIFF::File.open("#{DATA_FILE_PREFIX}sample.aiff") do |file|
+        id3v2_tag = file.tag
+        cover = id3v2_tag.frame_list('APIC').first
+        ext = cover.mime_type.rpartition('/')[2]
+        File.open("#{DATA_FILE_PREFIX}cover-art.#{ext}", "wb") { |f| f.write cover.picture }
+      end
+
+
+      # checks
+      assert_equal "AIFF Dummy Track Title - ID3v2.4", title
+      assert_equal true, File.exist?("#{DATA_FILE_PREFIX}cover-art.jpeg")
+      FileUtils.rm("#{DATA_FILE_PREFIX}cover-art.jpeg")
+    end
+
+  end
+
+end

data/test/aiff_file_test.rb

@@ -0,0 +1,94 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class AIFFFileTest < Test::Unit::TestCase
+
+  SAMPLE_FILE = "test/data/aiff-sample.aiff"
+  PICTURE_FILE = "test/data/globe_east_540.jpg"
+
+  context "TagLib::RIFF::AIFF::File" do
+    setup do
+      @file = TagLib::RIFF::AIFF::File.new(SAMPLE_FILE)
+      @tag = @file.tag
+      File.open(PICTURE_FILE, "rb") do |f|
+        @picture_data = f.read
+      end
+    end
+
+    should "have an ID3v2 tag" do
+      assert_not_nil @tag
+      assert_equal TagLib::ID3v2::Tag, @tag.class
+    end
+
+    should "contain basic tag information" do
+      assert_equal "AIFF Dummy Track Title - ID3v2.4", @tag.title
+      assert_equal "AIFF Dummy Artist Name", @tag.artist
+      assert_equal "AIFF Dummy Album Title", @tag.album
+      assert_equal "AIFF Dummy Comment", @tag.comment
+      assert_equal "Jazz", @tag.genre
+      assert_equal 2014, @tag.year
+      assert_equal 3, @tag.track
+      assert_equal false, @tag.empty?
+    end
+
+    context "APIC frame" do
+      setup do
+        @apic = @tag.frame_list('APIC').first
+      end
+
+      should "exist" do
+        assert_not_nil @apic
+        assert_equal TagLib::ID3v2::AttachedPictureFrame, @apic.class
+      end
+
+      should "have a type" do
+        assert_equal TagLib::ID3v2::AttachedPictureFrame::FrontCover, @apic.type
+      end
+
+      should "have a mime type" do
+        assert_equal "image/jpeg", @apic.mime_type
+      end
+
+      should "have picture bytes" do
+        assert_equal 61649, @apic.picture.size
+        assert_equal @picture_data, @apic.picture
+      end
+    end
+
+    context "audio properties" do
+      setup do
+        @properties = @file.audio_properties
+      end
+
+      should "exist" do
+        assert_not_nil @properties
+      end
+
+      should "contain basic information" do
+        assert_equal 2, @properties.length
+        assert_equal 256, @properties.bitrate
+        assert_equal 8000, @properties.sample_rate
+        assert_equal 2, @properties.channels
+      end
+
+      should "contain AIFF-specific information" do
+        assert_equal 16, @properties.sample_width
+      end
+    end
+
+    teardown do
+      @file.close
+      @file = nil
+    end
+  end
+
+  context "TagLib::RIFF::AIFF::File.open" do
+    should "have open method" do
+      title = nil
+      TagLib::RIFF::AIFF::File.open(SAMPLE_FILE, false) do |file|
+        title = file.tag.title
+      end
+      assert_equal "AIFF Dummy Track Title - ID3v2.4", title
+    end
+  end
+
+end

data/test/aiff_file_write_test.rb

@@ -0,0 +1,88 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class AIFFFileWriteTest < Test::Unit::TestCase
+
+  SAMPLE_FILE = "test/data/aiff-sample.aiff"
+  OUTPUT_FILE = "test/data/_output.aiff"
+  PICTURE_FILE = "test/data/globe_east_90.jpg"
+
+  def reloaded
+    TagLib::RIFF::AIFF::File.open(OUTPUT_FILE, false) do |file|
+      yield file
+    end
+  end
+
+  context "TagLib::RIFF::AIFF::File" do
+    setup do
+      FileUtils.cp SAMPLE_FILE, OUTPUT_FILE
+      @file = TagLib::RIFF::AIFF::File.new(OUTPUT_FILE, false)
+    end
+
+    should "be able to save the title" do
+      tag = @file.tag
+      assert_not_nil tag
+      tag.title = "New Title"
+      success = @file.save
+      assert success
+      @file.close
+      @file = nil
+
+      written_title = reloaded do |file|
+        file.tag.title
+      end
+      assert_equal "New Title", written_title
+    end
+
+    should "have one picture frame" do
+      assert_equal 1, @file.tag.frame_list('APIC').size
+    end
+
+    should "be able to remove all picture frames" do
+      @file.tag.remove_frames('APIC')
+      success = @file.save
+      assert success
+      @file.close
+      @file = nil
+
+      reloaded do |file|
+        assert_equal 0, file.tag.frame_list('APIC').size
+      end
+    end
+
+    should "be able to add a picture frame" do
+      picture_data = File.open(PICTURE_FILE, 'rb') { |f| f.read }
+
+      apic = TagLib::ID3v2::AttachedPictureFrame.new
+      apic.mime_type = "image/jpeg"
+      apic.description = "desc"
+      apic.text_encoding = TagLib::String::UTF8
+      apic.picture = picture_data
+      apic.type = TagLib::ID3v2::AttachedPictureFrame::BackCover
+
+      @file.tag.add_frame(apic)
+      success = @file.save
+      assert success
+      @file.close
+      @file = nil
+
+      reloaded do |file|
+        assert_equal 2, file.tag.frame_list('APIC').size
+      end
+
+      reloaded do |file|
+        written_apic = file.tag.frame_list("APIC")[1]
+        assert_equal "image/jpeg", written_apic.mime_type
+        assert_equal "desc", written_apic.description
+        assert_equal picture_data, written_apic.picture
+      end
+    end
+
+    teardown do
+      if @file
+        @file.close
+        @file = nil
+      end
+      FileUtils.rm OUTPUT_FILE
+    end
+  end
+end