taglib-ruby 0.2.1 → 0.3.0

data/ext/win.cmake

@@ -0,0 +1,6 @@
+SET(CMAKE_SYSTEM_NAME Windows)
+SET(CMAKE_BUILD_TYPE Release)
+
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)

data/lib/taglib/id3v1.rb

@@ -0,0 +1 @@
+require 'taglib_id3v1'

data/lib/taglib/ogg.rb

@@ -0,0 +1 @@
+require 'taglib_ogg'

data/lib/taglib/version.rb

@@ -1,8 +1,8 @@
 module TagLib
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/taglib/vorbis.rb

@@ -0,0 +1 @@
+require 'taglib_vorbis'

data/lib/taglib.rb

@@ -1,4 +1,14 @@
+platform = RUBY_PLATFORM.split("-")[1]
+if platform == 'mingw32'
+  # Enable loading of pre-compiled libtag.dll
+  lib = File.expand_path(File.dirname(__FILE__))
+  ENV['PATH'] += (File::PATH_SEPARATOR + lib)
+end
+
 require 'taglib/version'
 require 'taglib/base'
 require 'taglib/mpeg'
+require 'taglib/id3v1'
 require 'taglib/id3v2'
+require 'taglib/ogg'
+require 'taglib/vorbis'

data/taglib-ruby.gemspec

@@ -5,15 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = "taglib-ruby"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Stocker"]
-  s.date = "2011-11-05"
+  s.date = "2012-01-02"
   s.description = "Ruby interface for the taglib C++ library.\n\nIn contrast to other libraries, this one wraps the C++ API using SWIG,\nnot only the minimal C API. This means that all tags can be accessed.\n"
   s.email = "robin@nibor.org"
-  s.extensions = ["ext/taglib_base/extconf.rb", "ext/taglib_mpeg/extconf.rb", "ext/taglib_id3v2/extconf.rb"]
+  s.extensions = ["ext/taglib_base/extconf.rb", "ext/taglib_mpeg/extconf.rb", "ext/taglib_id3v1/extconf.rb", "ext/taglib_id3v2/extconf.rb", "ext/taglib_ogg/extconf.rb", "ext/taglib_vorbis/extconf.rb"]
   s.extra_rdoc_files = [
+    "CHANGES.md",
     "LICENSE.txt",
     "README.md"
   ]
@@ -28,14 +29,19 @@ Gem::Specification.new do |s|
     "Rakefile",
     "docs/default/fulldoc/html/css/common.css",
     "docs/taglib/base.rb",
+    "docs/taglib/id3v1.rb",
     "docs/taglib/id3v2.rb",
     "docs/taglib/mpeg.rb",
-    "ext/Rakefile",
+    "docs/taglib/ogg.rb",
+    "docs/taglib/vorbis.rb",
     "ext/extconf_common.rb",
     "ext/taglib_base/extconf.rb",
     "ext/taglib_base/includes.i",
     "ext/taglib_base/taglib_base.i",
     "ext/taglib_base/taglib_base_wrap.cxx",
+    "ext/taglib_id3v1/extconf.rb",
+    "ext/taglib_id3v1/taglib_id3v1.i",
+    "ext/taglib_id3v1/taglib_id3v1_wrap.cxx",
     "ext/taglib_id3v2/extconf.rb",
     "ext/taglib_id3v2/relativevolumeframe.i",
     "ext/taglib_id3v2/taglib_id3v2.i",
@@ -43,22 +49,41 @@ Gem::Specification.new do |s|
     "ext/taglib_mpeg/extconf.rb",
     "ext/taglib_mpeg/taglib_mpeg.i",
     "ext/taglib_mpeg/taglib_mpeg_wrap.cxx",
+    "ext/taglib_ogg/extconf.rb",
+    "ext/taglib_ogg/taglib_ogg.i",
+    "ext/taglib_ogg/taglib_ogg_wrap.cxx",
+    "ext/taglib_vorbis/extconf.rb",
+    "ext/taglib_vorbis/taglib_vorbis.i",
+    "ext/taglib_vorbis/taglib_vorbis_wrap.cxx",
     "ext/valgrind-suppressions.txt",
+    "ext/win.cmake",
     "lib/taglib.rb",
     "lib/taglib/base.rb",
+    "lib/taglib/id3v1.rb",
     "lib/taglib/id3v2.rb",
     "lib/taglib/mpeg.rb",
+    "lib/taglib/ogg.rb",
     "lib/taglib/version.rb",
+    "lib/taglib/vorbis.rb",
     "taglib-ruby.gemspec",
     "tasks/docs_coverage.rake",
+    "tasks/ext.rake",
+    "tasks/swig.rake",
+    "test/data/Makefile",
     "test/data/add-relative-volume.cpp",
     "test/data/crash.mp3",
     "test/data/globe_east_540.jpg",
+    "test/data/id3v1-create.cpp",
+    "test/data/id3v1.mp3",
     "test/data/relative-volume.mp3",
     "test/data/sample.mp3",
     "test/data/unicode.mp3",
+    "test/data/vorbis-create.cpp",
+    "test/data/vorbis.oga",
     "test/helper.rb",
     "test/test_fileref_properties.rb",
+    "test/test_fileref_write.rb",
+    "test/test_id3v1_tag.rb",
     "test/test_id3v2_frames.rb",
     "test/test_id3v2_memory.rb",
     "test/test_id3v2_relative_volume.rb",
@@ -66,7 +91,9 @@ Gem::Specification.new do |s|
     "test/test_id3v2_unicode.rb",
     "test/test_id3v2_write.rb",
     "test/test_mpeg_file.rb",
-    "test/test_tag.rb"
+    "test/test_tag.rb",
+    "test/test_vorbis_file.rb",
+    "test/test_vorbis_tag.rb"
   ]
   s.homepage = "http://github.com/robinst/taglib-ruby"
   s.licenses = ["MIT"]
@@ -83,18 +110,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, ["~> 2.11"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>, ["~> 1.0"])
       s.add_development_dependency(%q<guard-test>, ["~> 0.4.0"])
     else
       s.add_dependency(%q<rake-compiler>, ["~> 0.7"])
       s.add_dependency(%q<shoulda>, ["~> 2.11"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
+      s.add_dependency(%q<redcarpet>, ["~> 1.0"])
       s.add_dependency(%q<guard-test>, ["~> 0.4.0"])
     end
   else
@@ -102,9 +127,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, ["~> 2.11"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
+    s.add_dependency(%q<redcarpet>, ["~> 1.0"])
     s.add_dependency(%q<guard-test>, ["~> 0.4.0"])
   end
 end

data/tasks/ext.rake

@@ -0,0 +1,79 @@
+# Extension tasks and cross-compiling
+
+host = 'i686-w64-mingw32'
+plat = 'x86-mingw32'
+
+tmp = "#{Dir.pwd}/tmp/#{plat}"
+toolchain_file = "#{Dir.pwd}/ext/win.cmake"
+install_dir = "#{tmp}/install"
+install_dll = "#{install_dir}/bin/libtag.dll"
+$cross_config_options = ["--with-opt-dir=#{install_dir}"]
+
+taglib_version = '1.7'
+taglib = "taglib-#{taglib_version}"
+taglib_url = "http://developer.kde.org/~wheeler/files/src/#{taglib}.tar.gz"
+
+def configure_cross_compile(ext)
+  ext.cross_compile = true
+  ext.cross_config_options.concat($cross_config_options)
+  ext.cross_compiling do |gem|
+    gem.files << "lib/libtag.dll"
+  end
+end
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new("taglib_base", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_mpeg", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_id3v1", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_id3v2", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_ogg", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+Rake::ExtensionTask.new("taglib_vorbis", $gemspec) do |ext|
+  configure_cross_compile(ext)
+end
+
+task :cross => [:taglib] 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 install_dll => ["#{tmp}/#{taglib}"] do
+  chdir "#{tmp}/#{taglib}" do
+    sh "cmake -DCMAKE_INSTALL_PREFIX=#{install_dir} -DCMAKE_TOOLCHAIN_FILE=#{toolchain_file}"
+    sh "make"
+    sh "make install"
+  end
+end
+
+file "#{tmp}/#{taglib}" => ["#{tmp}/#{taglib}.tar.gz"] do
+  chdir tmp do
+    sh "tar xzf #{taglib}.tar.gz"
+  end
+end
+
+file "#{tmp}/#{taglib}.tar.gz" => [tmp] do |t|
+  require 'open-uri'
+  puts "Downloading #{taglib_url}"
+  data = open(taglib_url).read()
+  break if data == nil
+  chdir tmp do
+    open(File.basename(t.name), 'wb') do |f|
+      f.write(data)
+    end
+  end
+end
+
+directory tmp

data/tasks/swig.rake

@@ -0,0 +1,43 @@
+# Tasks for generating SWIG wrappers in ext
+
+def run_swig(mod)
+  swig = `which swig`.chomp
+  if swig.empty?
+    swig = `which swig2.0`.chomp
+  end
+  sh "cd ext/#{mod} && #{swig} -c++ -ruby -autorename -initname #{mod} -I/usr/include #{mod}.i"
+end
+
+task :swig =>
+  ['ext/taglib_base/taglib_base_wrap.cxx',
+   'ext/taglib_mpeg/taglib_mpeg_wrap.cxx',
+   'ext/taglib_id3v1/taglib_id3v1_wrap.cxx',
+   'ext/taglib_id3v2/taglib_id3v2_wrap.cxx',
+   'ext/taglib_ogg/taglib_ogg_wrap.cxx',
+   'ext/taglib_vorbis/taglib_vorbis_wrap.cxx']
+
+base_dependencies = ['ext/taglib_base/taglib_base.i', 'ext/taglib_base/includes.i']
+
+file 'ext/taglib_base/taglib_base_wrap.cxx' => base_dependencies do
+  run_swig('taglib_base')
+end
+
+file 'ext/taglib_mpeg/taglib_mpeg_wrap.cxx' => ['ext/taglib_mpeg/taglib_mpeg.i'] + base_dependencies do
+  run_swig('taglib_mpeg')
+end
+
+file 'ext/taglib_id3v1/taglib_id3v1_wrap.cxx' => ['ext/taglib_id3v1/taglib_id3v1.i'] + base_dependencies do
+  run_swig('taglib_id3v1')
+end
+
+file 'ext/taglib_id3v2/taglib_id3v2_wrap.cxx' => ['ext/taglib_id3v2/taglib_id3v2.i'] + base_dependencies do
+  run_swig('taglib_id3v2')
+end
+
+file 'ext/taglib_ogg/taglib_ogg_wrap.cxx' => ['ext/taglib_ogg/taglib_ogg.i'] + base_dependencies do
+  run_swig('taglib_ogg')
+end
+
+file 'ext/taglib_vorbis/taglib_vorbis_wrap.cxx' => ['ext/taglib_vorbis/taglib_vorbis.i'] + base_dependencies do
+  run_swig('taglib_vorbis')
+end

data/test/data/Makefile

@@ -0,0 +1,15 @@
+.PHONY: all clean
+
+all:: add-relative-volume id3v1-create vorbis-create
+
+add-relative-volume: add-relative-volume.cpp
+	g++ -o $@ $< -ltag -I/usr/include/taglib
+
+id3v1-create: id3v1-create.cpp
+	g++ -o $@ $< -ltag -I/usr/include/taglib
+
+vorbis-create: vorbis-create.cpp
+	g++ -o $@ $< -ltag -I/usr/include/taglib
+
+clean::
+	-rm add-relative-volume id3v1-create

data/test/data/id3v1-create.cpp

@@ -0,0 +1,31 @@
+#include <iostream>
+#include <stdlib.h>
+
+#include <taglib/taglib.h>
+#include <taglib/mpegfile.h>
+#include <taglib/id3v1tag.h>
+
+using namespace TagLib;
+
+int main(int argc, char **argv) {
+  if (argc != 2) {
+    std::cout << "usage: " << argv[0] << " file.mp3" << std::endl;
+    exit(1);
+  }
+  char *filename = argv[1];
+
+  MPEG::File file(filename);
+  ID3v1::Tag *tag = file.ID3v1Tag(true);
+
+  tag->setTitle("Title");
+  tag->setArtist("Artist");
+  tag->setAlbum("Album");
+  tag->setComment("Comment");
+  tag->setGenre("Pop");
+  tag->setYear(2011);
+  tag->setTrack(7);
+
+  file.save(MPEG::File::ID3v1);
+}
+
+// vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/data/vorbis-create.cpp

@@ -0,0 +1,42 @@
+#include <iostream>
+#include <stdlib.h>
+
+#include <taglib/taglib.h>
+#include <taglib/vorbisfile.h>
+
+using namespace TagLib;
+
+int main(int argc, char **argv) {
+  if (argc != 2) {
+    std::cout << "usage: " << argv[0] << " file.mp3" << std::endl;
+    exit(1);
+  }
+  char *filename = argv[1];
+
+  Vorbis::File file(filename);
+  Ogg::XiphComment *tag = file.tag();
+
+  tag->setTitle("Title");
+  tag->setArtist("Artist");
+  tag->setAlbum("Album");
+  tag->setComment("Comment");
+  tag->setGenre("Pop");
+  tag->setYear(2011);
+  tag->setTrack(7);
+
+  tag->addField("VERSION", "original");
+  tag->addField("PERFORMER", "Performer");
+  tag->addField("COPYRIGHT", "2011 Me, myself and I");
+  tag->addField("LICENSE", "Any Use Permitted");
+  tag->addField("ORGANIZATION", "Organization");
+  tag->addField("DESCRIPTION", "Test file");
+  tag->addField("LOCATION", "Earth");
+  tag->addField("CONTACT", "Contact");
+
+  tag->addField("MULTIPLE", "A");
+  tag->addField("MULTIPLE", "B", false);
+
+  file.save();
+}
+
+// vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/test_fileref_write.rb

@@ -0,0 +1,38 @@
+require 'helper'
+
+require 'fileutils'
+
+class TestFileRefWrite < Test::Unit::TestCase
+
+  SAMPLE_FILE = "test/data/sample.mp3"
+  OUTPUT_FILE = "test/data/output.mp3"
+
+  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
+      tag = @file.tag
+      assert_not_nil tag
+      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
+      written_file.close
+    end
+
+    teardown do
+      if @file
+        @file.close
+        @file = nil
+      end
+      FileUtils.rm OUTPUT_FILE
+    end
+  end
+end

data/test/test_id3v1_tag.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+class TestID3v1Tag < Test::Unit::TestCase
+  context "The id3v1.mp3 file" do
+    setup do
+      read_properties = false
+      @file = TagLib::MPEG::File.new("test/data/id3v1.mp3", read_properties)
+    end
+
+    should "have an ID3v1 tag" do
+      assert_not_nil @file.id3v1_tag
+    end
+
+    context "ID3v1 tag" do
+      setup do
+        @tag = @file.id3v1_tag
+      end
+
+      should "have basic properties" do
+        assert_equal 'Title', @tag.title
+        assert_equal 'Artist', @tag.artist
+        assert_equal 'Album', @tag.album
+        assert_equal 'Comment', @tag.comment
+        assert_equal 'Pop', @tag.genre
+        assert_equal 2011, @tag.year
+        assert_equal 7, @tag.track
+        assert_equal false, @tag.empty?
+      end
+    end
+
+    teardown do
+      @file.close
+      @file = nil
+    end
+  end
+end