rtaglib 0.2.1 → 0.2.2

data/swig/taglib.i

@@ -576,7 +576,13 @@ class File {
                 };
             }    
  namespace ID3v1 {
+     
      typedef Map<TagLib::String,int> 	GenreMap;
+     %rename (ID3v1_genre) genre(int index);
+     %rename (ID3v1_genreIndex) genreIndex(const String &name);
+     %rename (ID3v1_genreList) genreList();
+     %rename (ID3v1_genreMap) genreMap();
+
      String genre(int index);
      int genreIndex(const String &name);
      StringList genreList();
@@ -597,7 +603,7 @@ class File {
         %rename(ID3v2_Header) Header;
         %rename(ID3v2_CommentsFrame) CommentsFrame;
         %rename(ID3v2_FrameFactory) FrameFactory;
-        
+        %rename(ID3v2_GeneralEncapsulatedObjectFrame) GeneralEncapsulatedObjectFrame;
         typedef List< Frame * >FrameList;
         typedef Map < ByteVector, FrameList > 	FrameListMap;
         class AttachedPictureFrame {
@@ -641,6 +647,22 @@ class File {
             String::Type 	textEncoding () const;
             void 	setTextEncoding (String::Type encoding);
         };
+        class GeneralEncapsulatedObjectFrame {
+            GeneralEncapsulatedObjectFrame ();
+            GeneralEncapsulatedObjectFrame (const ByteVector &data);
+            virtual 	~GeneralEncapsulatedObjectFrame ();
+            virtual String 	toString ();
+            String::Type 	textEncoding ();
+            void 	setTextEncoding (String::Type encoding);
+            String 	mimeType ();
+            void 	setMimeType (const String &type);
+            String 	fileName ();
+            void 	setFileName (const String &name);
+            String 	description ();
+            void 	setDescription (const String &desc);
+            ByteVector 	object ();
+            void 	setObject (const ByteVector &object);
+        };
         class FrameFactory {
             FrameFactory();
             ~FrameFactory();

data/swig/test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+require 'tmpdir'
 if File.exists? File.dirname(__FILE__)+"/TagLib.so"
     require File.dirname(__FILE__)+'/TagLib'
     BASE_DATA=File.dirname(__FILE__)+"/../test/data/"
@@ -11,21 +12,26 @@ require 'test/unit'
 class RtaglibReadTestCase < Test::Unit::TestCase
 	def setup
         @data_dir=BASE_DATA
-        @temp_dir="/tmp/rtaglib"
+        @temp_dir=Dir::tmpdir+"/rtaglib"
         FileUtils.mkdir(@temp_dir) if !File.exists? @temp_dir
-        
+        FileUtils.chmod(0777, @temp_dir)
     end
     def teardown
+	begin
         Dir.glob(@temp_dir+"/*").each{|f|
            FileUtils.rm(f)
         }
+	rescue Exception
+	end
     end
     def get_copy(original)
         original=~/.*\.(.+)/
         ext=$1
         copy=@temp_dir+"/test_"+sprintf("%06d",rand(10000))+"."+ext
-		FileUtils.copy(original, copy)
-        copy
+	
+	FileUtils.copy(original, copy)
+        FileUtils.chmod(0777, copy)
+	copy
     end
     # TagLib::File test for
     # - writable?
@@ -193,46 +199,48 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         
     end
-    # BAD: strip doesn't work
-    def _test_mpc
+    # Note: strip doesn't work on APE tags on TagLib
+    def test_mpc
         original=@data_dir+"440Hz-5sec.mpc"
         copy=get_copy(original)
         fr=TagLib::FileRef.new(copy)
         fr.tag.title="440Hz Sine Wave"
         fr.save
-        mpc=TagLib::MPEG_File.new(copy)
+        mpc=TagLib::MPC::File.new(copy)
         %w{tag APETag}.each {|f|
             assert_equal("440Hz Sine Wave",mpc.send(f).title, "#{f} tag")
         }
+        mpc=TagLib::MPC::File.new(copy)
+        mpc.ID3v1Tag(true).title="440Hz Sine Wave - id3"
+        mpc.save
+        mpc=nil
+        mpc=TagLib::MPC::File.new(copy)
+        assert_equal("440Hz Sine Wave - id3",mpc.ID3v1Tag(false).title)
+
+        mpc=nil
         # file
         # strip only id3v1
-        mpc.strip(TagLib::MPC_File::ID3v1)
+        mpc=TagLib::MPC::File.new(copy)        
+        mpc.strip(TagLib::MPC::File::ID3v1)
         mpc.save
-        mpc1=TagLib::MPEG_File.new(copy)
+        mpc1=TagLib::MPC::File.new(copy)
         
-#        assert_nil(mpc1.ID3v1Tag)
+        assert_nil(mpc1.ID3v1Tag)
         assert_not_nil(mpc1.APETag)
         copy=get_copy(original)
-        mpc=TagLib::MPC_File.new(copy)
+        mpc=TagLib::MPC::File.new(copy)
         # strip all
         mpc.strip()
         mpc.save
-        mpc1=TagLib::MPEG_File.new(copy)
+        mpc1=TagLib::MPC::File.new(copy)
 
- #       assert_nil(mpc1.ID3v1Tag)
-        assert_nil(mpc1.APETag)
+        assert_nil(mpc1.ID3v1Tag)
+        # Bug on TagLib
+        #       assert_nil(mpc1.APETag)
         
         # properties
         
-        assert_equal(0,mp3.audioProperties.version)
-        assert_equal(3,mp3.audioProperties.layer)
-        assert(!mp3.audioProperties.protectionEnabled)
-        assert_equal(TagLib::MPEG_Header::SingleChannel, mp3.audioProperties.channelMode)
-        assert(!mp3.audioProperties.isCopyrighted)
-        assert(mp3.audioProperties.isOriginal)
-        
-        
-        
+        assert_equal(7,mpc.audioProperties.mpcVersion)
     end
     
     

data/test/test_taglib.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+require 'tmpdir'
 if File.exists? File.dirname(__FILE__)+"/TagLib.so"
     require File.dirname(__FILE__)+'/TagLib'
     BASE_DATA=File.dirname(__FILE__)+"/../test/data/"
@@ -11,21 +12,26 @@ require 'test/unit'
 class RtaglibReadTestCase < Test::Unit::TestCase
 	def setup
         @data_dir=BASE_DATA
-        @temp_dir="/tmp/rtaglib"
+        @temp_dir=Dir::tmpdir+"/rtaglib"
         FileUtils.mkdir(@temp_dir) if !File.exists? @temp_dir
-        
+        FileUtils.chmod(0777, @temp_dir)
     end
     def teardown
+	begin
         Dir.glob(@temp_dir+"/*").each{|f|
            FileUtils.rm(f)
         }
+	rescue Exception
+	end
     end
     def get_copy(original)
         original=~/.*\.(.+)/
         ext=$1
         copy=@temp_dir+"/test_"+sprintf("%06d",rand(10000))+"."+ext
-		FileUtils.copy(original, copy)
-        copy
+	
+	FileUtils.copy(original, copy)
+        FileUtils.chmod(0777, copy)
+	copy
     end
     # TagLib::File test for
     # - writable?
@@ -193,46 +199,48 @@ class RtaglibReadTestCase < Test::Unit::TestCase
         
         
     end
-    # BAD: strip doesn't work
-    def _test_mpc
+    # Note: strip doesn't work on APE tags on TagLib
+    def test_mpc
         original=@data_dir+"440Hz-5sec.mpc"
         copy=get_copy(original)
         fr=TagLib::FileRef.new(copy)
         fr.tag.title="440Hz Sine Wave"
         fr.save
-        mpc=TagLib::MPEG_File.new(copy)
+        mpc=TagLib::MPC::File.new(copy)
         %w{tag APETag}.each {|f|
             assert_equal("440Hz Sine Wave",mpc.send(f).title, "#{f} tag")
         }
+        mpc=TagLib::MPC::File.new(copy)
+        mpc.ID3v1Tag(true).title="440Hz Sine Wave - id3"
+        mpc.save
+        mpc=nil
+        mpc=TagLib::MPC::File.new(copy)
+        assert_equal("440Hz Sine Wave - id3",mpc.ID3v1Tag(false).title)
+
+        mpc=nil
         # file
         # strip only id3v1
-        mpc.strip(TagLib::MPC_File::ID3v1)
+        mpc=TagLib::MPC::File.new(copy)        
+        mpc.strip(TagLib::MPC::File::ID3v1)
         mpc.save
-        mpc1=TagLib::MPEG_File.new(copy)
+        mpc1=TagLib::MPC::File.new(copy)
         
-#        assert_nil(mpc1.ID3v1Tag)
+        assert_nil(mpc1.ID3v1Tag)
         assert_not_nil(mpc1.APETag)
         copy=get_copy(original)
-        mpc=TagLib::MPC_File.new(copy)
+        mpc=TagLib::MPC::File.new(copy)
         # strip all
         mpc.strip()
         mpc.save
-        mpc1=TagLib::MPEG_File.new(copy)
+        mpc1=TagLib::MPC::File.new(copy)
 
- #       assert_nil(mpc1.ID3v1Tag)
-        assert_nil(mpc1.APETag)
+        assert_nil(mpc1.ID3v1Tag)
+        # Bug on TagLib
+        #       assert_nil(mpc1.APETag)
         
         # properties
         
-        assert_equal(0,mp3.audioProperties.version)
-        assert_equal(3,mp3.audioProperties.layer)
-        assert(!mp3.audioProperties.protectionEnabled)
-        assert_equal(TagLib::MPEG_Header::SingleChannel, mp3.audioProperties.channelMode)
-        assert(!mp3.audioProperties.isCopyrighted)
-        assert(mp3.audioProperties.isOriginal)
-        
-        
-        
+        assert_equal(7,mpc.audioProperties.mpcVersion)
     end
     
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rtaglib
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -04:00
+date: 2009-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - ext/taglib/taglib.cxx
 - lib/TagLib.rb
 - lib/TagLib_doc.rb
+- swig/Doxyfile
 - swig/Rakefile
 - swig/extconf.rb
 - swig/make_doc.rb
@@ -81,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- libtag >=1.4
+- libtag >=1.5
 rubyforge_project: rtaglib
 rubygems_version: 1.3.0
 signing_key: