taglib-ruby 0.5.2 → 0.6.0

data/ext/taglib_vorbis/taglib_vorbis_wrap.cxx

@@ -1885,7 +1885,7 @@ TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
   if (NIL_P(s)) {
     return TagLib::ByteVector::null;
   } else {
-    return TagLib::ByteVector(RSTRING_PTR(s), RSTRING_LEN(s));
+    return TagLib::ByteVector(RSTRING_PTR(StringValue(s)), RSTRING_LEN(s));
   }
 }
 
@@ -1903,7 +1903,7 @@ TagLib::String ruby_string_to_taglib_string(VALUE s) {
   if (NIL_P(s)) {
     return TagLib::String::null;
   } else {
-    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(s)), TagLib::String::UTF8);
+    return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(StringValue(s))), TagLib::String::UTF8);
   }
 }
 
@@ -2076,11 +2076,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    #else
-    char *cstr = STR2CSTR(obj);
-    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -2161,12 +2157,12 @@ _wrap_new_Properties__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_TagLib__Vorbis__File, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File *","TagLib::Vorbis::Properties", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File *","Properties", 1, argv[0] )); 
   }
   arg1 = reinterpret_cast< TagLib::Vorbis::File * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::AudioProperties::ReadStyle","TagLib::Vorbis::Properties", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::AudioProperties::ReadStyle","Properties", 2, argv[1] ));
   } 
   arg2 = static_cast< TagLib::AudioProperties::ReadStyle >(val2);
   result = (TagLib::Vorbis::Properties *)new TagLib::Vorbis::Properties(arg1,arg2);
@@ -2207,7 +2203,7 @@ _wrap_new_Properties__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_TagLib__Vorbis__File, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File *","TagLib::Vorbis::Properties", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File *","Properties", 1, argv[0] )); 
   }
   arg1 = reinterpret_cast< TagLib::Vorbis::File * >(argp1);
   result = (TagLib::Vorbis::Properties *)new TagLib::Vorbis::Properties(arg1);
@@ -2485,12 +2481,12 @@ _wrap_new_File__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::Vorbis::File", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","File", 2, argv[1] ));
   } 
   arg2 = static_cast< bool >(val2);
   ecode3 = SWIG_AsVal_int(argv[2], &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "TagLib::Vorbis::Properties::ReadStyle","TagLib::Vorbis::File", 3, argv[2] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "TagLib::Vorbis::Properties::ReadStyle","File", 3, argv[2] ));
   } 
   arg3 = static_cast< TagLib::Vorbis::Properties::ReadStyle >(val3);
   result = (TagLib::Vorbis::File *)new TagLib::Vorbis::File(arg1,arg2,arg3);
@@ -2521,7 +2517,7 @@ _wrap_new_File__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::Vorbis::File", 2, argv[1] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","File", 2, argv[1] ));
   } 
   arg2 = static_cast< bool >(val2);
   result = (TagLib::Vorbis::File *)new TagLib::Vorbis::File(arg1,arg2);

data/lib/taglib.rb

@@ -13,3 +13,4 @@ require 'taglib/id3v2'
 require 'taglib/ogg'
 require 'taglib/vorbis'
 require 'taglib/flac'
+require 'taglib/mp4'

data/lib/taglib/mp4.rb

@@ -0,0 +1,33 @@
+require 'taglib_mp4'
+
+module TagLib::MP4
+
+  class File
+    extend ::TagLib::FileOpenable
+  end
+
+  class Tag
+    remove_method :save
+  end
+
+  class Item
+    def self.from_int_pair(ary)
+      if !(ary.is_a? Array)
+        raise ArgumentError, 'argument should be an array'
+      elsif ary.length != 2
+        raise ArgumentError, 'argument should have exactly two elements'
+      else
+        new(*ary)
+      end
+    end
+  end
+
+  class ItemListMap
+    alias :clear :_clear
+    alias :insert :_insert
+    alias :[] :fetch
+    remove_method :_clear
+    remove_method :_insert
+
+  end
+end

data/lib/taglib/version.rb

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

data/taglib-ruby.gemspec

@@ -7,9 +7,9 @@ require 'taglib/version'
 Gem::Specification.new do |s|
   s.name        = "taglib-ruby"
   s.version     = TagLib::Version::STRING
-  s.authors     = ["Robin Stocker"]
+  s.authors     = ["Robin Stocker", "Jacob Vosmaer"]
   s.email       = ["robin@nibor.org"]
-  s.homepage    = "http://robinst.github.com/taglib-ruby/"
+  s.homepage    = "http://robinst.github.io/taglib-ruby/"
   s.licenses    = ["MIT"]
   s.summary     = "Ruby interface for the taglib C++ library"
   s.description = <<DESC
@@ -23,10 +23,11 @@ DESC
   s.require_paths = ["lib"]
   s.requirements = ["taglib (libtag1-dev in Debian/Ubuntu, taglib-devel in Fedora/RHEL)"]
 
-  s.add_development_dependency 'bundler', '~> 1.1.0'
+  s.add_development_dependency 'bundler', '~> 1.2'
   s.add_development_dependency 'rake-compiler', '~> 0.8'
   s.add_development_dependency 'shoulda-context', '~> 1.0'
   s.add_development_dependency 'yard', '~> 0.7'
+  s.add_development_dependency 'kramdown', '~> 1.0'
 
   s.extensions = [
     "ext/taglib_base/extconf.rb",
@@ -36,6 +37,7 @@ DESC
     "ext/taglib_ogg/extconf.rb",
     "ext/taglib_vorbis/extconf.rb",
     "ext/taglib_flac/extconf.rb",
+    "ext/taglib_mp4/extconf.rb",
   ]
   s.extra_rdoc_files = [
     "CHANGES.md",
@@ -55,6 +57,7 @@ DESC
     "docs/taglib/flac.rb",
     "docs/taglib/id3v1.rb",
     "docs/taglib/id3v2.rb",
+    "docs/taglib/mp4.rb",
     "docs/taglib/mpeg.rb",
     "docs/taglib/ogg.rb",
     "docs/taglib/vorbis.rb",
@@ -63,6 +66,7 @@ DESC
     "ext/taglib_base/includes.i",
     "ext/taglib_base/taglib_base.i",
     "ext/taglib_base/taglib_base_wrap.cxx",
+    "ext/taglib_flac/extconf.rb",
     "ext/taglib_flac/taglib_flac.i",
     "ext/taglib_flac/taglib_flac_wrap.cxx",
     "ext/taglib_id3v1/extconf.rb",
@@ -72,6 +76,9 @@ DESC
     "ext/taglib_id3v2/relativevolumeframe.i",
     "ext/taglib_id3v2/taglib_id3v2.i",
     "ext/taglib_id3v2/taglib_id3v2_wrap.cxx",
+    "ext/taglib_mp4/extconf.rb",
+    "ext/taglib_mp4/taglib_mp4.i",
+    "ext/taglib_mp4/taglib_mp4_wrap.cxx",
     "ext/taglib_mpeg/extconf.rb",
     "ext/taglib_mpeg/taglib_mpeg.i",
     "ext/taglib_mpeg/taglib_mpeg_wrap.cxx",
@@ -88,6 +95,7 @@ DESC
     "lib/taglib/flac.rb",
     "lib/taglib/id3v1.rb",
     "lib/taglib/id3v2.rb",
+    "lib/taglib/mp4.rb",
     "lib/taglib/mpeg.rb",
     "lib/taglib/ogg.rb",
     "lib/taglib/version.rb",
@@ -97,15 +105,19 @@ DESC
     "tasks/ext.rake",
     "tasks/gemspec_check.rake",
     "tasks/swig.rake",
+    "test/base_test.rb",
     "test/data/Makefile",
     "test/data/add-relative-volume.cpp",
     "test/data/crash.mp3",
     "test/data/flac-create.cpp",
     "test/data/flac.flac",
+    "test/data/get_picture_data.cpp",
     "test/data/globe_east_540.jpg",
     "test/data/globe_east_90.jpg",
     "test/data/id3v1-create.cpp",
     "test/data/id3v1.mp3",
+    "test/data/mp4-create.cpp",
+    "test/data/mp4.m4a",
     "test/data/relative-volume.mp3",
     "test/data/sample.mp3",
     "test/data/unicode.mp3",
@@ -119,11 +131,15 @@ DESC
     "test/flac_file_write_test.rb",
     "test/id3v1_tag_test.rb",
     "test/id3v2_frames_test.rb",
+    "test/id3v2_header_test.rb",
     "test/id3v2_memory_test.rb",
     "test/id3v2_relative_volume_test.rb",
     "test/id3v2_tag_test.rb",
     "test/id3v2_unicode_test.rb",
     "test/id3v2_write_test.rb",
+    "test/mp4_file_test.rb",
+    "test/mp4_file_write_test.rb",
+    "test/mp4_items_test.rb",
     "test/mpeg_file_test.rb",
     "test/tag_test.rb",
     "test/unicode_filename_test.rb",

data/tasks/ext.rake

@@ -46,6 +46,9 @@ end
 Rake::ExtensionTask.new("taglib_flac", $gemspec) do |ext|
   configure_cross_compile(ext)
 end
+Rake::ExtensionTask.new("taglib_mp4", $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.

data/tasks/swig.rake

@@ -5,7 +5,7 @@ def run_swig(mod)
   if swig.empty?
     swig = `which swig2.0`.chomp
   end
-  sh "cd ext/#{mod} && #{swig} -c++ -ruby -autorename -initname #{mod} -I/usr/include #{mod}.i"
+  sh "cd ext/#{mod} && #{swig} -c++ -ruby -autorename -initname #{mod} -I/usr/local/include -I/usr/include #{mod}.i"
 end
 
 task :swig =>
@@ -16,6 +16,7 @@ task :swig =>
    'ext/taglib_ogg/taglib_ogg_wrap.cxx',
    'ext/taglib_vorbis/taglib_vorbis_wrap.cxx',
    'ext/taglib_flac/taglib_flac_wrap.cxx',
+   'ext/taglib_mp4/taglib_mp4_wrap.cxx',
   ]
 
 base_dependencies = ['ext/taglib_base/taglib_base.i', 'ext/taglib_base/includes.i']
@@ -47,3 +48,7 @@ end
 file 'ext/taglib_flac/taglib_flac_wrap.cxx' => ['ext/taglib_flac/taglib_flac.i'] + base_dependencies do
   run_swig('taglib_flac')
 end
+
+file 'ext/taglib_mp4/taglib_mp4_wrap.cxx' => ['ext/taglib_mp4/taglib_mp4.i'] + base_dependencies do
+  run_swig('taglib_mp4')
+end

data/test/base_test.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class BaseTest < Test::Unit::TestCase
+  context "TagLib" do
+    should "contain version constants" do
+      assert TagLib::TAGLIB_MAJOR_VERSION.is_a? Integer
+      assert TagLib::TAGLIB_MINOR_VERSION.is_a? Integer
+      assert TagLib::TAGLIB_PATCH_VERSION.is_a? Integer
+    end
+  end
+end

data/test/data/Makefile

@@ -1,6 +1,6 @@
 .PHONY: all clean
 
-all:: add-relative-volume id3v1-create vorbis-create flac-create
+all:: add-relative-volume id3v1-create vorbis-create flac-create mp4-create
 
 add-relative-volume: add-relative-volume.cpp
 	g++ -o $@ $< -ltag -I/usr/include/taglib
@@ -14,5 +14,8 @@ vorbis-create: vorbis-create.cpp
 flac-create: flac-create.cpp
 	g++ -o $@ $< -ltag -I/usr/include/taglib
 
+mp4-create: mp4-create.cpp
+	g++ -o $@ $< -ltag -I/usr/include/taglib
+
 clean::
-	-rm add-relative-volume id3v1-create vorbis-create flac-create
+	-rm add-relative-volume id3v1-create vorbis-create flac-create mp4-create

data/test/data/flac-create.cpp

@@ -1,14 +1,13 @@
 #include <iostream>
-#include <fstream>
 #include <stdlib.h>
 
 #include <taglib/taglib.h>
 #include <taglib/flacfile.h>
 #include <taglib/xiphcomment.h>
 
-using namespace TagLib;
+#include "get_picture_data.cpp"
 
-ByteVector getPictureData(const char *filename);
+using namespace TagLib;
 
 int main(int argc, char **argv) {
   if (argc != 2) {
@@ -58,23 +57,4 @@ int main(int argc, char **argv) {
   file.save();
 }
 
-ByteVector getPictureData(const char *filename) {
-  std::ifstream is;
-  is.open(filename, std::ios::binary);
-
-  is.seekg(0, std::ios::end);
-  int length = is.tellg();
-  is.seekg(0, std::ios::beg);
-
-  char *buffer = new char[length];
-
-  is.read(buffer, length);
-  is.close();
-
-  ByteVector result(buffer, length);
-  delete[] buffer;
-
-  return result;
-}
-
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/data/get_picture_data.cpp

@@ -0,0 +1,22 @@
+#include <fstream>
+
+using namespace TagLib;
+
+ByteVector getPictureData(const char *filename) {
+  std::ifstream is;
+  is.open(filename, std::ios::binary);
+
+  is.seekg(0, std::ios::end);
+  int length = is.tellg();
+  is.seekg(0, std::ios::beg);
+
+  char *buffer = new char[length];
+
+  is.read(buffer, length);
+  is.close();
+
+  ByteVector result(buffer, length);
+  delete[] buffer;
+
+  return result;
+}

data/test/data/mp4-create.cpp

@@ -0,0 +1,38 @@
+#include <iostream>
+#include <stdlib.h>
+
+#include <taglib/taglib.h>
+#include <taglib/mp4file.h>
+
+#include "get_picture_data.cpp"
+
+using namespace TagLib;
+
+int main(int argc, char **argv) {
+  if (argc != 2) {
+    std::cout << "usage: " << argv[0] << " file.m4a" << std::endl;
+    exit(1);
+  }
+  char *filename = argv[1];
+
+  MP4::File file(filename);
+  MP4::Tag *tag = file.tag();
+
+  tag->setTitle("Title");
+  tag->setArtist("Artist");
+  tag->setAlbum("Album");
+  tag->setComment("Comment");
+  tag->setGenre("Pop");
+  tag->setYear(2011);
+  tag->setTrack(7);
+
+  ByteVector data = getPictureData("globe_east_90.jpg");
+  MP4::CoverArt cover_art = MP4::CoverArt(MP4::CoverArt::JPEG, data);
+  MP4::CoverArtList cover_art_list = MP4::CoverArtList();
+  cover_art_list.append(cover_art);
+  tag->itemListMap().insert("covr", MP4::Item(cover_art_list));
+
+  file.save();
+}
+
+// vim: set filetype=cpp sw=2 ts=2 expandtab:

data/test/fileref_write_test.rb

@@ -27,6 +27,15 @@ class TestFileRefWrite < Test::Unit::TestCase
       written_file.close
     end
 
+    should "not segfault when setting int" do
+      begin
+        @file.tag.title = 42
+        flunk("Should have raised a TypeError")
+      rescue TypeError
+        # this is good
+      end
+    end
+
     teardown do
       if @file
         @file.close

data/test/flac_file_test.rb

@@ -44,7 +44,8 @@ class FlacFileTest < Test::Unit::TestCase
 
       should "contain flac-specific information" do
         assert_equal 16, @properties.sample_width
-        assert_equal "x\xD1\x9B\x86\xDF,\xD4\x88\xB3YW\xE6\xBD\x88Ih", @properties.signature
+        s = ["78d19b86df2cd488b35957e6bd884968"].pack('H*')
+        assert_equal s, @properties.signature
       end
     end
 

data/test/id3v2_header_test.rb

@@ -0,0 +1,61 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestID3v2Header < Test::Unit::TestCase
+  context "The sample.mp3 file" do
+    setup do
+      read_properties = false
+      @file = TagLib::MPEG::File.new("test/data/sample.mp3", read_properties)
+      @tag = @file.id3v2_tag
+    end
+
+    should "have a ID3v2 header" do
+      assert_not_nil @tag.header
+    end
+
+    context "header" do
+      setup do
+        @header = @tag.header
+      end
+
+      should "have a major version" do
+        assert_equal 3, @header.major_version
+      end
+
+      should "have a revision number" do
+        assert_equal 0, @header.revision_number
+      end
+
+      should "have a tag size" do
+        assert_equal 63478, @header.tag_size
+      end
+
+      should "not have a footer" do
+        assert_equal false, @header.footer_present
+      end
+
+      should "not have an extended header" do
+        assert_equal false, @header.extended_header
+      end
+
+      context "changing the major version" do
+
+        setup do
+          @header.major_version = 4
+        end
+
+        should "have a different major verson" do
+          assert_equal 4, @header.major_version
+        end
+
+        teardown do
+          @header.major_version = 3
+        end
+      end
+    end
+
+    teardown do
+      @file.close
+      @file = nil
+    end
+  end
+end